From 06cdcb0d08eba55bd1e17686a4015416f1545233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 30 Jul 2024 14:24:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9E=E4=B9=A6=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/api/dto/message/UnifiedTodoVO.java | 2 -- .../docking/hiwork/service/impl/SendFeiShuServiceImpl.java | 5 +++-- .../modules/activiti/listener/MyGlobalEventListener.java | 5 ----- .../impl/ProcessMarketStandardReleaseServiceImpl.java | 4 ++-- .../ni/service/impl/ProcessNewStandardImportServiceImpl.java | 4 ++-- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/UnifiedTodoVO.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/UnifiedTodoVO.java index 7d43fe60..5f0f4847 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/UnifiedTodoVO.java +++ b/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 = "发送时的时间") diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java index 89613e6a..c0b2fc08 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java +++ b/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; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index b1d1d179..a2b82a7f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/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); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index ee50f348..76134ab1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -120,10 +120,10 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl