update 项目合规评估流程 查询详情返回项目名称和标准信息

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssess.java

@@ -72,4 +72,11 @@ public class ProcessProjectAssess {
      */
     @ApiModelProperty(value = "项目id")
     private String projectId;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -74,12 +75,29 @@ public class ProcessProjectAssessLink {
     @ApiModelProperty(value = "评估流程id")
     private String assessmentId;
 
+    /**
+     * 标准id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准id")
+    private String standardId;
+
+    /**标准来源*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)")
+    private String source;
+
     /**
      * 标准编号
      */
     @ApiModelProperty(value = "标准编号")
     private String standardNumber;
 
+    /**标准名称*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准名称")
+    private String standardName;
+
     /**
      * 分解单来源
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessLinkService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.projectassess.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -35,4 +36,10 @@ public class ProcessProjectAssessLinkService extends ServiceImpl<ProcessProjectA
         ProcessProjectAssessLink processProjectAssessLink = this.getById(id);
         return processProjectAssessLink;
     }
+
+    public List<ProcessProjectAssessLink> getByAssessmentId(String assessmentId) {
+        LambdaQueryWrapper<ProcessProjectAssessLink> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProcessProjectAssessLink::getAssessmentId,assessmentId);
+        return this.list(wrapper);
+    }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -30,6 +31,14 @@ import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
+import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
+import com.jero.modules.projectLibrary.entity.LawsAssess;
+import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
+import com.jero.modules.projectLibrary.service.ILawsAssessService;
+import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -38,6 +47,7 @@ import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.runtime.Execution;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -78,6 +88,14 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
     private ProcessProjectAssessTermService processProjectAssessTermService;
     @Resource
     private ProcessProjectAssessTermUserService processProjectAssessTermUserService;
+    @Resource
+    private ILawsProjectLibraryService lawsProjectLibraryService;
+    //国内标准
+    @Autowired
+    private ILawsDomesticStandardService lawsDomesticStandardService;
+    //海外标准
+    @Autowired
+    private ILawsOverseasStandardService lawsOverseasStandardService;
 
     public void add(ProcessProjectAssess processProjectAssess) {
         this.save(processProjectAssess);
@@ -232,7 +250,38 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
             allProjectAssesTermList.add(term);
         }
+        ProcessProjectAssess projectAssess = this.getById(assessmentId);
+        String projectId = projectAssess.getProjectId();
+        LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId);
+        ProcessProjectAssess processProjectAssess = new ProcessProjectAssess();
+        processProjectAssess.setProjectId(projectId);
+        processProjectAssess.setProjectName(lawsProjectLibrary.getProjectName());
+
+        List<ProcessProjectAssessLink> projectAssessLinkList = processProjectAssessLinkService.getByAssessmentId(assessmentId);
+        for (ProcessProjectAssessLink processProjectAssessLink : projectAssessLinkList) {
+            String standardNumber = processProjectAssessLink.getStandardNumber();
+            LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.queryByStandardNumber(standardNumber);
+            if (lawsDomesticStandard != null){
+                String standardName = lawsDomesticStandard.getStandardName();
+                String standardId = lawsDomesticStandard.getId();
+                processProjectAssessLink.setSource(CommonConstant.STANDARD_SOURCE_1);
+                processProjectAssessLink.setStandardId(standardId);
+                processProjectAssessLink.setStandardName(standardName);
+                continue;
+            }
+            LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.queryByStandardNumber(standardNumber);
+            if (lawsOverseasStandard != null){
+                String standardName = lawsOverseasStandard.getStandardName();
+                String standardId = lawsOverseasStandard.getId();
+                processProjectAssessLink.setSource(CommonConstant.STANDARD_SOURCE_2);
+                processProjectAssessLink.setStandardId(standardId);
+                processProjectAssessLink.setStandardName(standardName);
+            }
+        }
+
         ProcessProjectAssessVO processProjectAssessVO = new ProcessProjectAssessVO();
+        processProjectAssessVO.setProcessProjectAssess(processProjectAssess);
+        processProjectAssessVO.setProcessProjectAssessLinkList(projectAssessLinkList);
         processProjectAssessVO.setProcessProjectAssessTermList(allProjectAssesTermList);
         processInfoVO.setBusinessInfoDTO(processProjectAssessVO);
         return processInfoVO;