修改飞书流程类型

laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/UnifiedTodoVO.java

@@ -23,8 +23,6 @@ public class UnifiedTodoVO {
     private String processDefinitionId;
     @ApiModelProperty(value = "0：待办，2：已办，4：办结，8：待阅，10：已阅")
     private String isRemark;
-    @ApiModelProperty(value = "0：待办，2：已办，3：转办，4：办结")
-    private String isStatus;
     @ApiModelProperty(value = "转办时用")
     private String toUserId;
     @ApiModelProperty(value = "发送时的时间")

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

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -101,7 +102,7 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
             instanceDto.setPromoterUserId(processAll.getCreateUserId());
             instanceDto.setReviewedIds(userId);
             SysUser sysUser = sysUserService.getById(userId);
-            String date = unifiedTodoVO.getDate();
+            String date = new SimpleDateFormat("yyyy-MM-dd").format(processAll.getCreateTime());
             String noticeTitle = processApprovalRecord.getTaskName() + "(" + sysUser.getRealname() + " " + date + ")";
             instanceDto.setTitle(noticeTitle);
             instanceDto.setProcessType(processAll.getPrcType());
@@ -114,7 +115,7 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
             String status = "";
             String instanceStatus = "";
             //PENDING：待审批 APPROVED：任务同意 REJECTED：任务拒绝 TRANSFERRED：任务转交
-            switch (unifiedTodoVO.getIsStatus()){
+            switch (unifiedTodoVO.getIsRemark()){
                 // 0待办，2已办，4办结
                 case CommonConstant.TODO_TYPE_0: status = instanceStatus = "PENDING";
                     break;

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

@@ -193,7 +193,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         unifiedTodoVO.setRecordId(approvalRecord.getId());
         unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
         unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0);
-        unifiedTodoVO.setIsStatus(CommonConstant.TODO_TYPE_0);
         list.add(unifiedTodoVO);
         pushWorkflowIntegrationAPI.sendTodoTask(list);
     }
@@ -223,7 +222,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
             UnifiedTodoVO unifiedTodoVO = new UnifiedTodoVO();
             unifiedTodoVO.setRecordId(approvalRecord.getId());
             unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
-            unifiedTodoVO.setIsStatus(CommonConstant.TODO_TYPE_3);
             unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
             list.add(unifiedTodoVO);
             pushWorkflowIntegrationAPI.sendTodoTask(list);
@@ -237,7 +235,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
             list.clear();
             unifiedTodoVO.setToUserId(assignee);
             unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0);
-            unifiedTodoVO.setIsStatus(CommonConstant.TODO_TYPE_0);
             list.add(unifiedTodoVO);
             pushWorkflowIntegrationAPI.sendTodoTask(list);
         }
@@ -324,7 +321,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         unifiedTodoVO.setRecordId(approvalRecord.getId());
         unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
         unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
-        unifiedTodoVO.setIsStatus(CommonConstant.TODO_TYPE_2);
         list.add(unifiedTodoVO);
         pushWorkflowIntegrationAPI.sendTodoTask(list);
     }
@@ -465,7 +461,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
                 unifiedTodoVO.setRecordId(approvalRecord.getId());
                 unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
                 unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
-                unifiedTodoVO.setIsStatus(CommonConstant.TODO_TYPE_2);
                 list.add(unifiedTodoVO);
             }
             pushWorkflowIntegrationAPI.sendTodoTask(list);

laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java

@@ -120,10 +120,10 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
-        // 自动完成第一个任务
-        actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
         actFlowCommonService.updateProcessAll(processInfo);
+        // 自动完成第一个任务
+        actFlowCommonService.completeTask(taskId, userId);
         // 保存快照
         processHandleService.saveToSnapshot(processInfoVO,userId);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java

@@ -118,10 +118,10 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
-        // 自动完成第一个任务
-        actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
         actFlowCommonService.updateProcessAll(processInfo);
+        // 自动完成第一个任务
+        actFlowCommonService.completeTask(taskId, userId);
         // 保存快照
         processHandleService.saveToSnapshot(processInfoVO,userId);
     }