From bb43f5522e369f09cf1276fe5b05328c418556f1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 20 Dec 2023 15:10:26 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=BD=92=E6=A1=A3=20=E4=BB=A5?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=B7=A5=E7=A8=8B=E5=B8=88=E4=B8=BA=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessProjectAssessTermUser.java | 6 +++ .../ProcessProjectAssessTermMapper.java | 1 + .../xml/ProcessProjectAssessTermMapper.xml | 25 +++++++++ .../ProcessProjectAssessTermUserMapper.xml | 3 ++ .../service/ProcessProjectAssessService.java | 53 ++++++++++--------- .../ProcessProjectAssessTermService.java | 9 ++-- .../entity/LawsAssessResults.java | 2 + 7 files changed, 69 insertions(+), 30 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java index 8b64dac9..c988869d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java @@ -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; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java index 05ea3018..ad113a88 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java @@ -17,4 +17,5 @@ public interface ProcessProjectAssessTermMapper extends BaseMapper getByDesignEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); + List getByStandardsEngineer(@Param("assessmentId") String assessmentId); } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml index 7ea2cedb..bcab4449 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml @@ -18,6 +18,11 @@ + + + + + @@ -69,4 +74,24 @@ and ppatu.parent_execution_id = #{executionParentId} and ppatu.id is not null + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml index f4b0c0d4..882116f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml @@ -22,6 +22,9 @@ + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index ec71c225..c19ad6ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -211,8 +211,8 @@ public class ProcessProjectAssessService extends ServiceImpl { @@ -227,30 +227,29 @@ public class ProcessProjectAssessService extends ServiceImpl dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); Map dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); //给条款中保存关联的信息 - if (!processProjectAssessTermUserList.isEmpty()) { - Map> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId); - for (ProcessProjectAssessTerm term : processProjectAssessTermList) { - String termId = term.getId(); - List 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> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId); + for (ProcessProjectAssessTerm term : processProjectAssessTermList) { + String termId = term.getId(); + List 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 decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); @@ -631,7 +630,7 @@ public class ProcessProjectAssessService extends ServiceImpl processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List allTermUserList = new ArrayList<>(); @@ -651,6 +650,7 @@ public class ProcessProjectAssessService extends ServiceImpl processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List allTermUserList = new ArrayList<>(); @@ -701,6 +701,7 @@ public class ProcessProjectAssessService extends ServiceImpl getByStandardsEngineer(String assessmentId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); - wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); - List list = this.list(wrapper); + List list = baseMapper.getByStandardsEngineer(assessmentId); + //LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); + //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); + //List list = this.list(wrapper); return list; } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java index fc7d6661..1a4a0607 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java @@ -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-不涉及)*/