[新增] 流程批量同意 不同意

adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java

@@ -40,6 +40,10 @@ public class UserVO {
     private String email;
 
     private String usname;
+    /**
+     * levelId
+     */
+    private String levelId;
 
     /**
      * 角色列表

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -51,7 +51,8 @@
     </resultMap>
 
     <resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
-        <result column="usname" property="usname"></result>
+        <result column="usname" property="usname"/>
+        <result column="LEVEL_ID" property="levelId"/>
         <collection property = "roleIdList" ofType="string">
             <id column="id" />
         </collection>

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -66,6 +66,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.adc.da.wkflow.util.date.DateTools.*;
 
@@ -149,6 +150,14 @@ public class TodoTaskController {
             page.setCount(0L);
            return Result.success(page);
         }
+        List<String> taskIdList = listPage.stream().map(e -> e.getProcessInstanceId()).collect(Collectors.toList());
+        LambdaQueryWrapper<BusProcessApprove> approveLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        approveLambdaQueryWrapper.in(BusProcessApprove::getPrcId,taskIdList);
+        approveLambdaQueryWrapper.orderByDesc(BusProcessApprove::getCreateDate);
+        List<BusProcessApprove> busProcessApproves = busProcessApproveMapper.selectList(approveLambdaQueryWrapper);
+        Map<String, BusProcessApprove> approveMap =
+                busProcessApproves.stream().collect(Collectors.toMap(BusProcessApprove::getPrcId, a -> a, (k1, k2) -> k1));
+
         List<Map<String, Object>> listEnd = ActivitiTools.turnTasks(listPage);
         for (Map<String, Object> map : listEnd) {
             ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(map.get("processDefinitionId") + "").singleResult();
@@ -204,6 +213,11 @@ public class TodoTaskController {
                 busProcessName.setTaskId(taskId);
                 busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
                 busProcessName.setTaskDefinitionKey(entry.getValue().get(0).get("taskDefinitionKey").toString());
+                BusProcessApprove busProcessApprove = approveMap.get(busProcessName.getPrcId());
+                if (busProcessApprove!=null){
+                    String fromValsJson = busProcessApprove.getFromValsJson();
+                    busProcessName.setSubmitJson(fromValsJson);
+                }
                 todoList.add(busProcessName);
             }
         }
@@ -489,6 +503,17 @@ public class TodoTaskController {
         return findtodotask;
     }
 
+    /**
+     * 批量查询详情
+     */
+    @ApiOperation(value = "批量查询详情")
+    @PostMapping("/batchQueryDetail")
+    public ResponseMessage batchQueryDetail(List<BusProcessNew> busProcessNewList) {
+
+
+        return Result.success();
+    }
+
     /**
      *
      * @param prcId
@@ -895,7 +920,8 @@ public class TodoTaskController {
         queryWrapper.orderByDesc("CREAT_TIME");
         queryWrapper.isNotNull("PRC_ID");
         queryWrapper.isNotNull("PRC_NUM");
-        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue());
+        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
 
         List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
         Page page = new Page();
@@ -1083,7 +1109,8 @@ public class TodoTaskController {
                 queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
             }
 
-            queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue());
+            queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                    .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
 
             List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
 
@@ -1254,7 +1281,8 @@ public class TodoTaskController {
 
         queryWrapper.isNotNull("PRC_ID");
         queryWrapper.isNotNull("PRC_NAME");
-        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue());
+        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
 
         List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
 

report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java

@@ -117,4 +117,7 @@ public class BusProcessName implements Serializable {
     @TableField("SUBMIT_STATUS")
     private String submitStatus;
 
+    @TableField(exist = false)
+    private String submitJson;
+
 }

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java

@@ -34,7 +34,7 @@ public class oneApplyAfter implements TaskListener {
         ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class);
         //查询task任务
         LambdaQueryWrapper<TtReportManageAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(TtReportManageAct::getPrcId, delegateTask.getProcessInstanceId());
         List<TtReportManageAct> ttReportManageActs = ttReportManageActDao.selectList(queryWrapper);
         TtReportManageAct ttReportManageAct = new TtReportManageAct();
         if (ttReportManageActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java

@@ -27,7 +27,7 @@ public class reEditAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<TtReportManageAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(TtReportManageAct::getPrcId, delegateTask.getProcessInstanceId());
         List<TtReportManageAct> ttReportManageActs = ttReportManageActDao.selectList(queryWrapper);
         TtReportManageAct ttReportManageAct = new TtReportManageAct();
         if (ttReportManageActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java

@@ -27,7 +27,7 @@ public class startAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<TtReportManageAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(TtReportManageAct::getPrcId, delegateTask.getProcessInstanceId());
         List<TtReportManageAct> ttReportManageActs = ttReportManageActDao.selectList(queryWrapper);
         TtReportManageAct ttReportManageAct = new TtReportManageAct();
         if (ttReportManageActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java

@@ -28,8 +28,9 @@ public class oneApplyAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
         queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
+        queryWrapper.orderByDesc(PowerApplyAct::getUpdateDate);
         List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
         PowerApplyAct powerApplyAct = new PowerApplyAct();
         if (powerApplyActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java

@@ -30,8 +30,9 @@ public class reEditAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
         queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
+        queryWrapper.orderByDesc(PowerApplyAct::getUpdateDate);
         List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
         PowerApplyAct powerApplyAct = new PowerApplyAct();
         if (powerApplyActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java

@@ -27,8 +27,9 @@ public class startAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
         queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
+        queryWrapper.orderByDesc(PowerApplyAct::getUpdateDate);
         List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
         PowerApplyAct powerApplyAct = new PowerApplyAct();
         if (powerApplyActs.size()>0){

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java

@@ -32,8 +32,9 @@ public class twoApplyAfter implements TaskListener {
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
         LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
+        queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
         queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
+        queryWrapper.orderByDesc(PowerApplyAct::getUpdateDate);
         List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
         PowerApplyAct powerApplyAct = new PowerApplyAct();
         if (powerApplyActs.size()>0){