From a137500cf7a3f558fef9aafc9f608c06fbbc7dff Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 05 六月 2023 08:52:01 +0800
Subject: [PATCH] 优化嘉定纪委接口
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index ceae9f1..45ac8b1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -77,18 +77,23 @@
Api1205 apiData;
Api1105 api1105;
List<Fz35InoutNoticeOut> listInoutNotice;
+ List<Api1205> api1205List;
// List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
-
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ continue;
+ }
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
if(null == api1105){
continue;
}
apiData = new Api1205();
-
- apiData.setId(sysData.getId());
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
@@ -110,8 +115,8 @@
}
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
@@ -150,13 +155,12 @@
apiData.setMzjly(sysData.getFullWeightUser());
//鍑�閲�
- apiData.setJz(sysData.getSettleWeight());
+ apiData.setJz(sysData.getRecordWeight());
c.setTime(sysData.getCompleteTime());
c.add(Calendar.MINUTE,3);
apiData.setCmsj(c.getTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(c.getTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -164,6 +168,13 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
+
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
--
Gitblit v1.9.3