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 @@