From 5a53e819101f3d34d9774f321db14b3456bae507 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 03 一月 2024 16:22:06 +0800
Subject: [PATCH] 调整嘉定纪委接口3
---
src/main/java/com/fzzy/api/entity/Api1212.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 8 +++++---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 8 +++++---
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1212.java b/src/main/java/com/fzzy/api/entity/Api1212.java
index 09a85c1..fb84f23 100644
--- a/src/main/java/com/fzzy/api/entity/Api1212.java
+++ b/src/main/java/com/fzzy/api/entity/Api1212.java
@@ -36,7 +36,7 @@
@JSONField(serialize = false)
@Id
- @Column(name = "id")
+ @Column(name = "id", length = 50)
private String id;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
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 96c804f..f29a073 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -117,7 +117,9 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
+ if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+ sysData.setUserId("410183199003187055");
+ }
//鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -241,8 +243,8 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
- sysData.setEmptyWeightTime(fz40InoutRecordItem.getEmptyWeightTime());
- sysData.setFullWeightTime(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
if (null == api1202List || api1202List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
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 1a39112..054561f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -111,7 +111,9 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
- apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
+ if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+ sysData.setUserId("410183199003187055");
+ }
//閫氱煡鍗曞彿
apiData.setCktzdh(sysData.getNoticeId());
@@ -224,8 +226,8 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
- sysData.setEmptyWeightTime(fz40InoutRecordItem.getEmptyWeightTime());
- sysData.setFullWeightTime(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
--
Gitblit v1.9.3