update hiwork消息新增flowid

laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java

@@ -19,5 +19,5 @@ public interface PushWorkflowIntegrationAPI {
      **/
     void sendTodoTask(List<HiworkTodoAdd> hiworkTodoAddList);
 
-    void sendActivityComplete(String processInstanceId);
+    void sendActivityComplete(List<HiworkTodoAdd> processInstanceId);
 }

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java

@@ -91,7 +91,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             throw new JeroBootException(ResultCommon.EMPTY_COMMON, "hiworkTodoAddList");
         }
         try {
-            List<HiworkTodo> hiworkTodoList = getHiworkTodos(hiworkTodoAddList);
+            List<HiworkTodo> hiworkTodoList = getHiworkTodos(hiworkTodoAddList,false);
             log.info("统一待办推送入参" + JSON.toJSONString(hiworkTodoList));
             // 远程调用
             JSONObject json = restTemplate.postForObject(ip + todoUrl,hiworkTodoList, JSONObject.class);
@@ -106,13 +106,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
     }
 
     @Override
-    public void sendActivityComplete(String processInstanceId) {
+    public void sendActivityComplete(List<HiworkTodoAdd> hiworkTodoAddList) {
         if(!isWorkflow){
             return;
         }
-        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
         try {
-            List<HiworkTodo> hiworkTodoList = getHiworkTodos(processAll);
+            List<HiworkTodo> hiworkTodoList = getHiworkTodos(hiworkTodoAddList, true);
             log.info("统一待办推送入参" + JSON.toJSONString(hiworkTodoList));
             // 远程调用
             JSONObject json = restTemplate.postForObject(ip + todoUrl,hiworkTodoList, JSONObject.class);
@@ -125,45 +124,9 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             log.error("统一待办推送异常",e);
         }
     }
-    @NotNull
-    private List<HiworkTodo> getHiworkTodos(ProcessAll processAll) {
-        List<HiworkTodo> hiworkTodoList = new ArrayList<>();
-        HiworkTodo hiworkTodo = new HiworkTodo();
-        hiworkTodo.setSysCode(hiworkSysCode);
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String date = DateUtil.formatDateTime(new Date());
-        String noticeTitle = processAll.getPrcName() + "(" + loginUser.getRealname() + " " + date + ")";
-        hiworkTodo.setNoticeTitle(noticeTitle);
-        hiworkTodo.setFlowid(processAll.getProcessInstanceId());
-        hiworkTodo.setProcessId(processAll.getProcessInstanceId());
-        hiworkTodo.setProcessName(ProcessTypeEnum.getNameByValue(processAll.getPrcType()));
-        hiworkTodo.setProcessType(PROCESS_TYPE);
-
-            // 是否显示（0否，1是）
-            hiworkTodo.setIsShow("1");
-
-        SysUser sysUser = sysUserService.getById(processAll.getCreateUserId());
-        if(!Objects.isNull(sysUser)){
-            hiworkTodo.setCreateUserCode(sysUser.getUsername());
-            hiworkTodo.setCreateUserName(sysUser.getRealname());
-        }
-        if(!Objects.isNull(processAll.getDueTime())){
-            hiworkTodo.setDueTime(processAll.getDueTime().getTime());
-        }
-        hiworkTodo.setBid(processAll.getProjectId());
-        if(!Objects.isNull(sysUser)){
-            hiworkTodo.setUserId(sysUser.getId());
-            hiworkTodo.setUserCode(sysUser.getUsername());
-            hiworkTodo.setUserName(sysUser.getRealname());
-        }
-        hiworkTodo.setReceiveTime(Instant.now());
-        hiworkTodo.setIsTodo(String.valueOf(3));
-        hiworkTodoList.add(hiworkTodo);
-        return hiworkTodoList;
-    }
 
     @NotNull
-    private List<HiworkTodo> getHiworkTodos(List<HiworkTodoAdd> hiworkTodoAddList) {
+    private List<HiworkTodo> getHiworkTodos(List<HiworkTodoAdd> hiworkTodoAddList, boolean b) {
         List<HiworkTodo> hiworkTodoList = new ArrayList<>();
         for (HiworkTodoAdd hiworkTodoAdd : hiworkTodoAddList) {
             String recordId = hiworkTodoAdd.getRecordId();
@@ -172,12 +135,6 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             if(Objects.isNull(processApprovalRecord)){
                 continue;
             }
-            getObj(hiworkTodoList, processDefinitionId, processApprovalRecord);
-        }
-        return hiworkTodoList;
-    }
-
-    private void getObj(List<HiworkTodo> hiworkTodoList, String processDefinitionId, ProcessApprovalRecord processApprovalRecord) {
             HiworkTodo hiworkTodo = new HiworkTodo();
             hiworkTodo.setSysCode(hiworkSysCode);
             LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -254,7 +211,14 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             if (finishFlag.equals(2)){
                 hiworkTodo.setMultiInstance(0);
             }
+            if (b){
+                hiworkTodo.setIsTodo(String.valueOf(3));
+            }else {
                 hiworkTodo.setIsTodo(String.valueOf(finishFlag));
+            }
             hiworkTodoList.add(hiworkTodo);
         }
+        return hiworkTodoList;
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java

@@ -263,6 +263,9 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
         list.add(hiworkTodoAdd);
         pushWorkflowIntegrationAPI.sendTodoTask(list);
+
+        //    对接统一平台生成办结
+        pushWorkflowIntegrationAPI.sendActivityComplete(list);
     }
 
     private void activityComplete(ActivitiEvent event) {
@@ -290,9 +293,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         log.info("taskEntity.getActivityName() = " + execution.getActivityName());
         log.info("taskEntity.getDeploymentId() = " + execution.getDeploymentId());
         log.info("taskEntity.getProcessDefinitionId() = " + execution.getProcessDefinitionId());
-    //    对接统一平台生成办结
-        PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class);
-        pushWorkflowIntegrationAPI.sendActivityComplete(processInstanceId);
     }
 
     private boolean isFirstNodeTask(ProcessApprovalRecord record) {