From a42f29ca6eb4ec9eeadda448b4bfe9cba1aca285 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 10 七月 2023 01:24:45 +0800
Subject: [PATCH] 按月交费功能开发完成
---
service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java b/service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java
index 3727657..2983d6b 100644
--- a/service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java
@@ -5,12 +5,11 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
-import com.java110.dto.visit.VisitDto;
+import com.java110.dto.owner.OwnerSettledApplyDto;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
-import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
+import com.java110.po.owner.OwnerSettledApplyPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,9 +67,9 @@
reqJson.put("nextUserId", reqJson.getString("staffId"));
boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
if (isLastTask) {
- ownerSettledApplyPo.setState(VisitDto.STATE_C);
+ ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_COMPLETE);
} else {
- ownerSettledApplyPo.setState(VisitDto.STATE_D);
+ ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_DOING);
}
ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
//瀹屾垚褰撳墠娴佺▼ 鎻掑叆涓嬩竴澶勭悊浜�
@@ -78,14 +77,14 @@
reqJson.put("nextUserId", reqJson.getString("staffId"));
oaWorkflowUserInnerServiceSMOImpl.changeTaskToOtherUser(reqJson);
//reqJson.put("state", "1004"); //宸ュ崟杞崟
- ownerSettledApplyPo.setState(VisitDto.STATE_D);
+ ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_DOING);
ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
} else if ("1200".equals(reqJson.getString("auditCode"))
|| "1400".equals(reqJson.getString("auditCode"))
) { //閫�鍥炴搷浣�
oaWorkflowUserInnerServiceSMOImpl.goBackTask(reqJson);
//reqJson.put("state", "1003"); //宸ュ崟閫�鍗�
- ownerSettledApplyPo.setState(VisitDto.STATE_F);
+ ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_FAIT);
ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
} else {
throw new IllegalArgumentException("涓嶆敮鎸佺殑绫诲瀷");
--
Gitblit v1.8.0