From 4c8ad371d7a5eac9227d487341c56c4dab264d7b Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 15:16:23 +0800
Subject: [PATCH] 还款提醒，纠正提醒的判断，添加修改单价时，重新验证还款提醒。
---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
index 6cc150e..cc357fe 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -6,9 +6,9 @@
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkNode;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
@@ -69,7 +69,7 @@
work.setDeptId(data.getDeptId());
work.setCompanyId(data.getCompanyId());
work.setUpdateTime(new Date());
- work.setTitle("鍏ュ簱閫氱煡鍗曞鎵�");
+ work.setTitle(data.getName()+"-瀹℃壒");
work.setConfId(conf.getId());
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
@@ -114,7 +114,7 @@
work.setDeptId(data.getDeptId());
work.setCompanyId(data.getCompanyId());
work.setUpdateTime(new Date());
- work.setTitle("鍑哄簱閫氱煡鍗曞鎵�");
+ work.setTitle(data.getName()+"-瀹℃壒");
work.setConfId(conf.getId());
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
@@ -193,6 +193,12 @@
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
+ work.setDescription("褰撳墠鍚堝悓<" + data.getName() + ">涓嬭川鎶间粨搴�<" + data.getDepotNames() + ">搴撳瓨閲忛噾棰濋珮浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆撅紒");
+
+ work.setCreateBy("绯荤粺鐢熸垚");
+ work.setCreateById("sys");
+ work.setUpdateBy("绯荤粺鐢熸垚");
+
String nextNode = this.getNextNode(WorkNode.NODE_START.getCode(), conf).getCode();
work.setNode(nextNode);
orderService.addData(work);
@@ -261,7 +267,7 @@
WorkNode nextNode = this.getNextNode(work.getNode(), conf);
- log.info("宸ュ崟瀹℃壒锛歿}锛屽綋鍓嶈妭鐐癸細{}锛屼笅涓�鑺傜偣锛歿}", work.getTitle(), work.getNode(), nextNode);
+ log.info("宸ュ崟瀹℃壒锛歿}锛屾墽琛屽姩浣滐細{}锛屽綋鍓嶈妭鐐癸細{}锛屼笅涓�鑺傜偣锛歿}", work.getTitle(), action, work.getNode(), nextNode);
//閫氳繃鎿嶄綔
if ("pass".equals(action)) {
@@ -274,6 +280,10 @@
work.setAssigneeId(process.getAssigneeId());
work.setNode(nextNode.getCode());
orderService.complete(work);
+ }else{
+ work.setNode(nextNode.getCode());
+ work.setStatus(WorkStatus.STATUS_30.getCode());
+ orderService.updateData(work);
}
//澧炲姞瀹℃壒璁板綍
@@ -284,11 +294,30 @@
//鎷掔粷鎿嶄綔
if ("refuse".equals(action)) {
process.setAction("鎷掔粷");
- process.setNode(WorkNode.NODE_END.getCode());
+ process.setNode(work.getNode());
work.setStatus(WorkStatus.STATUS_60.getCode());
orderService.complete(work);
+
+ //澧炲姞瀹℃壒璁板綍
+ orderProcessService.addData(process, true);
+
+ return BaseResp.success();
+ }
+
+ //寮傚父澶勭悊
+ if ("error".equals(action)) {
+ process.setAction("寮傚父澶勭悊");
+ process.setNode(work.getNode());
+ work.setStatus(WorkStatus.STATUS_50.getCode());
+
+// work.setAssigneeName(process.getAssigneeName());
+// work.setAssigneeId(process.getAssigneeId());
+
+
+ orderService.complete(work);
+
//澧炲姞瀹℃壒璁板綍
orderProcessService.addData(process, true);
--
Gitblit v1.9.3