Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -163,6 +163,9 @@ public interface LawsUserInfoService {
     @GetMapping("/lawss/sarBussionessStand/updateSarBussionessStand")
     public ResponseMessage<Object> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO);
 
+    @GetMapping("/lawss/SarBussStandAttrInfo/getBussAttrInfo")
+    public Map<String,Object> getBussAttrInfo(@RequestParam("standId") String standId);
+
 
     @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
     public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);
@@ -170,5 +173,8 @@ public interface LawsUserInfoService {
     @PostMapping("/wg_work_group/updateDataByWk")
     public ResponseMessage<Object> wg_work_group_update(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO);
 
+    @GetMapping("/slrs/sar-public-idea/deletePublicIdea")
+    public ResponseMessage<Object> deletePublicIdea(@RequestParam("id") String id);
+
 
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -91,6 +92,14 @@ public class BusProcessNew implements Serializable {
     @TableField("PRC_NAME")
     private String prcName;
 
+    @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
     @TableField( exist = false)
     @ApiModelProperty(value = "OA link")
     private String link;

src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java

@@ -75,4 +75,7 @@ public class SarPublicIdeaAll  {
     @TableField("cause")
     private String cause;
 
+    @TableField("source_type")
+    private String sourceType;
+
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java

@@ -67,6 +67,7 @@ public class Step10After implements TaskListener {
                         if ("1".equals(object1.getString("source"))) {
                             sarPublicIdeaAll.setWkFlag("1");
                         }
+                        sarPublicIdeaAll.setSourceType(object1.getString("sourceType"));
                         sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class));
                         sarPublicIdeaAll.setState(object1.getString("state"));
                         sarPublicIdeaAll.setCause(object1.getString("cause"));

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java

@@ -3,10 +3,7 @@ package com.ydw.bat.wkflow.listener.aboliish;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
-import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.*;
-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.entity.SarBussionessStand;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
@@ -47,11 +44,12 @@ public class ProcessStep6After implements TaskListener {
                 SarBussionessStand sarBussionessStand = new SarBussionessStand();
                 sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus"));
                 sarBussionessStand.setId(object.getString("standId"));
-                Map<String, Object> map=new HashMap<>();
                 SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
-                map.put("fzrqbuss",dateFormat.format(new Date()));
+                Map<String,Object> bussAttrInfoMap = lawsUserInfoService.getBussAttrInfo(object.getString("standId"));
-                sarBussionessStand.setAttrInfoCaseMap(map);
+                if(bussAttrInfoMap != null){
-                String as="{'FZRQBUSS':'"+dateFormat.format(new Date())+"'}";
+                    bussAttrInfoMap.replace("FZRQBUSS",dateFormat.format(new Date()));
+                }
+                String as = JSONObject.toJSONString(bussAttrInfoMap);
                 sarBussionessStand.setSarStandAttrEOStr(as);
                 lawsUserInfoService.updateSarBussionessStand(sarBussionessStand);
             }
@@ -85,13 +83,14 @@ public class ProcessStep6After implements TaskListener {
         }
 
         // 存储当前节点意见1
-        if (null!=object.getString("commentText")) {
+        if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
             List<BusProcessNew> list = busBean.list(queryWrapper3);
-            if(!list.isEmpty()){
+            if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskInfo(delegateTask.getName());
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java

@@ -25,6 +25,8 @@ public class BussFs2Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java

@@ -22,6 +22,8 @@ public class BussFs3Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java

@@ -22,6 +22,8 @@ public class BussFsC2Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java

@@ -25,6 +25,8 @@ public class BussFsSub1Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java

@@ -22,6 +22,8 @@ public class BussFsSub2Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java

@@ -22,6 +22,7 @@ public class BLApplicantC1Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java

@@ -22,6 +22,7 @@ public class BussLibrary10Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java

@@ -22,6 +22,7 @@ public class BussLibrary11Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java

@@ -25,6 +25,7 @@ public class BussLibrary12Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java

@@ -22,6 +22,7 @@ public class BussLibrary13Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java

@@ -22,6 +22,7 @@ public class BussLibrary2Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java

@@ -25,6 +25,7 @@ public class BussLibrary3Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java

@@ -22,6 +22,7 @@ public class BussLibrary4Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java

@@ -22,6 +22,7 @@ public class BussLibrary5Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java

@@ -25,6 +25,7 @@ public class BussLibrary6Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java

@@ -22,6 +22,7 @@ public class BussLibrary7Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java

@@ -22,6 +22,7 @@ public class BussLibrary8Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java

@@ -22,6 +22,7 @@ public class BussLibrary9Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java

@@ -22,6 +22,7 @@ public class BussLibraryC3Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java

@@ -22,6 +22,7 @@ public class BussLibraryC6Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct10Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct11Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct12Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProduct13Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct14Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2Before.java

@@ -22,6 +22,7 @@ public class BussLibraryProduct2Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProduct3Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct4Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct5Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProduct6Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProduct7Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct8Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9Before.java

@@ -22,6 +22,8 @@ public class BussLibraryProduct9Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProductC3Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6Before.java

@@ -25,6 +25,8 @@ public class BussLibraryProductC6Before implements TaskListener{
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.orderByDesc("CREATE_TIME");
+
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);