From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 c548f80..a58a370 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -104,6 +104,7 @@
apiData.setCkjz(sysData.getCkjz());
apiData.setRksj(sysData.getRksj());
apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
apiData.setRksf(sysData.getRksf());
apiData.setRkzz(sysData.getRkzz());
@@ -114,13 +115,14 @@
apiData.setQzzrshde(0);
apiData.setChsl(0);
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
apiData.setSyyy(sysData.getSyyy());
- 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());
+ 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