From 74a25082f68c00a797a7eca8672cde8edb0dc95f Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 17 三月 2026 15:16:32 +0800
Subject: [PATCH] 修改，gis建模监管页，数据不一致问题
---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 77650d1..3b7df54 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
@@ -21,7 +21,7 @@
import javax.annotation.Resource;
import java.text.DecimalFormat;
import java.util.Date;
-import java.util.List;
+import java.util.Map;
/**
* @Desc: 宸ュ崟涓氬姟鎺ュ彛
@@ -180,26 +180,33 @@
* @param data 鍑哄叆搴撳伐鍗曟暟鎹�
* @return 鍝嶅簲缁撴灉
*/
- public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf, List<PledgeReminders> remindersList) {
+ public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf, Map<String,PledgeReminders> remindersMap) {
if (null == conf) conf = confService.getByDeptId(data.getPledgeDept(), WorkBizType.TYPE_10);
if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("娴佺▼鏈惎鐢�");
+// Double sumMoneyNum = 0.0;
+ DecimalFormat df = new DecimalFormat("0.00");
+ double backMoney = data.getContractAmount() - data.getRepaidAmount();
//鍒涘缓宸ュ崟
- StringBuilder description = new StringBuilder("褰撳墠鍚堝悓<" + data.getName() + ">涓�");
- if (!remindersList.isEmpty()) {
- Double sumMoneyNum = 0.0;
- DecimalFormat df = new DecimalFormat("0.00");
+ StringBuilder description = new StringBuilder("鍚堝悓<" + data.getName() + ">璐锋浣欓锛�"+df.format(backMoney)+"鍏冿紝");
+ if (!remindersMap.isEmpty()){
- for (PledgeReminders reminders : remindersList) {
- description.append("锛屼粨搴�<").append(reminders.getDepotName()).append(">锛岃川鎶肩墿<").append(reminders.getFoodVarietyName()).append(">搴撳瓨閲忎负").append(df.format(reminders.getStorageReal())).append("kg锛屽崟浠�").append(reminders.getFoodPrice()).append("鍏冿紝");
- sumMoneyNum += reminders.getStorageReal() * reminders.getFoodPrice();
+ for (PledgeReminders reminders : remindersMap.values()) {
+ description.append("褰撳墠<").append(reminders.getFoodVarietyName())
+ .append(">鍗曚环锛�").append(reminders.getFoodPrice()).append("鍏�/KG锛�")
+ .append("鍓╀綑<").append(reminders.getFoodVarietyName())
+ .append(">搴撳瓨锛�").append(df.format(reminders.getStorageReal())).append("KG锛�");
+// sumMoneyNum += reminders.getStorageReal() * reminders.getFoodPrice();
}
- description.append("搴撳瓨閲忔�婚噾棰濅负").append(df.format(sumMoneyNum)).append("鍏冿紝杈惧埌鍚堝悓寰呰繕娆鹃噾棰濈殑110%,璇锋彁閱掍紒涓氳繘娆捐繕娆�");
- } else {
- description.append("璐ㄦ娂浠撳簱<").append(data.getDepotNames()).append(">搴撳瓨閲忛噾棰濋珮浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆�");
+ description.append("鎶煎搧浠峰�尖墹璐锋浣欓鐨�110%锛岃灏藉揩鎻愰啋浼佷笟杩樻锛�");
+
+ }else{
+ description.append("璐ㄦ娂浠撳簱<").append(data.getDepotNames()).append(">鎶煎搧浠峰�尖墹璐锋浣欓鐨�110%锛岃灏藉揩鎻愰啋浼佷笟杩樻锛�");
+
}
+
WorkOrder work = new WorkOrder();
work.setId(ContextUtil.generateOrderId("WARN"));
work.setBizType(WorkBizType.TYPE_50.getCode());
--
Gitblit v1.9.3