update 法规合规评估流程

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

@@ -152,7 +152,7 @@ public class ProcessProjectStandardController extends JeroController<ProcessProj
     @GetMapping("/getTermUserList")
     public Result<IPage<ProcessProjectStandardTermUser>> getTermUserList(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize,
                                                                     HttpServletRequest req) {
-        IPage<ProcessProjectStandardTermUser> page = termUserService.queryPage(processProjectStandardTermUser, pageNo, pageSize, req);
+        IPage<ProcessProjectStandardTermUser> page = processProjectStandardService.getTermUserList(processProjectStandardTermUser, pageNo, pageSize, req);
         return Result.OK(page);
     }
 

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

@@ -174,4 +174,11 @@ public class ProcessProjectStandardTermUser {
     @TableField(value = "project_approval_flag")
     @ApiModelProperty(value="是否立项")
     private Integer projectApprovalFlag;
+
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="任务id")
+    private String taskId;
 }

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

@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.projectstandard.service;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +14,7 @@ import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
@@ -63,6 +65,7 @@ import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectSt
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -209,12 +212,12 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                     String assessResults1 = termUser.getAssessResults();
                     if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) {
                         assessResults = AssessCommon.NOT_COMPLIANT;
-                        projectApprovalFlag = YesOrNoEnum.NO.getValue();
+                        projectApprovalFlag = YesOrNoEnum.YES.getValue();
                         break;
                     }
                     if (AssessCommon.ACCORD_WITH.equals(assessResults1)) {
                         assessResults = AssessCommon.ACCORD_WITH;
-                        projectApprovalFlag = YesOrNoEnum.YES.getValue();
+                        projectApprovalFlag = YesOrNoEnum.NO.getValue();
                     }
                 }
                 if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){
@@ -809,4 +812,29 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         Map<String, ProcessProjectStandardTerm> stringProcessProjectStandardTermMap = CollStreamUtil.toIdentityMap(list, ProcessProjectStandardTerm::getSplitInfoId);
         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::getModuleOwner,originUserId);
+        Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize);
+        Page<ProcessProjectStandardTermUser> pageList = termUserService.page(page, queryWrapper);
+        //获取所有用户信息
+        List<LoginUser> userList = sysBaseAPI.getAllUser();
+        Map<String, String> userNameMap = new HashMap<>();
+        for (LoginUser loginUser : userList) {
+            userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
+        }
+        for (ProcessProjectStandardTermUser record : pageList.getRecords()) {
+            String moduleOwner = record.getModuleOwner();
+            record.setModuleOwner(userNameMap.get(moduleOwner));
+            String designEngineer = record.getDesignEngineer();
+            record.setDesignEngineer(userNameMap.get(designEngineer));
+        }
+        return pageList;
+    }
 }