From 6f788ef8254a36fbfaf62c2a714173545dacdc78 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 20 Apr 2021 08:24:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=20=E9=87=8D=E8=AF=84?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/common/EbpProjectCommonUtil.java | 5 +-- .../ebtp/project/feign/EbtpArchiveApi.java | 9 +++++ .../service/IProjectRecordService.java | 5 +-- .../impl/ProjectRecordServiceImpl.java | 33 ++++++++++++++----- .../entity/ProjectSectionVO.java | 9 +++++ .../impl/ProjectSectionServiceImpl.java | 14 ++++---- 6 files changed, 56 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java index e817e00..6a0719e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java @@ -161,9 +161,10 @@ public class EbpProjectCommonUtil { public static final String FUND_ORIGN_006 = "006"; /** - * 子业务类型(001:需求; 002:项目; 003:公告;) + * 子业务类型(001:需求; 002:项目; 003:公告; 004:协议;005:代理; 006:专家; 007:订单; 008:模板库; + * 009:招标采购中心; 010;财务及预算; 011:库存; 012:领用; 013:商品; 014:公开市场; 020:其他;) */ - public static final String SUB_BUSINESS_TYPE ="002"; + public static final String SUB_BUSINESS_TYPE ="009"; /** * 审批返回 审批通过 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpArchiveApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpArchiveApi.java index 9b00649..e85f965 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpArchiveApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpArchiveApi.java @@ -26,4 +26,13 @@ public interface EbtpArchiveApi { @ApiOperation("查询标段信息是否归档") @PostMapping("/v1/archiveRounds/getArchiveSection") BaseResponse> getArchiveSection(@ApiParam(value = "对象数据", required = true) @RequestBody List sectionIds); + + /** + * 查询标段信息归档状态 + * @param sectionIds 标段ID集合 + * @return 返回结果 + */ + @ApiOperation("查询标段信息归档状态") + @PostMapping("/v1/archiveRounds/getArchiveStatusBySectionIds") + BaseResponse> getArchiveStatusBySectionIds(@ApiParam(value = "对象数据", required = true) @RequestBody List sectionIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java index eb74a6a..e19671a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java @@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -154,9 +155,9 @@ public interface IProjectRecordService extends IBaseService{ /** * 获取标段信息进度比 - * @param businessModule 标段环节 + * @param sectionVO 标段环节 * @param vo 项目信息 * @return 返回结果 */ - BigDecimal getLinkPercentage(Integer businessModule, ProjectRecordVO vo); + void getLinkPercentage(ProjectSectionVO sectionVO, ProjectRecordVO vo); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 17f6eb1..b647f67 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -23,6 +23,7 @@ import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; import com.chinaunicom.mall.ebtp.project.dictchooseprocess.entity.DictChooseProcess; import com.chinaunicom.mall.ebtp.project.dictchooseprocess.service.IDictChooseProcessService; +import com.chinaunicom.mall.ebtp.project.feign.EbtpArchiveApi; import com.chinaunicom.mall.ebtp.project.feign.EbtpMallBidApi; import com.chinaunicom.mall.ebtp.project.feign.EbtpMallProcessApi; import com.chinaunicom.mall.ebtp.project.feign.EbtpTenderApi; @@ -118,6 +119,9 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl> conversionMap = sectionList.stream().collect(Collectors.groupingBy(ProjectSection::getProjectId)); List sectionVOList = new ArrayList<>(); + //拼装标段总条数 for (String key: conversionMap.keySet()) { List tempList = conversionMap.get(key); if(!CollectionUtils.isEmpty(tempList)){ @@ -1038,8 +1043,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl archiveSectionIds = sectionVOList.stream().filter(n -> n.getBusinessModule() == ProjectCommonUtil.BUSINESS_MODULE_12).map(ProjectSection::getId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(archiveSectionIds)){ + BaseResponse> response = archiveApi.getArchiveStatusBySectionIds(archiveSectionIds); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess()); + Map resultMap = response.getData(); + sectionVOList.forEach(n -> n.setArchiveStatus(resultMap.get(n.getId()))); + } + + //拼装查询报名人数 当前进度 List sectionIds = sectionVOList.stream().map(ProjectSection::getId).collect(Collectors.toList()); - if(null != sectionList && !sectionList.isEmpty()){ + if(!CollectionUtils.isEmpty(sectionIds)){ BaseResponse> response = tenderApi.getRegisterCountByPackage(sectionIds); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess()); Map resultMap = response.getData(); @@ -1050,7 +1065,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl 1){ - businessModule = isReviewMethod ? businessModule : businessModule - 5; + Integer businessModuleTotal = isReviewMethod ? 12 : 7; + if(sectionVO.getBusinessModule() > 1){ + sectionVO.setCurrentLink(isReviewMethod ? sectionVO.getBusinessModule() : sectionVO.getBusinessModule() - 5); + }else{ + sectionVO.setCurrentLink(sectionVO.getBusinessModule()); } - BigDecimal module = new BigDecimal(businessModule); - - return module.divide(businessModuleTotal,2,BigDecimal.ROUND_HALF_UP); + sectionVO.setLinkCount(businessModuleTotal); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index 07c29b4..de3d282 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java @@ -95,4 +95,13 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { @ApiModelProperty(value = "标段总数") private Integer sectionCount; + + @ApiModelProperty(value = "归档状态") + private Integer archiveStatus; + + @ApiModelProperty(value = "标段环节总数") + private Integer linkCount; + + @ApiModelProperty(value = "当前环节数") + private Integer currentLink; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 88d5f01..aab5ecd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -38,6 +38,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -520,7 +521,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectEditSectionBySave(String projectId) { //获取项目是否预审 boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId)); @@ -563,11 +563,13 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionIds = sectionVOList.stream().map(ProjectSectionVO::getId).collect(Collectors.toList()); - BaseResponse> baseResponse = rsmsApi.getToExceptionByBsId(sectionIds); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); + if(!CollectionUtils.isEmpty(sectionIds)){ + BaseResponse> baseResponse = rsmsApi.getToExceptionByBsId(sectionIds); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); - Map pushResultMap = baseResponse.getData(); - sectionVOList = sectionVOList.stream().filter(n -> pushResultMap.get(n.getId())).collect(Collectors.toList()); + Map pushResultMap = baseResponse.getData(); + sectionVOList = sectionVOList.stream().filter(n -> pushResultMap.get(n.getId())).collect(Collectors.toList()); + } return sectionVOList; } From 7b1745ab0189906c1cc165631e534fed77527c00 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 20 Apr 2021 11:16:11 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/service/impl/ProjectSectionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index aab5ecd..877d20a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -519,7 +519,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl Date: Tue, 20 Apr 2021 14:13:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IProjectRecordService.java | 20 ++++++++++++++----- .../impl/ProjectRecordServiceImpl.java | 19 +++++++++++------- .../impl/ProjectSectionServiceImpl.java | 4 ++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java index e19671a..6e48f99 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java @@ -111,14 +111,14 @@ public interface IProjectRecordService extends IBaseService{ /** * 获取项目是否可以修改 * @param id 项目ID - * @return + * @return 返回结果 */ boolean getProjectIsUpdate(String id); /** * 自主采购直接初始化信息 * @param projectEntrustVO 自主采购信息 - * @return + * @return 返回结果 */ boolean initProjectByIndependentProcurement(ProjectEntrustVO projectEntrustVO); @@ -137,12 +137,17 @@ public interface IProjectRecordService extends IBaseService{ */ void inquiryInitialize(String id, Map sectionMaps, LocalDateTime reviewStartTime); + /** + * 查询询价项目信息 + * @param inquiryId 询价id + * @return 返回结果 + */ ProjectRecord getByInquiryId(String inquiryId); /** * 获取 - * @param id - * @return + * @param id 项目ID + * @return 返回结果 */ BigDecimal getBudgetAmountById(String id); @@ -153,11 +158,16 @@ public interface IProjectRecordService extends IBaseService{ */ IPage getPageByPurchase(ProjectRecordVO projectRecord); + /** + * 获取归档标段状态信息 + * @param sectionVOList 标段集合 + */ + void getArchiveStatus(List sectionVOList); + /** * 获取标段信息进度比 * @param sectionVO 标段环节 * @param vo 项目信息 - * @return 返回结果 */ void getLinkPercentage(ProjectSectionVO sectionVO, ProjectRecordVO vo); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index b647f67..75b0326 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -1044,13 +1044,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl archiveSectionIds = sectionVOList.stream().filter(n -> n.getBusinessModule() == ProjectCommonUtil.BUSINESS_MODULE_12).map(ProjectSection::getId).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(archiveSectionIds)){ - BaseResponse> response = archiveApi.getArchiveStatusBySectionIds(archiveSectionIds); - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess()); - Map resultMap = response.getData(); - sectionVOList.forEach(n -> n.setArchiveStatus(resultMap.get(n.getId()))); - } + getArchiveStatus(sectionVOList); //拼装查询报名人数 当前进度 List sectionIds = sectionVOList.stream().map(ProjectSection::getId).collect(Collectors.toList()); @@ -1073,6 +1067,17 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionVOList) { + List archiveSectionIds = sectionVOList.stream().filter(n -> n.getBusinessModule() == ProjectCommonUtil.BUSINESS_MODULE_12).map(ProjectSection::getId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(archiveSectionIds)){ + BaseResponse> response = archiveApi.getArchiveStatusBySectionIds(archiveSectionIds); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess()); + Map resultMap = response.getData(); + sectionVOList.forEach(n -> n.setArchiveStatus(resultMap.get(n.getId()))); + } + } + @Override public void getLinkPercentage(ProjectSectionVO sectionVO, ProjectRecordVO vo){ boolean isReviewMethod = this.isReviewMethod(vo); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 877d20a..383b3f9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -511,6 +511,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionList = this.list(queryWrapper); + List sectionIds = sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()); BaseResponse> response = tenderApi.getRegisterCountByPackage(sectionIds); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); @@ -524,6 +525,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl Date: Wed, 21 Apr 2021 11:04:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AFbug=20?= =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BC=81=E4=B8=9A=E6=94=BE=E5=85=A5=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectrecord/service/impl/ProjectRecordServiceImpl.java | 4 +++- .../service/impl/ProjectReEvaluationServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 75b0326..b7c60a1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -881,8 +881,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Wed, 21 Apr 2021 11:08:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectReEvaluationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 6a09bf1..9872a8e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -188,7 +188,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse)); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.customValid(!baseResponse.getData()); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_SECTION_BUSINESS_MODULE_ERROR.customValid(!baseResponse.getData()); }catch (NullPointerException e){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR.throwException(); } From 0f0785d5fc6cd4f75b356b6667c81605264181a0 Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 21 Apr 2021 11:14:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectReEvaluationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 9872a8e..7cd9943 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -31,6 +31,7 @@ import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEva import com.chinaunicom.mall.ebtp.project.projectreevaluation.service.IProjectReEvaluationService; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; +import feign.FeignException; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; import lombok.extern.slf4j.Slf4j; @@ -189,7 +190,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl Date: Fri, 23 Apr 2021 08:22:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRecordServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index b7c60a1..d78b532 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -887,6 +887,17 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DictProvincesCode::getProvincesNumber,inquiryVO.getOrgOu()); + DictProvincesCode provincesCode = provincesCodeService.getOne(queryWrapper); + if(null != provincesCode){ + record.setRegionDictId(provincesCode.getProvinces()); + } + } + //采购经理 record.setOwnerContactId(projectEntrust.getPurchasingManager()); record.setOwnerContactName(projectEntrust.getPurchasingManagerName());