update 法规合规评估流程 解决驳回bug

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

@@ -907,37 +907,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
     }
 
     public void createListener(DelegateTask delegateTask) {
-        String taskDefinitionKey = delegateTask.getTaskDefinitionKey();
-        String assignee = delegateTask.getAssignee();
-        String processInstanceId = delegateTask.getProcessInstanceId();
-        String nodeId = null;
-        String userId = null;
-        //switch (taskDefinitionKey) {
-        //    //模块负责人分发
-        //    case ProcessProjectAssessCommon.MKFZRFF:
-        //        nodeId = ProcessProjectAssessCommon.GBMZGJLDXF;
-        //        break;
-        //    //设计工程师评估
-        //    case ProcessProjectAssessCommon.SJGCSPG:
-        //        nodeId = ProcessProjectAssessCommon.MKFZRFF;
-        //        userId = (String) runtimeService.getVariable(processInstanceId, "moduleOwner");
-        //        break;
-        //    //模块负责人审批
-        //    case ProcessProjectAssessCommon.MKFZRSP:
-        //        nodeId = ProcessProjectAssessCommon.MKFZRFF;
-        //        userId = (String) runtimeService.getVariable(processInstanceId, "moduleOwner");
-        //        break;
-        //        //模块负责人修改
-        //    case ProcessProjectAssessCommon.MKFZRXG:
-        //        nodeId = ProcessProjectAssessCommon.GBMZGJLDXF;
-        //        break;
-        //    default:
-        //}
-        ////查询我最新提交的task
-        //ProcessApprovalRecord myLastComplete = processApprovalRecordService.getMyLastComplete(processInstanceId, nodeId, userId);
-        //String lastCompleteTaskId = myLastComplete.getTaskId();
-        //HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskId(lastCompleteTaskId).singleResult();
         String parentExecutionId = (String) ThreadLocalUtil.get(ProcessProjectAssessCommon.EXECUTION_ID);
+        //delegateTask.setVariableLocal(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
         delegateTask.setFormKey(parentExecutionId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java

@@ -158,5 +158,20 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
         return Result.OK(page);
     }
 
+    /**
+     * 法规合规评估流程-查询立项结果列表
+     * @return
+     */
+    @DictPoint
+    @AutoLog(value = "法规合规评估流程-查询评估列表")
+    @ApiOperation(value = "查询评估列表")
+    @GetMapping("/getTermUserList")
+    public Result<IPage<ProcessProjectStandardTermUser>> getTermUserList(ProcessProjectStandardTermUser termUser,
+                                                                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+        IPage<ProcessProjectStandardTermUser> page = processProjectStandardService.getTermUserList(termUser,pageNo,pageSize);
+        return Result.OK(page);
+    }
+
 
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java

@@ -123,6 +123,7 @@ public class ProcessProjectStandardTermUser {
     /**
      * 设计工程师
      */
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @TableField(value = "design_engineer")
     @ApiModelProperty(value="设计工程师")
     private String designEngineer;
@@ -181,4 +182,18 @@ public class ProcessProjectStandardTermUser {
     @TableField(exist = false)
     @ApiModelProperty(value="任务id")
     private String taskId;
+
+    /**
+     * 工号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="工号")
+    private String userName;
+
+    /**
+     * 姓名
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="姓名")
+    private String realName;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java

@@ -1,7 +1,11 @@
 package com.jero.modules.activiti.process.projectstandard.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
   *
@@ -9,4 +13,6 @@ import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectSt
   *@date 2024-01-15 16:27
   */
 public interface ProcessProjectStandardTermUserMapper extends BaseMapper<ProcessProjectStandardTermUser> {
+    Page<ProcessProjectStandardTermUser> selectPageByUser(Page<ProcessProjectStandardTermUser> page, @Param("termUser") ProcessProjectStandardTermUser termUser);
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml

@@ -23,6 +23,8 @@
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="file_id" jdbcType="VARCHAR" property="fileId" />
     <result column="project_approval_flag" jdbcType="TINYINT" property="projectApprovalFlag" />
+    <result column="assess_results" property="assessResults"/>
+    <result column="is_relate" property="isRelate"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -30,4 +32,19 @@
     term_id, responsible_unit_leader, responsible_unit, module_owner, not_involved, design_engineer, 
     parent_execution_id, model_series, description, file_id, project_approval_flag
   </sql>
+
+  <select id="selectPageByUser" resultMap="BaseResultMap">
+    select ppstu.* from process_project_standard_term_user ppstu left join
+                  sys_user su on ppstu.design_engineer = su.id
+    <where>
+      ppstu.term_id = #{termUser.termId}
+      <if test="termUser.userName != null and termUser.userName != ''">
+        and su.username like concat('%', #{termUser.userName}, '%')
+      </if>
+      <if test="termUser.realName != null and termUser.realName != ''">
+        and su.realname like concat('%', #{termUser.realName}, '%')
+      </if>
+    </where>
+
+  </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java

@@ -445,8 +445,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
         variables.put(ProcessProjectStandardCommon.PASS, pass);
-        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
+        if (!pass){
+            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
+        }
         taskService.complete(taskId, variables);
+        ThreadLocalUtil.remove();
     }
     //部所主管级领导审批
     private void bszgjldspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
@@ -511,6 +514,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         String taskId = processDTO.getTaskId();
         variables.put(ProcessProjectStandardCommon.PASS, pass);
         taskService.complete(taskId, variables);
+        ThreadLocalUtil.remove();
     }
     //法规工程师审批
     private void fggcsspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
@@ -750,8 +754,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerIds);
-        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size());
+        int size = designEngineerIds.size();
+        if (size > 0){
+            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerIds);
+        }
+        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, size);
         taskService.complete(taskId, variables);
         ThreadLocalUtil.remove();
     }
@@ -864,6 +871,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         Map<String, Object> variables = new HashMap<>();
         variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerIds);
         taskService.complete(delegateTask.getId(),variables);
+        ThreadLocalUtil.remove();
     }
 
     /**
@@ -877,16 +885,9 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         return stringProcessProjectStandardTermMap;
     }
 
-    public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize, HttpServletRequest req) {
-        ProcessDTO processDTO = processHandleService.getProcessDTO(processProjectStandardTermUser.getTaskId());
-        ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
-        String originUserId = processApprovalRecord.getOriginUserId();
-        QueryWrapper<ProcessProjectStandardTermUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()
-                        .eq(ProcessProjectStandardTermUser::getTermId,processProjectStandardTermUser.getId())
-                        .eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader,originUserId);
+    public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) {
         Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize);
-        Page<ProcessProjectStandardTermUser> pageList = termUserService.page(page, queryWrapper);
+        Page<ProcessProjectStandardTermUser> pageList = termUserMapper.selectPageByUser(page, termUser);
         //获取所有用户信息
         List<LoginUser> userList = sysBaseAPI.getAllUser();
         Map<String, String> userNameMap = new HashMap<>();