清单流程和入库流程 添加完成时间

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java

@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.standardLibrary;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
@@ -12,13 +13,14 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
 /**
- *  经理人审批后
+ * 经理人审批后
  */
-public class ManagerApproveAfter implements TaskListener{
+public class ManagerApproveAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
@@ -29,12 +31,12 @@ public class ManagerApproveAfter implements TaskListener{
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
 
-        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
 
-        if("1".equalsIgnoreCase(approvalOpinion)){
+        if ("1".equalsIgnoreCase(approvalOpinion)) {
-            delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
+            delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
 
             BusProcessNew busProcessNew = new BusProcessNew();
             busProcessNew.setMsgType("clause");
@@ -46,19 +48,41 @@ public class ManagerApproveAfter implements TaskListener{
             busProcessNew.setUserId(object.getString("applyUpdUserId"));
             busBean.save(busProcessNew);
 
-            func1(delegateTask, busBean, object,"1");
+            func1(delegateTask, busBean, object, "1");
-            delegateTask.setVariable("jlFlag",1);
+            delegateTask.setVariable("jlFlag", 1);
-        }else {
+        } else {
-            delegateTask.setVariable("jlFlag",0);
+            delegateTask.setVariable("jlFlag", 0);
-            func1(delegateTask, busBean, object,"0");
+            func2(delegateTask, busBean, object, "0", busProcessNameService);
         }
     }
 
-    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag) {
+    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
         QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("TASK_ID",delegateTask.getId());
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
         BusProcessNew one1 = busBean.getOne(queryWrapper1);
-        if(one1!=null){
+        if (one1 != null) {
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
+
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        if (one2 != null) {
+            one2.setPrcName("入库流程结束");
+            one2.setOverTime(OVERTIME);
+            one2.setPrcType("1");
+            busProcessNameService.saveOrUpdate(one2);
+        }
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
             one1.setCommitFlag(commitFlag);
             one1.setCommitText(object.getString("commentText"));
             busBean.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java

@@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.dto.AddDetailedDto;
 import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
 import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
@@ -33,6 +34,7 @@ public class SRPManagerApproveAfter implements TaskListener{
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -90,7 +92,7 @@ public class SRPManagerApproveAfter implements TaskListener{
                 throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！");
             }
             delegateTask.setVariable("jlFlag",0);
-            func1(delegateTask, busBean, object,"0");
+            func2(delegateTask, busBean, object,"0",busProcessNameService);
 
         }
 
@@ -106,4 +108,27 @@ public class SRPManagerApproveAfter implements TaskListener{
             busBean.saveOrUpdate(one1);
         }
     }
+
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) {
+
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        if(one2!=null){
+            one2.setPrcName("清单流程结束");
+            one2.setOverTime(OVERTIME);
+            one2.setPrcType("1");
+            busProcessNameService.saveOrUpdate(one2);
+        }
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID",delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if(one1!=null){
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
 }