From a63ccbac7d05e8f7592fd2040275770d59f67c5f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 05 十二月 2024 11:21:47 +0800
Subject: [PATCH] 同步调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java | 19 ++++++++++++++-----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 14 +++++++-------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 7 ++-----
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
index 8d9e3bf..88ac4a8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
@@ -7,6 +7,7 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
@@ -22,7 +23,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+ @PropertyDef(label = "涓婚敭ID", description = "yyyyMMdd + 4浣嶉『搴忓彿")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -57,13 +58,13 @@
@PropertyDef(label = "妫�楠屾椂闂�")
private Date time;
- @Column(name = "USER_", length = 50)
- @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
- private String user;
-
@Column(name = "UNIT_", length = 50)
@PropertyDef(label = "妫�楠屽崟浣�")
private String unit;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
@Column(name = "STANDARD_", length = 4)
@PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
@@ -77,6 +78,10 @@
@Column(name = "RESULT_", length = 40)
@PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
private String result;
+
+ @Column(name = "spaqzbsfhg", length = 40)
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸", description = "0-涓嶅悎鏍硷紝1-鍚堟牸")
+ private String spaqzbsfhg;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绛惧彂鏃ユ湡")
@@ -140,4 +145,8 @@
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
+ @Column(name = "REPORT_TYPE_", length = 10)
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紝2-鏁翠綋妫�楠�(鍔犳潈骞冲潎)锛�3-鍏朵粬")
+ private String reportType;
+
}
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 8e706f7..03a3e98 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -88,16 +88,13 @@
apiData.setYwrq(sysData.getSubmitTime());
apiData.setSylx(sysData.getType());
//鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝ｏ紝婧㈠嚭涓鸿礋
- if (LOSS_OVER_LOSS.equals(sysData.getType()) || "1".equals(sysData.getType()) || "2".equals(sysData.getType())) {
- apiData.setJzsysl(sysData.getAmount());
- } else {
- apiData.setJzsysl(0 - sysData.getAmount());
- }
+ apiData.setJzsysl(sysData.getAmount());
if (LOSS_OVER_LOSS.equals(sysData.getType())) {
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());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index e5bb7a0..4eefe04 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -139,21 +139,21 @@
api1310.setZbjgpd(fz40Quality.getResult());
api1310.setQfrq(fz40Quality.getTime());
api1310.setBgcjsj(fz40Quality.getTime());
- api1310.setShrxm(fz40Quality.getCheckUser());
+ if (fz40Quality.getUser().isEmpty()){
+ fz40Quality.setUser(fz40Quality.getCheckUser());
+ }
+ api1310.setShrxm(fz40Quality.getShrxm().contains("銆�")?fz40Quality.getShrxm().replace('銆�','|'):fz40Quality.getShrxm());
if (null == fz40Quality.getCheckTime()) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
+ api1310.setSpaqzbsfhg(fz40Quality.getSpaqzbsfhg());
api1310.setQysj(fz40Quality.getCheckTime());
api1310.setQyqy(fz40Quality.getCheckArea());
- api1310.setQyrxm(fz40Quality.getCheckUser());
- api1310.setJdrxm(fz40Quality.getCheckUser());
- if (fz40Quality.getCheckUser().contains("銆�")) {
- api1310.setQyrxm(fz40Quality.getCheckUser().replace('銆�', '|'));
- api1310.setJdrxm(fz40Quality.getCheckUser().replace('銆�', '|'));
- }
+ api1310.setQyrxm(fz40Quality.getCheckUser().contains("銆�") ? fz40Quality.getCheckUser().replace('銆�', '|') : fz40Quality.getCheckUser());
+ api1310.setJdrxm(fz40Quality.getCheckUser().contains("銆�") ? fz40Quality.getCheckUser().replace('銆�', '|') : fz40Quality.getCheckUser());
api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
--
Gitblit v1.9.3