Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -582,6 +582,7 @@ public class TodoTaskController extends BaseAction {
     public BusProcessNew inboundLiaisonDetail(String taskIds, String pId) {
 
         List<String> taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(",")));
+
         List<BusProcessNew> list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList);
         if (list.isEmpty()) {
             return null;
@@ -589,6 +590,14 @@ public class TodoTaskController extends BaseAction {
         BusProcessNew processNew = new BusProcessNew();
         BeanUtils.copyProperties(list.get(0), processNew);
 
+        if(StringUtils.isNotBlank(pId)){
+            List<Task> list2 = taskService.createTaskQuery().processInstanceId(pId).active().list();
+            if(!list2.isEmpty()){
+                processNew.setNowTaskInfo(list2.get(0).getName());
+            }
+        }
+
+
         JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg());
         JSONArray arr2 = new JSONArray();
         object3.put("taskBreak", arr2);
@@ -2334,6 +2343,9 @@ public class TodoTaskController extends BaseAction {
     @ApiOperation(value = "强制撤回", notes = "强制撤回")
     @GetMapping("/forceRecall")
     public Wrapper<String> forceRecall(String prcId) {
+
+        List<Task> list2 = taskService.createTaskQuery().processInstanceId(prcId).active().list();
+
         QueryWrapper<BusProcessName> wrapper=new QueryWrapper<>();
         wrapper.eq("PRC_ID",prcId);
         List<BusProcessName> busProcessNames=iBusProcessNameService.list(wrapper);
@@ -2347,6 +2359,10 @@ public class TodoTaskController extends BaseAction {
                     JSONObject object=JSONObject.parseObject(list.get(0).getMesg());
                     lawsUserInfoService.deletePublicIdea(object.getString("uniques"));
                 }
+            }else if("buss1".equals(busProcessName.getPrcType()) || "buss2".equals(busProcessName.getPrcType())){
+                if(!list2.isEmpty() && "发布".equals(list2.get(0).getName())){
+                    lawsUserInfoService.modSnByProcess(list2.get(0).getId());
+                }
             }
         }
 
@@ -2354,6 +2370,7 @@ public class TodoTaskController extends BaseAction {
         if(StringUtils.isNotBlank(prcId)){
             webServiceOAService.deleteOAByPid(prcId);
         }
+
         Map map = new HashMap();
         map.put("P_ID", prcId);
         iBusProcessNewService.removeByMap(map);

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

@@ -26,6 +26,9 @@ import java.util.Set;
 @RequestMapping("/")
 public interface LawsUserInfoService {
 
+    @GetMapping("/sarBussStandSn/sar-buss-stand-sn/modSnByProcess")
+    public ResponseMessage<Object> modSnByProcess(@RequestParam("taskId") String taskId);
+
     @GetMapping("sys/org/getManagerByOrgId")
     public ResponseMessage<List<OrgEO>> getManagerByOrgId(@RequestParam("roleName") String currentUsrId, @RequestParam("orgId") String orgId);
 

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

@@ -116,4 +116,8 @@ public class BusProcessNew implements Serializable {
     @TableField( exist = false)
     @ApiModelProperty(value = "提交状态 0 提交  其它 接受 ")
     private long commitStatus;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "当前节点信息")
+    private String nowTaskInfo;
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java

@@ -49,7 +49,9 @@ public class PresidentSignAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
-            one1.setOverTime(OVERTIME);
+            if (!"1".equals(object.getString("actionFlag"))) {
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java

@@ -50,7 +50,9 @@ public class PresidentSignAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
-            one1.setOverTime(OVERTIME);
+            if (!"1".equals(object.getString("actionFlag"))) {
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("2");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java

@@ -89,7 +89,7 @@ public class Step3After implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("prcCreateUser", String.class);
         String username = delegateTask.getVariable("prcCreateUserName", String.class);
-        String prcName =  delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-任务分发（项目经理）";
+        String prcName =  object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);