update 项目合规评估流程法规工程师归档以设计工程师为维度展示

2023-12-20 15:10:26 +08:00
parent 16be1a4874
commit bb43f5522e
7 changed files with 69 additions and 30 deletions
@@ -148,5 +148,11 @@ public class ProcessProjectAssessTermUser {
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date expectedTime;

+    /**评估日期*/
+    @ApiModelProperty(value = "评估日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date assessTime;
+

 }
@@ -17,4 +17,5 @@ public interface ProcessProjectAssessTermMapper extends BaseMapper<ProcessProjec

    List<ProcessProjectAssessTerm> getByDesignEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId);

+    List<ProcessProjectAssessTerm> getByStandardsEngineer(@Param("assessmentId") String assessmentId);
 }
@@ -18,6 +18,11 @@
    <result column="split_info_id" property="splitInfoId"/>
    <result column="can_assign_flag" property="canAssignFlag"/>
    <result column="term_user_id" property="termUserId"/>
+      <result column="evaluation_feedback" jdbcType="TINYINT" property="evaluationFeedback" />
+      <result column="description" jdbcType="VARCHAR" property="description" />
+      <result column="file_id" jdbcType="VARCHAR" property="fileId" />
+      <result column="expected_time" jdbcType="TIMESTAMP" property="expectedTime" />
+      <result column="not_involved" property="notInvolved"/>
  </resultMap>

  <sql id="Base_Column_List">
@@ -69,4 +74,24 @@
        and ppatu.parent_execution_id = #{executionParentId}
        and ppatu.id is not null
  </select>
+
+  <select id="getByStandardsEngineer" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List">
+          <property name="alias" value="ppat"/>
+      </include>
+      ,
+      ppatu.id term_user_id,
+      ppatu.not_involved,
+      ppatu.evaluation_feedback,
+      ppatu.description,
+      ppatu.file_id,
+      ppatu.expected_time
+
+      from process_project_assess_term_user ppatu
+      left join process_project_assess_term ppat on ppat.id = ppatu.term_id
+      where ppatu.assessment_id = #{assessmentId}
+      and ppat.id is not null
+      and ppat.can_assign_flag = 1
+    </select>
 </mapper>
@@ -22,6 +22,9 @@
    <result column="description" jdbcType="VARCHAR" property="description" />
    <result column="file_id" jdbcType="VARCHAR" property="fileId" />
    <result column="expected_time" jdbcType="TIMESTAMP" property="expectedTime" />
+    <result column="parent_execution_id" property="parentExecutionId"/>
+    <result column="not_involved" property="notInvolved"/>
+    <result column="assess_time" property="assessTime"/>
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
@@ -211,8 +211,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
            //法规工程师归档
            case ProcessProjectAssessCommon.FGGCSGD:
                processProjectAssessTermList = processProjectAssessTermService.getByStandardsEngineer(assessmentId);
-                processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper);
-                previousNodeHandlerMap = processProjectAssessTermUserList.stream()
+                //processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper);
+                previousNodeHandlerMap = processProjectAssessTermUserService.list(wrapper).stream()
                        .collect(
                                Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId,
                                        Collectors.mapping(item -> {
@@ -227,30 +227,29 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
        List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
        Map<String, String> dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
        //给条款中保存关联的信息
-        if (!processProjectAssessTermUserList.isEmpty()) {
-            Map<String, List<ProcessProjectAssessTermUser>> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId);
-            for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
-                String termId = term.getId();
-                List<ProcessProjectAssessTermUser> termUsers = termIdListMap.get(termId);
-                if (CollectionUtil.isNotEmpty(termUsers)){
-                    for (ProcessProjectAssessTermUser termUser : termUsers) {
-                        String evaluationFeedback = termUser.getEvaluationFeedback();
-                        termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
-                    }
-                    ProcessProjectAssessTermUser termUser = termUsers.get(0);
-                    term.setNotInvolved(termUser.getNotInvolved());
-                    term.setEvaluationFeedback(termUser.getEvaluationFeedback());
-                    term.setEvaluationFeedback_dictText(termUser.getEvaluationFeedback_dictText());
-                    term.setDescription(termUser.getDescription());
-                    term.setFileId(termUser.getFileId());
-                    term.setExpectedTime(termUser.getExpectedTime());
+        Map<String, List<ProcessProjectAssessTermUser>> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId);
+        for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
+            String termId = term.getId();
+            List<ProcessProjectAssessTermUser> termUsers = termIdListMap.get(termId);
+            if (CollectionUtil.isNotEmpty(termUsers)){
+                for (ProcessProjectAssessTermUser termUser : termUsers) {
+                    String evaluationFeedback = termUser.getEvaluationFeedback();
+                    termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
                }
-                term.setProcessProjectAssessTermUserList(termUsers);
-
-                String previousNodeHandler = previousNodeHandlerMap.get(termId);
-                term.setPreviousNodeHandler(previousNodeHandler);
-                term.setPromoter(createUserName);
+                ProcessProjectAssessTermUser termUser = termUsers.get(0);
+                term.setNotInvolved(termUser.getNotInvolved());
+                term.setEvaluationFeedback(termUser.getEvaluationFeedback());
+                term.setDescription(termUser.getDescription());
+                term.setFileId(termUser.getFileId());
+                term.setExpectedTime(termUser.getExpectedTime());
            }
+            String evaluationFeedback = term.getEvaluationFeedback();
+            term.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
+            term.setProcessProjectAssessTermUserList(termUsers);
+
+            String previousNodeHandler = previousNodeHandlerMap.get(termId);
+            term.setPreviousNodeHandler(previousNodeHandler);
+            term.setPromoter(createUserName);
        }
        //拼接分类法规标题
        List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
@@ -631,7 +630,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
        removeWrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey);

        processProjectAssessTermUserService.remove(removeWrapper);
-
+        Date date = new Date();
        ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
        List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
        List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
@@ -651,6 +650,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                newTermUser.setModuleOwner(originUserId);
                newTermUser.setParentExecutionId(executionId);
                newTermUser.setNotInvolved(notInvolved);
+                newTermUser.setAssessTime(date);
                allTermUserList.add(newTermUser);
                continue;
            }
@@ -689,7 +689,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
        Task task = processDTO.getTask();
        String formKey = task.getFormKey();
        String executionId = task.getExecutionId();
-
+        Date date = new Date();
        ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
        List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
        List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
@@ -701,6 +701,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
            termUser.setFileId(processProjectAssessTerm.getFileId());
            termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime());
            termUser.setParentExecutionId(formKey);
+            termUser.setAssessTime(date);
            allTermUserList.add(termUser);
        }
        processProjectAssessTermUserService.updateBatchById(allTermUserList);
@@ -75,10 +75,11 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
    }

    public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) {
-        LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
-        wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
-        List<ProcessProjectAssessTerm> list = this.list(wrapper);
+        List<ProcessProjectAssessTerm> list = baseMapper.getByStandardsEngineer(assessmentId);
+        //LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
+        //wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
+        //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
+        //List<ProcessProjectAssessTerm> list = this.list(wrapper);
        return list;
    }
 }
@@ -57,6 +57,8 @@ public class LawsAssessResults implements Serializable {

 	/**评估日期*/
    @ApiModelProperty(value = "评估日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date assessTime;

 	/**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/