From e47e50d9d9eeb894b5cfce0714e6315c67c1d358 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 11 Jan 2024 17:12:18 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080128=20=E9=A1=B9=E7=9B=AE=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=B8=8D=E6=B6=89=E5=8F=8A=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E6=98=BE=E8=8A=82=E7=82=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20fix=2080131=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A8=A1=E5=9D=97=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectAssessTermMapper.java | 5 +- .../xml/ProcessProjectAssessTermMapper.xml | 26 +- .../service/ProcessProjectAssessService.java | 2 +- .../ProcessProjectAssessTermService.java | 13 +- .../mapper/xml/LawsTaskTransferMapper.xml | 1 - .../bpmn/项目合规评估流程 - 副本.bpmn | 340 --------- .../main/resources/bpmn/项目合规评估流程.bpmn | 672 +++++++++--------- .../bpmn/项目合规评估流程camunda.bpmn | 368 ++++++++++ 8 files changed, 758 insertions(+), 669 deletions(-) delete mode 100644 laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn create mode 100644 laws-modules/src/main/resources/bpmn/项目合规评估流程camunda.bpmn 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 ad113a88..9c0af615 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 @@ -11,9 +11,10 @@ import java.util.List; * @date 2023-12-06 10:37 */ public interface ProcessProjectAssessTermMapper extends BaseMapper { - List getByResponsibleUnitLeader(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId); + List getByResponsibleUnitLeader(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner); - List getByModuleOwner(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); + List getByModuleOwner(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasEngineer") Boolean hasEngineer); + List getByModuleOwnerHasEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); List getByDesignEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); 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 48731321..ea685df3 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 @@ -64,6 +64,9 @@ left join process_project_assess_term ppat on ppat.id = ppatu.term_id where ppat.assessment_id = #{assessmentId} and ppatu.responsible_unit_leader = #{originUserId} + + and ppatu.module_owner is not null + and ppatu.id is not null @@ -81,7 +84,10 @@ where ppat.assessment_id = #{assessmentId} and ppatu.module_owner = #{originUserId} and ppatu.parent_execution_id = #{executionParentId} - and ppatu.id is not null + + and ppatu.design_engineer is not null + + 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/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 2522be11..d3dc4883 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 @@ -156,7 +156,7 @@ public class ProcessProjectAssessService extends ServiceImpl getByResponsibleUnitLeader(String assessmentId, String originUserId) { - List list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId); + List list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,false); + return list; + } + public List getByResponsibleUnitLeaderHasModuleOwner(String assessmentId, String originUserId) { + List list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,true); return list; } @@ -65,7 +69,12 @@ public class ProcessProjectAssessTermService extends ServiceImpl getByModuleOwner(String assessmentId, String originUserId, String executionParentId) { - List list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId); + List list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,false); + return list; + } + + public List getByModuleOwnerHasEngineer(String assessmentId, String originUserId, String executionParentId) { + List list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,true); return list; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml index e3fe7655..275f891b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml @@ -86,7 +86,6 @@