-安全阀申请单审批流修改

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -117,6 +117,7 @@ public class TApplyOfflinevalveController extends BaseController {
         tApplyOfflinevalve.setProcessId(pi.getProcessInstanceId());
         tApplyOfflinevalveService.updateTApplyOfflinevalve(tApplyOfflinevalve);
 
+        // 申请人申请直接通过
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         TaskService taskService = processEngine.getTaskService();
         Task task = taskService.createTaskQuery().processInstanceId(pi.getProcessInstanceId()).active().singleResult();
@@ -132,39 +133,44 @@ public class TApplyOfflinevalveController extends BaseController {
     @Log(title = "安全阀离线切出申请审核处理", businessType = BusinessType.UPDATE)
     @PutMapping("/handle")
     public AjaxResult handle(@RequestBody DevTask devTask) {
+        //更新数据
         TApplyOfflinevalve form = devTask.getOfflinevalve();
-        //流程审批意见
-        String symbol = "";
-        if (StringUtils.isNotEmpty(form.getRemarks())) {
-            symbol = "，";
-        } else
-            form.setRemarks("");
         //使用任务服务完成任务(提交任务)
         String taskId = devTask.getTaskId();
         // 使用任务id,获取任务对象，获取流程实例id
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         //利用任务对象，获取流程实例id
         String processInstancesId = task.getProcessInstanceId();
+        // 旧数据
         TApplyOfflinevalve tApplyOfflinevalve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(form.getId());
-        String taskName = task.getName();
+        String taskName = task.getName();//实例名
+        // 添加备注
         String remarks = StringUtils.isEmpty(tApplyOfflinevalve.getRemarks()) ? "" : tApplyOfflinevalve.getRemarks();
         if (taskName.contains("临时措施确认人")) {
             taskName = "临时措施确认人";
         } else if (taskName.contains("信息确认人")) {
             taskName = "信息确认人";
         }
+        //流程审批意见
+        String symbol = "";
+        String text="";
+        if (StringUtils.isNotEmpty(form.getRemarks())) {
+             text = form.getRemarks();
+            symbol = "，";
+            form.setRemarks(remarks + taskName + "-" + getNickName() + "：" + form.getRemarks() + "；");
+        } else
+            form.setRemarks("");
+        // 判断流程
         if ("1".equals(devTask.getCondition())) {
-            devTask.setComment("通过" + symbol + form.getRemarks());
-            form.setRemarks(remarks + taskName + "-" + getNickName() + "：通过" + symbol + form.getRemarks() + "；");
+            devTask.setComment("通过" + symbol + text);
         } else if ("0".equals(devTask.getCondition())) {
-            devTask.setComment("拒绝" + symbol + form.getRemarks());
-            form.setRemarks(remarks + taskName + "-" + getNickName() + "：拒绝" + symbol + form.getRemarks() + "；");
+            devTask.setComment("拒绝" + symbol + text);
             form.setStatus(1L);
             form.setApproveStatus("3");
         } else if ("2".equals(devTask.getCondition())) {
-            devTask.setComment("驳回" + symbol + form.getRemarks());
-            form.setRemarks(remarks + taskName + "-" + getNickName() + "：驳回" + symbol + form.getRemarks() + "；");
+            devTask.setComment("驳回" + symbol + text);
         }
+        // 根据实例名判断当前流程节点
         Map<String, Object> param = new HashMap<>();
         switch (task.getName()) {
             case "临时措施确认人1":
@@ -173,6 +179,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setConfirmerName(getNickName());
                 form.setTemporaryTime(new Date());
                 if ("临时措施确认人2".equals(task.getName())) {
+                    //查询经理
                     TStaffmgr tStaffmgr = new TStaffmgr();
                     tStaffmgr.setActualposts("24,26");
                     StringBuilder approvers = new StringBuilder();
@@ -194,7 +201,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setApprover(getUserId().toString());
                 form.setApproverName(getNickName());
                 form.setApproveTime(new Date());
-                if ("1".equals(devTask.getCondition()))
+                if ("1".equals(devTask.getCondition()))//只有通过时审批状态才会变为已通过
                     form.setApproveStatus("2");
                 param.put("infoconfirmer", tApplyOfflinevalve.getConfirmer());
                 break;
@@ -203,16 +210,17 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setInfoConfirmer(getUserId().toString());
                 form.setInfoConfirmerName(getNickName());
                 form.setConfirmTime(new Date());
+                // 如果上锁确认人1不为空上锁确认人2即信息确认人2
                 if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockConfirmer1())) {
                     form.setLockConfirmer2(getUserId().toString());
                     form.setLockConfirmer2Name(getNickName());
-                }else{
-                    form.setLockConfirm("NA");
+                } else {
+                    form.setLockConfirm("NA");//否则确认是否已上锁为NA
                 }
                 if ("信息确认人2".equals(task.getName())) {
-                    form.setStatus(1L);
+                    form.setStatus(1L);//信息确认人2确认后申请单状态为已完成
                 }
-                param.put("lockConfirmer", form.getLockConfirmer1());
+                param.put("lockConfirmer", form.getLockConfirmer1());//设置上锁确认人
                 form.setLockConfirmer1(null);
                 break;
             case "确认人1":
@@ -220,6 +228,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 form.setLockConfirmer1Name(getNickName());
                 break;
         }
+        //网关判断
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getDisassembly()) && !"NA".equals(tApplyOfflinevalve.getDisassembly())) {
             param.put("is_unlock", "1");
         } else if (StringUtils.isNotEmpty(tApplyOfflinevalve.getDisassembly()) && "NA".equals(tApplyOfflinevalve.getDisassembly())) {
@@ -233,6 +242,7 @@ public class TApplyOfflinevalveController extends BaseController {
                 .claim(taskId, getUserId().toString());
         taskService.addComment(taskId, processInstancesId, devTask.getComment());
         taskService.complete(taskId, param);
+        //任务完成更新数据
         tApplyOfflinevalveService.updateTApplyOfflinevalve(form);
         return AjaxResult.success();
     }