diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java index c34dc0e45..dc442d6ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProblemManagementEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProblemManagementEOController extends JeroController { @Autowired private IProblemManagementEOService problemManagementEOService; - + /** * 分页列表查询 * @@ -136,8 +136,9 @@ public class ProblemManagementEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProblemManagementEO problemManagementEO = problemManagementEOService.queryById(id); + public Result queryById(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { + ProblemManagementEO problemManagementEO = problemManagementEOService.queryById(id,cut); if(problemManagementEO==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index 409882869..2fd45cc77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -86,12 +87,12 @@ public class ProblemManagementEO implements Serializable { private java.lang.String projectId; /**责任部门*/ - @Excel(name = "责任部门", width = 15) @ApiModelProperty(value = "责任部门") + @Excel(name = "*责任领域", width = 15,dicCode ="duty_territory") private java.lang.String dutyTerritory; /**问题状态*/ - @Excel(name = "问题状态", width = 15) + @Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2") @ApiModelProperty(value = "问题状态") private java.lang.String problemState; @@ -151,4 +152,12 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "相关项目中文名") private String projectName; + @TableField(exist = false) + @ApiModelProperty(value = "详情文件回显") + private List fileList; + + @TableField(exist = false) + @ApiModelProperty(value = "详情文件回显") + private List approvalEvidenceFileList; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java index db2efa141..2ce1e634d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java @@ -2,6 +2,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import com.jero.modules.project.entity.ProjectLibraryBase; import org.apache.ibatis.annotations.Param; import com.jero.modules.project.entity.ProblemManagementEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProblemManagementEOMapper extends BaseMapper { + List queryByIds(@Param("ids") String ids); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml index a4ac620b8..d0cf6982a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -23,4 +23,38 @@ - \ No newline at end of file + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java index 253d00f78..29b406652 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProblemManagementEOService.java @@ -50,7 +50,7 @@ public interface IProblemManagementEOService extends IService wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(problemManagementEO.getLawsId().split(","))); + List documentLibraryEOList = bussDocumentLibraryEOService.list(wrapper); + if(!documentLibraryEOList.isEmpty()){ + List serialNumberList = documentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + problemManagementEO.setLawsName(StringUtils.join(serialNumberList,",")); + } + } + + //相关项目 + if(StringUtils.isNotBlank(problemManagementEO.getProjectId())){ + List projectLibraryBaseList = problemManagementEOMapper.queryByIds(problemManagementEO.getProjectId()); + //目标市场数据字典 + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List projectNameList = new ArrayList<>(); + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { + //目标市场 + String targetMarket = getMarket(cut, targetMarketList, projectLibraryBase); + //主项目的版本号 + String projectVersion = ""; + if(StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket); + } + projectNameList.add(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket + +"-"+projectVersion); + } + } + + + //责任部门 + if(StringUtils.isNotBlank(problemManagementEO.getDutyTerritory())){ + + } + + + //相关文件 + if(StringUtils.isNotBlank(problemManagementEO.getFile())){ + List fileInfos = iOSSFileService.getFileInfosByConnectId(problemManagementEO.getFile()); + problemManagementEO.setFileList(fileInfos); + } + + + //审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + List fileInfos = iOSSFileService.getFileInfosByConnectId(problemManagementEO.getApprovalEvidence()); + problemManagementEO.setApprovalEvidenceFileList(fileInfos); + } + + + //相关文件连接 + if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ + problemManagementEO.setFileLinkList(Arrays.asList(problemManagementEO.getFileLink().split(","))); + } + + //审批证据连接 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){ + problemManagementEO.setApprovalEvidenceLinkList(Arrays.asList(problemManagementEO.getApprovalEvidenceLink().split(","))); + } + + return problemManagementEO; } + public String getMarket(String cut, List targetMarketList, ProjectLibraryBase projectLibraryBase) { + List dictModelList = new ArrayList<>(); + for (String s : projectLibraryBase.getTargetMarket().split(",")) { + List dictModelListTemp = targetMarketList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + targetMarket = sb.substring(0,sb.length()-1); + } + } + return targetMarket; + } + /** * 列表查询 *