From 2a7ef33cebb5dc46a57ebf1f8a551f64b2209939 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 04 九月 2023 17:18:46 +0800
Subject: [PATCH] 提交
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 18 +++-----
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 56 ++++++++++++++--------------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 11 +----
3 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 94c7903..12a0ae0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -58,40 +58,40 @@
Date end = param.getEnd();
//瀹㈡埛鍚屾
-// fzzySync1212.syncData(kqdm, deptId, start, end);
+ fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
+ fzzySync1201.syncData(kqdm, deptId, start, end);
-// //绮鍏ュ簱鍚屾
+ //绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱璐ㄦ
+
+ //绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱缁撶畻
-// fzzySync1204.syncData(kqdm, deptId, start, end);
-// //绮鍑哄簱鍚屾
-// fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱缁撶畻
-// fzzySync1206.syncData(kqdm, deptId, start, end);
-// //绮鎹熺泭
-// fzzySync1209.syncData(kqdm, deptId, start, end);
-// //鍊掍粨淇℃伅鍚屾
-// fzzySync1207.syncData(kqdm, deptId, start, end);
-//
-// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
-// fzzySync1109.syncData(kqdm, deptId, start, end);
-//
-// //绮搴撳瓨鍚屾
+
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
+
+ //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+ fzzySync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
-//
-// //绮鎬ц川杞彉淇℃伅鍚屾
-// fzzySync1210.syncData(kqdm, deptId, start, end);
-//
-//
-// //璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
+
+ //绮鎬ц川杞彉淇℃伅鍚屾
+ fzzySync1210.syncData(kqdm, deptId, start, end);
+
+
+ //璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
}
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 c1eed03..9ed94d8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -77,7 +77,6 @@
Api1105 api1105;
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
- Calendar c = Calendar.getInstance();
String ywsj = "";
String num = "";
Map<String, Integer> map = new HashMap<>();
@@ -111,11 +110,11 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_2);
- apiData.setYwrq(sysData.getRegisterTime());
+ apiData.setYwrq(sysData.getCompleteTime());
apiData.setCyr(sysData.getUserName());
//榛樿涓�涓殢渚垮��
- apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
@@ -133,10 +132,9 @@
apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
- apiData.setCch(sysData.getPlateNum());
- c.setTime(sysData.getRegisterTime());
- c.add(Calendar.MINUTE,-3);
- apiData.setDjsj(c.getTime());
+ apiData.setCch(sysData.getPlateNum().trim());
+
+ apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -178,12 +176,10 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- c.setTime(sysData.getCompleteTime());
- c.add(Calendar.MINUTE,3);
- apiData.setCmsj(c.getTime());
+ apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(c.getTime());
+ apiData.setZhgxsj(sysData.getUpdateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index f74319e..86a9d16 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -77,7 +77,6 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
- Calendar c = Calendar.getInstance();
String ywsj = "";
String num = "";
Map<String, Integer> map = new HashMap<>();
@@ -130,9 +129,7 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- c.setTime(sysData.getRegisterTime());
- c.add(Calendar.MINUTE,-3);
- apiData.setDjsj(c.getTime());
+ apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -166,12 +163,10 @@
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
- c.setTime(sysData.getCompleteTime());
- c.add(Calendar.MINUTE,3);
- apiData.setCmsj(c.getTime());
+ apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(c.getTime());
+ apiData.setZhgxsj(sysData.getUpdateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
--
Gitblit v1.9.3