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/Fzzy40Sync1209.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index 13c1b8f..03a3e98 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -11,6 +11,7 @@
import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -85,34 +86,41 @@
apiData.setSydh(api1105.getHwdm() + sysData.getId());
apiData.setHwdm(api1105.getHwdm());
apiData.setYwrq(sysData.getSubmitTime());
-
+ apiData.setSylx(sysData.getType());
//鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝ｏ紝婧㈠嚭涓鸿礋
+ apiData.setJzsysl(sysData.getAmount());
if (LOSS_OVER_LOSS.equals(sysData.getType())) {
- apiData.setJzsysl(sysData.getAmount());
- } else {
+ sysData.setType("2");
+ }
+ if (LOSS_OVER_OVER.equals(sysData.getType())) {
+ sysData.setType("3");
apiData.setJzsysl(0 - sysData.getAmount());
}
apiData.setRkjz(sysData.getRkjz());
apiData.setCkjz(sysData.getCkjz());
- apiData.setRksj(sysData.getSubmitTime());
- apiData.setCksj(sysData.getSubmitTime());
+ apiData.setRksj(sysData.getRksj());
+ apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
apiData.setRksf(sysData.getRksf());
apiData.setRkzz(sysData.getRkzz());
apiData.setCksf(sysData.getCksf());
apiData.setCkzz(sysData.getCkzz());
- apiData.setQzchwqsh(0);
- apiData.setQzszkl(0);
- apiData.setQzzrshde(0);
- apiData.setChsl(0);
- apiData.setSysfzc(null == sysData.getSysfzc() || sysData.getSysfzc() == "" ? "0" : sysData.getSysfzc());
+ apiData.setQzszkl(sysData.getQzszkl());
+ apiData.setQzzrshde(sysData.getQzzrshde());
+ apiData.setChsl(sysData.getChsl());
+ apiData.setCqqrbs(sysData.getCqqrbs());
+ apiData.setCqqrsj(sysData.getCqqrsj());
+ apiData.setSyhj("2");
+ apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch(sysData.getSfch());
apiData.setSyyy(sysData.getSyyy());
- apiData.setCcshr(sysData.getCcshr());
- apiData.setZjshr(sysData.getZjshr());
- apiData.setTjshr(sysData.getTjshr());
- apiData.setKjshr(sysData.getKjshr());
- apiData.setLdshr(sysData.getLdshr());
- apiData.setBz(sysData.getRemark());
+ apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
+ apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
+ apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃牳浜�" : sysData.getTjshr());
+ apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃牳浜�" : sysData.getKjshr());
+ apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃牳浜�" : sysData.getLdshr());
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemark()) ? "澶囨敞淇℃伅" : sysData.getRemark());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
--
Gitblit v1.9.3