From 4be521d7e3135ac0a8e4a15e395f44448e23e09e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 八月 2023 18:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 696ffbc..c1eed03 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+
+import java.util.*;
/**
* 绮鍏ュ簱淇℃伅
@@ -65,7 +64,6 @@
apiLog.setInteId(Constant.API_CODE_1202);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
- String sfzh = "";
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -80,6 +78,9 @@
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,11 +96,16 @@
}
apiData = new Api1202();
-
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
- if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
- apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
}
//璐т綅浠ｇ爜
@@ -111,7 +117,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -189,13 +195,13 @@
}else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
- sfzh = apiData.getSfzh();
+
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- System.out.println(sfzh);
+
log.error("---鍚屾澶辫触----{}", e);
apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
--
Gitblit v1.9.3