liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、重新评审查询增加回显字段

Browse Source 
2、询价输出日志
3、重新评审增加异常标段不允许操作
This commit is contained in:
dxc
2021-03-16 13:47:47 +08:00
parent 37bd5ace51
commit 31d3e64631
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java
View File

@ -1,12 +1,16 @@
package com.chinaunicom.mall.ebtp.project;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import io.micrometer.core.instrument.MeterRegistry;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication(exclude = {
@ -23,4 +27,16 @@ public class BizServiceEbtpProjectApplication {
SpringApplication.run(BizServiceEbtpProjectApplication.class, args);
}
/**
* Grafana 注册项
*
* @param applicationName 应用名称， 用于grafana应用列表
* @return
*/
@Bean
public MeterRegistryCustomizer<MeterRegistry> configurer(
@Value("${spring.application.name}") String applicationName) {
return (registry) -> registry.config().commonTags("application", applicationName);
}
}

2
src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java
View File

@ -163,6 +163,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
FRAME_EXCEPTION_INQUIRY_PROJECT_NOT_EMPTY(110072,"询价单已经初始化，请误重复提交"),
FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"),
FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS(110074, "项目标段信息已经异常处理不可以进行操作！"),
;
/**

5
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.Inq
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO;
import com.chinaunicom.mall.ebtp.project.projectentrust.service.ISeataEntrustService;
import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord;
import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO;
import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService;
import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection;
import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService;
@ -94,9 +93,9 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
tdocVO.setCreateDate(recordVO.getCreateDate());
tdocVO.setSectionName(recordVO.getProjectName()+ "包件");
tdocVO.setEndDate(inquiryVO.getEndTime());
log.info("询价项目初始化应答文件入参："+tdocVO);
log.info("询价项目初始化应答文件入参："+ JsonUtils.objectToJson(tdocVO));
response = ebtpRespsApi.initInquiryResponseFormat(tdocVO);
log.info("询价项目初始化应答文件返回结果："+tdocVO);
log.info("询价项目初始化应答文件返回结果："+ JsonUtils.objectToJson(response));
if(!response.isSuccess()){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess());
}

1
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml
View File

@ -45,6 +45,7 @@
t.evaluation_place as evaluationPlace,
t.is_agreement as isAgreement,
t.upload_file_id as uploadFileId,
t.instance_id as instanceId,
p.project_name as projectName,
p.ebp_project_number as ebpProjectNumber,
s.bid_sect_biz_num as bidSectBizNum,

4
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
View File

@ -309,6 +309,9 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
if(null != section.getBusinessModule() && section.getBusinessModule().equals(ProjectCommonUtil.BUSINESS_MODULE_11)){
result = true;
}
if(ProjectCommonUtil.SECTION_STATUS_9 == section.getStatus()){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS.throwException();
}
}else{
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.throwException();
}
@ -317,6 +320,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_SAVE_ERROR.throwException();
}
QueryWrapper<ProjectReEvaluation> evaluationQueryWrapper = new QueryWrapper<>();
evaluationQueryWrapper.eq(ProjectReEvaluationField.SECTION_ID,sectionId);
evaluationQueryWrapper.and(wrapper -> wrapper.eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0).or().eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1));