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

Merge branch 'master' into 'pro'

Browse Source 
正式环境合并

See merge request eshop/biz_service_ebtp_project!21
This commit is contained in:
代兴成
2021-03-25 10:15:38 +08:00
parent 9722e78831 79ec1a4e4b
commit be1d748d29
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/feign/UsercenterApi.java
View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author daixc * @author daixc
* @date 2021/02/27 * @date 2021/02/27
*/ */
@FeignClient(value = "${mconfig.service-price-usercenter}",url = "http://10.242.31.158:8100/core-service-usercenter-public/") @FeignClient(value = "${mconfig.service-price-usercenter}")
public interface UsercenterApi { public interface UsercenterApi {
/** /**

11
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -663,17 +663,16 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
record.setRecruitEndTime(purpBaseInfoVO.getProjBaseInfoVO().getRecruitEndTime()); record.setRecruitEndTime(purpBaseInfoVO.getProjBaseInfoVO().getRecruitEndTime());
//是否使用客户端工具制作应答文件 //是否使用客户端工具制作应答文件
record.setIsClientFile(ProjectCommonUtil.IS_IPASS_YES); record.setIsClientFile(ProjectCommonUtil.IS_IPASS_YES);
//是否使用IPass制作应答文件
record.setIsIPassFile(ProjectCommonUtil.IS_IPASS_YES);
//是否开标使用IPass进行解密 //是否使用IPass制作应答文件
if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_1) if(StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_1)
||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_2)){ ||StringUtils.equals(projectEntrust.getProcurementMode(),ProjectCommonUtil.PROCUREMENT_MODE_2)){
record.setIsIPassDecode(ProjectCommonUtil.IS_IPASS_YES); record.setIsIPassFile(ProjectCommonUtil.IS_IPASS_YES);
}else{ }else{
record.setIsIPassDecode(ProjectCommonUtil.IS_IPASS_NO); record.setIsIPassFile(ProjectCommonUtil.IS_IPASS_NO);
} }
//是否开标使用IPass进行解密
record.setIsIPassDecode(ProjectCommonUtil.IS_IPASS_NO);
List<ProjectSection> sectionList = new ArrayList<>(); List<ProjectSection> sectionList = new ArrayList<>();
List<SectionMaterial> materialList = new ArrayList<>(); List<SectionMaterial> materialList = new ArrayList<>();
List<SectionSupplier> supplierList = new ArrayList<>(); List<SectionSupplier> supplierList = new ArrayList<>();

2
src/main/resources/application-pro.yml
View File

@ -112,7 +112,7 @@ mybatis-plus:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
auto-mapping-behavior: full auto-mapping-behavior: full
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
global-config: global-config:
# 逻辑删除配置 # 逻辑删除配置

2
src/main/resources/application-uat.yml
View File

@ -110,7 +110,7 @@ mybatis-plus:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
auto-mapping-behavior: full auto-mapping-behavior: full
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
global-config: global-config:
# 逻辑删除配置 # 逻辑删除配置