From 88431bde7ed43777c2dfc4fc5fcc902dfaf19cad Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 20 May 2021 08:23:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A5=BF=E5=BB=B6=E6=A0=87?= =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectRecordServiceImpl.java | 1 - .../controller/ProjectSectionController.java | 12 ++++++++++ .../dao/ProjectSectionMapper.java | 7 ++++++ .../dao/mapper/ProjectSectionMapper.xml | 22 +++++++++++++++++-- .../entity/ProjectSectionVO.java | 12 ++++++++++ .../service/IProjectSectionService.java | 7 ++++++ .../impl/ProjectSectionServiceImpl.java | 20 +++++++++++++++++ src/main/resources/application-local.yml | 2 +- 8 files changed, 79 insertions(+), 4 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 d78b532..c5eae99 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 @@ -235,7 +235,6 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl> selectListByChart(@ApiParam(value = "主键id集合", required = true) @RequestBody List sectionIds){ + + return BaseResponse.success(projectSectionService.selectListByChart(sectionIds)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java index 9a67376..73bfa5f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java @@ -66,4 +66,11 @@ public interface ProjectSectionMapper extends IBaseMapper { * @return 返回结果 */ List selectArchiveById(@Param(value = "section") ProjectSectionVO projectSection); + + /** + * 查询统计标段信息直接回显字典值 + * @param sectionIds 标段ID集合 + * @return 返回结果 + */ + List selectListByChart(@Param(value = "sectionIds") List sectionIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml index 4dd2800..fdae6d3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml @@ -31,7 +31,6 @@ - @@ -76,7 +75,6 @@ - @@ -192,4 +190,24 @@ + + \ No newline at end of file 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 de3d282..c4dad74 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 @@ -104,4 +104,16 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { @ApiModelProperty(value = "当前环节数") private Integer currentLink; + + @ApiModelProperty(value = "所属机构") + private String tendereeOrgName; + + @ApiModelProperty(value = "所属省份名称") + private String province; + + @ApiModelProperty(value = "当前环节字典回显") + private String businessModuleValue; + + @ApiModelProperty(value = "采购方式字典回显") + private String bidMethodDictValue; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java index fb86107..f5115e0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java @@ -201,4 +201,11 @@ public interface IProjectSectionService extends IBaseService{ * @return 返回业务流程 */ Integer getMaxBusinessModule(String projectId); + + /** + * 提供报表查询标段接口（西延专用） + * @param sectionIds 标段ID集合 + * @return 返回结果 + */ + List selectListByChart(List sectionIds); } 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 296ba6a..78ffb41 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 @@ -14,6 +14,8 @@ import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; +import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService; 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; @@ -81,6 +83,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectListByChart(List sectionIds) { + + List dictProjectList = dictProjectService.list(); + Map dictMap = dictProjectList.stream().collect(Collectors.toMap(key -> key.getParentType()+"_"+key.getCode(),dict -> dict)); + + List sectionVOList = projectSectionMapper.selectListByChart(sectionIds); + sectionVOList.forEach(n -> { + n.setBusinessModuleValue(dictMap.get("business_module="+n.getBidMethodDict()+"_"+n.getBusinessModule()).getDicName()); + n.setBidMethodDictValue(dictMap.get("procurement_mode=entrust"+"_"+n.getBidMethodDict()).getDicName()); + }); + + return sectionVOList; + } + /** * 拼装标段模块修改流程实体并插入数据 * @param sectionId 标段ID diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index bbff1e0..dcf610d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -112,7 +112,7 @@ mybatis-plus: map-underscore-to-camel-case: true auto-mapping-behavior: full # 这个配置会将执行的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 global-config: # 逻辑删除配置