From 33752de094eca456a72a34ed2f2f3b1eefd9df4c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 05 五月 2024 23:34:24 +0800
Subject: [PATCH] 合同信息默认值
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 7 ++++---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 14 +++++++++-----
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 26 ++++++++++++++++++++------
4 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
index de3f82b..3e13ca1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
@@ -205,7 +205,7 @@
@Column(name = "AUDIT_DATE_")
@PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
- private String auditDate;
+ private Date auditDate;
@Column(name = "AUDIT_STATUS_", length = 10)
@PropertyDef(label = "瀹℃壒鐘舵��")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 7310119..16e1abd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -15,6 +15,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -101,6 +102,10 @@
continue;
}
apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ apiData.setSfzh(listCustomer.get(0).getCardId());
+ apiData.setLxrdh(listCustomer.get(0).getPhone());
+ apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : sysData.getYzbm());
+ apiData.setDzyx(listCustomer.get(0).getDzyx());
}
@@ -109,7 +114,7 @@
apiData.setQdrq(sysData.getSigningTime());
- if(StringUtils.isEmpty(sysData.getFoodVariety())){
+ if (StringUtils.isEmpty(sysData.getFoodVariety())) {
continue;
}
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
@@ -139,8 +144,17 @@
apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
-
+ apiData.setLxrxm(sysData.getFddbr());
+ apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
+ apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
+ apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
apiData.setZhgxsj(sysData.getCreateTime());
+ apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "瀹℃壒浜�" : sysData.getAuditUser());
+ apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
+ apiData.setSswcsj(sysData.getRelEndTime());
+ apiData.setYdwcsj(sysData.getEndTime());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser())?"鏈柟绛剧害浜�":sysData.getSignUser());
+
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
@@ -158,10 +172,10 @@
log.info("1201---鍚堝悓鍚屾鏁版嵁锛歿}", apiData.toString());
//鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负涓婃捣鍗忚锛屼笂娴峰崗璁椂锛岄渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
- if(StringUtils.isNotEmpty(sysData.getFileId())){
+ if (StringUtils.isNotEmpty(sysData.getFileId())) {
//鑻ヤ负涓婃捣鐪佸钩鍙板崗璁紝鍒欓渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
- if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
+ if (null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())) {
api1109 = new Api1109();
//涓婚敭id
api1109.setId(apiData.getHth());
@@ -170,8 +184,8 @@
String kzm = "pdf"; //鎵╁睍鍚嶏細榛樿涓簆df
String[] split = sysData.getFileId().split("\\.");
- if(split.length > 0){
- kzm = split[split.length -1];
+ if (split.length > 0) {
+ kzm = split[split.length - 1];
}
//鏂囦欢鍚嶇О(鍚堝悓鍙�+鎵╁睍鍚�)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 46e3fef..9cda075 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -114,8 +114,12 @@
} else {
apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
}
- //绮潈琛屾斂鍖哄垝浠ｇ爜
- apiData.setLqxzqhdm(api1102.getXzqhdm());
+ //绮潈琛屾斂鍖哄垝浠ｇ爜,鐪佺骇鍌ㄥ绮伯鏉冧负鐪佺骇
+ if (apiData.getLsdjdm().equals("121")) {
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+ } else {
+ apiData.setLqxzqhdm(api1102.getXzqhdm());
+ }
//绠＄悊鏂瑰紡-榛樿鐩村偍
if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
apiData.setGlfs("01");
@@ -128,8 +132,8 @@
//鍌ㄧ伯鏂瑰紡
apiData.setClfs(fz40DepotStore.getStoreType());
//鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
- if("2".equals(apiData.getClfs())){
- apiData.setBclbs((int)(fz40DepotStore.getStorageReal()/25));
+ if ("2".equals(apiData.getClfs())) {
+ apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
}
//璐т綅鐘舵��
@@ -142,7 +146,7 @@
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
- if(null == fz40DepotStore.getFullDate()){
+ if (null == fz40DepotStore.getFullDate()) {
fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
}
apiData.setFcrq(fz40DepotStore.getFullDate());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
index ebfc1b8..4923fd9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
@@ -13,6 +13,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.List;
@@ -43,7 +44,7 @@
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1201鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ log.info("-------------1212鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
@@ -96,9 +97,9 @@
api1212List = api1212Rep.getDataById(apiData.getId());
- if(null == api1212List || api1212List.isEmpty()){
+ if (null == api1212List || api1212List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1212List.get(0).getCzbz());
}
--
Gitblit v1.9.3