From e6535ab931a79cce25b3c15b47ce59dcb66e69e9 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期四, 25 五月 2023 15:57:21 +0800
Subject: [PATCH] 上海嘉定纪委接口优化1
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 a731bc6..aac0e91 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -9,8 +9,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.InoutNoticeOut;
-import com.fzzy.async.fzzy35.entity.InoutRecord;
+import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeOut;
+import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35SyncNoticeOutRep;
import lombok.extern.slf4j.Slf4j;
@@ -67,7 +67,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍑哄簱淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
- List<InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_OUT, start, end);
+ List<Fz35InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撲俊鎭�------------------");
@@ -76,19 +76,21 @@
Api1205 apiData;
Api1105 api1105;
- List<InoutNoticeOut> listInoutNotice;
+ List<Fz35InoutNoticeOut> listInoutNotice;
+ List<Api1205> api1205List;
// List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
- for (InoutRecord sysData : list) {
-
+ for (Fz35InoutRecord sysData : list) {
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�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));
@@ -150,13 +152,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 +165,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