fix 80128 项目合规评估流程-部分不涉及的数据，回显节点错误

fix 80131 项目合规评估流程-模块负责人修改节点，页面不回显数据

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<ProcessProjectAssessTerm> {
-    List<ProcessProjectAssessTerm> getByResponsibleUnitLeader(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId);
+    List<ProcessProjectAssessTerm> getByResponsibleUnitLeader(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner);
 
-    List<ProcessProjectAssessTerm> getByModuleOwner(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId);
+    List<ProcessProjectAssessTerm> getByModuleOwner(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasEngineer") Boolean hasEngineer);
+    List<ProcessProjectAssessTerm> getByModuleOwnerHasEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId);
 
     List<ProcessProjectAssessTerm> getByDesignEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId);
 

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}
+      <if test="hasModuleOwner">
+          and ppatu.module_owner is not null
+      </if>
         and ppatu.id is not null
   </select>
 
@@ -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
+      <if test="hasEngineer">
+          and ppatu.design_engineer is not null
+      </if>
+      and ppatu.id is not null
   </select>
 
   <select id="getByDesignEngineer" resultMap="BaseResultMap">
@@ -127,4 +133,22 @@
       and ppat.id is not null
       and ppat.can_assign_flag = 1
     </select>
+
+  <select id="getByModuleOwnerHasEngineer" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List">
+          <property name="alias" value="ppat"/>
+      </include>
+      ,
+      ppatu.id term_user_id,
+      ppatu.design_engineer,
+      ppatu.module_owner
+      from process_project_assess_term ppat
+      left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id
+      where ppat.assessment_id = #{assessmentId}
+      and ppatu.module_owner = #{originUserId}
+      and ppatu.design_engineer is not null
+      and ppatu.parent_execution_id = #{executionParentId}
+      and ppatu.id is not null
+  </select>
 </mapper>

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

@@ -156,7 +156,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 break;
             //各部门主管级领导（汇总）审批
             case ProcessProjectAssessCommon.GBMZGJLDSP:
-                processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeader(assessmentId, originUserId);
+                processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeaderHasModuleOwner(assessmentId, originUserId);
                 wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
                 previousNodeHandlerMap = processProjectAssessTermUserService.list(wrapper).stream()
                         .collect(

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

@@ -48,7 +48,11 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
      * @return
      */
     public List<ProcessProjectAssessTerm> getByResponsibleUnitLeader(String assessmentId, String originUserId) {
-        List<ProcessProjectAssessTerm> list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId);
+        List<ProcessProjectAssessTerm> list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,false);
+        return list;
+    }
+    public List<ProcessProjectAssessTerm> getByResponsibleUnitLeaderHasModuleOwner(String assessmentId, String originUserId) {
+        List<ProcessProjectAssessTerm> list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,true);
         return list;
     }
 
@@ -65,7 +69,12 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
     }
 
     public List<ProcessProjectAssessTerm> getByModuleOwner(String assessmentId, String originUserId, String executionParentId) {
-        List<ProcessProjectAssessTerm> list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId);
+        List<ProcessProjectAssessTerm> list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,false);
+        return list;
+    }
+
+    public List<ProcessProjectAssessTerm> getByModuleOwnerHasEngineer(String assessmentId, String originUserId, String executionParentId) {
+        List<ProcessProjectAssessTerm> list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,true);
         return list;
     }
 

laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml

@@ -86,7 +86,6 @@
 
     <select id="queryProcessDB" resultType="com.jero.modules.laws.tasktransfer.entity.LawsProcessDB">
         SELECT pa.id,
-               task_id,
                task_id,
                prc_num,
                prc_type,