From 1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 07 一月 2025 15:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
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 4edbfaf..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();
@@ -54,7 +55,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId);
+ List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId, start, end);
if (null == list || list.isEmpty()) {
log.debug("-------------娌℃湁鑾峰彇鍒板鎴蜂俊鎭�------------------");
@@ -71,7 +72,7 @@
apiData = new Api1212();
//鍗曚綅浠ｇ爜
- apiData.setId(sysData.getId());
+ apiData.setId(sysData.getKhbh());
apiData.setDwdm(api1101.getDwdm());
apiData.setDwmc(api1101.getDwmc());
apiData.setKqdm(api1102.getKqdm());
@@ -79,7 +80,7 @@
apiData.setKhlx(sysData.getKhlx());
apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
apiData.setKhmc(sysData.getName());
- apiData.setFddbr(sysData.getFddbr());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr()) ? "娉曚汉" :sysData.getFddbr());
apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
@@ -95,10 +96,10 @@
apiData.setBizId(sysData.getId());
- api1212List = api1212Rep.getDataById(sysData.getId());
- if(null == api1212List || api1212List.isEmpty()){
+ api1212List = api1212Rep.getDataById(apiData.getId());
+ if (null == api1212List || api1212List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1212List.get(0).getCzbz());
}
--
Gitblit v1.9.3