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/igds/timer/JobWarnService.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
index 3ee1044..d8bdf0a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
@@ -18,9 +18,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Description 璀﹀憡淇℃伅瀹氭椂缁熻锛氳繕娆炬彁閱�
@@ -67,7 +67,9 @@
double backMoney = 0.0;
for (PledgeContract pledgeContract : contractList) {
log.info("-----寮�濮嬪鐞嗚川鎶煎悎鍚岋細{}-----", pledgeContract.getName());
- List<PledgeReminders> remindersList = new ArrayList<>();
+// List<PledgeReminders> remindersList = new ArrayList<>();
+
+ Map<String,PledgeReminders> remindersMap = new java.util.HashMap<>();
//璁＄畻寰呰繕娆鹃噾棰�
@@ -115,23 +117,39 @@
}
sumMoney += depot.getStorageReal() * foodPrice.getPrice();
- PledgeReminders reminders = new PledgeReminders();
- reminders.setDepotId(depot.getId());
- reminders.setDepotName(depot.getName());
- reminders.setFoodVariety(depot.getFoodVariety());
- reminders.setFoodVarietyName(depot.getFoodVarietyName());
- reminders.setFoodPrice(foodPrice.getPrice());
- reminders.setStorageReal(depot.getStorageReal());
- remindersList.add(reminders);
+ //鎸夊搧绉�+鍗曚环鐢熸垚key锛屾潵浣滀负鍞竴鏍囪瘑锛岀粺璁＄伯椋熷搧绉嶇殑搴撳瓨閲忎互鍙婄伯椋熷搧绉嶄俊鎭�
+ String key=depot.getFoodVariety()+foodPrice.getPrice();
+ PledgeReminders pledgeReminders = remindersMap.get(key);
+ if (null == pledgeReminders) {
+ pledgeReminders = new PledgeReminders();
+ pledgeReminders.setFoodVariety(depot.getFoodVariety());
+ pledgeReminders.setFoodVarietyName(depot.getFoodVarietyName());
+ pledgeReminders.setFoodPrice(foodPrice.getPrice());
+ pledgeReminders.setStorageReal(pledgeReminders.getStorageReal()+depot.getStorageReal());
+
+ }else{
+ pledgeReminders.setStorageReal(pledgeReminders.getStorageReal()+depot.getStorageReal());
+ }
+ remindersMap.put(key,pledgeReminders);
+// PledgeReminders reminders = new PledgeReminders();
+// reminders.setDepotId(depot.getId());
+// reminders.setDepotName(depot.getName());
+// reminders.setFoodVariety(depot.getFoodVariety());
+// reminders.setFoodVarietyName(depot.getFoodVarietyName());
+// reminders.setFoodPrice(foodPrice.getPrice());
+// reminders.setStorageReal(depot.getStorageReal());
+// remindersList.add(reminders);
log.info("-----褰撳墠鍚堝悓={}涓嬩粨搴�={}锛氬搴旂殑瀹為檯鍌ㄩ噺={}锛屽搴旂伯椋熷崟浠�={}-----", pledgeContract.getName(), depot.getName(), depot.getStorageReal(), foodPrice.getPrice());
}
per = sumMoney / backMoney;
- if (per < 1.1) {
+ if (per > 1.1) {
+ //璐у彲浠ユ姷璐锋
log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑110%锛宻umMoney={}锛宐ackMoney={}锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
continue;
}
+ //璐т笉瓒充互鎶佃捶娆� ,鎻愰啋浼佷笟琛ラ挶
//鎵ц娴佺▼
conf = workService.getConfByDeptId(pledgeContract.getPledgeDept(), WorkBizType.TYPE_50);
@@ -141,7 +159,7 @@
continue;
}
- BaseResp resp = workService.startByBackMoney(pledgeContract, conf,remindersList);
+ BaseResp resp = workService.startByBackMoney(pledgeContract, conf,remindersMap);
log.info("---------褰撳墠鍚堝悓={}鍚姩杩樻鎻愰啋宸ュ崟娴佺▼------{}", pledgeContract.getName(), resp);
}
}
--
Gitblit v1.9.3