From 05d2819f1069d24ceb96615705d40f44ab5f1f9c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 28 十二月 2023 13:55:50 +0800
Subject: [PATCH] 调整上海嘉定纪委接口3
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 90d7b8f..407c8d8 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -80,6 +80,9 @@
List<Fz35InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
for (Fz35InoutRecord sysData : list) {
+ if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
+ continue;
+ }
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
}
@@ -99,7 +102,7 @@
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date time = dateFormat.parse(sysData.getId().substring(2, 10));
- int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
+ int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
if(numDay != 0){
sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
@@ -115,7 +118,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -135,7 +138,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -153,6 +156,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
@@ -161,6 +167,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -170,14 +179,18 @@
apiData.setQzsfzkl(0 - sysData.getDeWet());
apiData.setQzzzzkl(0 - sysData.getDeImpurity());
- //鍖呰
- // apiData.setBzwkl(0 - sysData.getDePack());
//鍏跺畠
+ if(null == sysData.getDeOther()){
+ sysData.setDeOther(0.0);
+ }
apiData.setQtkl( 0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
+ }
apiData.setCmsj(sysData.getCompleteTime());
//鍏ュ簱缁撶畻鍗曞彿,榛樿缁熶竴缁撶畻锛屼笉璁剧疆缁撶畻鍗曞彿
--
Gitblit v1.9.3