[修改] 调整变更人的bug

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

@@ -252,12 +252,19 @@ public class TodoTaskController {
         }
         //监控流程中 变更处理人为永久变更
         if (replaceMap != null){
-            ibusProcessApproveService.changeAssignee(replaceMap,taskId);
+            ibusProcessApproveService.changeAssignee(replaceMap,pId);
         }
 
         log.info("task {} find " + taskId);
         return WrapMapper.ok("改派成功");
     }
+    @ApiOperation(value = "查询当前任务", notes = "查询当前任务")
+    @ApiImplicitParams(@ApiImplicitParam(name = "taskId", value = "任务id"))
+    @GetMapping("/selectTask")
+    public ResponseMessage completeTaskByUserId(String taskId) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        return Result.success(task);
+    }
 
     @ApiOperation(value = "完成任务", notes = "流程单个节点任务，直接完成任务")
     @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),

report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java

@@ -16,7 +16,7 @@ public interface IBusProcessApproveService extends IService<BusProcessApprove> {
     /**
      * 监控流程中 变更处理人为永久变更
      * @param replaceMap
-     * @param taskId
+     * @param pId
      */
-    void changeAssignee(String replaceMap,String taskId);
+    void changeAssignee(String replaceMap,String pId);
 }

report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java

@@ -30,12 +30,16 @@ public class BusProcessApproveServiceImpl extends ServiceImpl<BusProcessApproveM
     }
 
     @Override
-    public void changeAssignee(String replaceMap,String taskId) {
-        BusProcessApprove busProcessApprove = baseMapper.selectEoByTask(taskId);
+    public void changeAssignee(String replaceMap,String prcId) {
+        List<BusProcessApprove> busProcessApproves = baseMapper.selectEoByPrcIdAndTask(prcId);
+        BusProcessApprove busProcessApprove = busProcessApproves.get(0);
         String fromValsJson = busProcessApprove.getFromValsJson();
         JSONObject jsonObject = JSON.parseObject(fromValsJson);
-        String[] split = replaceMap.split(":");
-        jsonObject.replace(split[0],split[1]);
+        String[] split = replaceMap.split(",");
+        String[] split1 = split[0].split(":");
+        String[] split2 = split[1].split(":");
+        jsonObject.replace(split1[0],split1[1]);
+        jsonObject.replace(split2[0],split2[1]);
         busProcessApprove.setFromValsJson(jsonObject.toJSONString());
         baseMapper.updateById(busProcessApprove);
     }

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

@@ -2,8 +2,8 @@ package com.adc.da.wkflow.listener.powerApply;
 
 import com.adc.da.login.util.UserUtils;
 import com.adc.da.report.dao.mysql.PowerApplyActDao;
-import com.adc.da.report.dao.mysql.PowerApplyDao;
 import com.adc.da.report.eo.PowerApplyAct;
+import com.adc.da.report.service.IPowerApplyService;
 import com.adc.da.wkflow.business_main.entity.BusProcessApprove;
 import com.adc.da.wkflow.business_main.entity.BusProcessNew;
 import com.adc.da.wkflow.business_main.service.IBusProcessApproveService;
@@ -25,7 +25,7 @@ public class aid3 implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
-        PowerApplyDao powerApplyDao = SpringContextUtil.getBean(PowerApplyDao.class);
+        IPowerApplyService iPowerApplyService = SpringContextUtil.getBean(IPowerApplyService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
@@ -60,7 +60,7 @@ public class aid3 implements TaskListener {
         // 1: 同意 2：退回
         delegateTask.setVariable("flag",s);
         if ("1".equals(s)){
-            powerApplyDao.saveBatch(powerApplyActs);
+            iPowerApplyService.saveBatch(powerApplyActs);
         }
 
     }