From fdc22c746f5d630e3613a3fdbad62a8afbf9d4bd Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 25 十一月 2024 10:35:07 +0800
Subject: [PATCH] 损益单同步调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 38 ++++++++++++++++++++++++++++----------
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 9 +++++++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 3 +++
4 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
index e93e430..4ac285c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -49,14 +49,8 @@
private Date submitTime;
@Column(name = "TYPE_", length = 1)
- @PropertyDef(label = "绫诲瀷", description = "1锛氭崯澶憋紝2锛氭崯鑰楋紝3锛氬叾浠�")
+ @PropertyDef(label = "绫诲瀷", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
private String type;
- /**
- *
- */
- @Column(name = "syhj", length = 1)
- @PropertyDef(label = "鎹熸孩鐜妭", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
- private String syhj;
@Column(name = "FOOD_VARIETY_", length = 10)
@PropertyDef(label = "绮鍝佺")
@@ -78,9 +72,9 @@
@Column(name = "rkjz", precision = 20, scale = 6)
private Double rkjz;
- @Column(name = "ccsc")
- @PropertyDef(label = "鍌ㄥ瓨鏃堕暱")
- private Integer ccsc;
+ @PropertyDef(label = "鍏ュ簱鏁伴噺", description = "鍗曚綅锛欿G")
+ @Column(name = "rksl", precision = 20, scale = 6)
+ private Double rksl;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
@@ -99,6 +93,10 @@
@PropertyDef(label = "鍑哄簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
private String quantity2;
+ @Column(name = "ccsc")
+ @PropertyDef(label = "鍌ㄥ瓨鏃堕暱", description = "鍗曚綅锛氭湀")
+ private Integer ccsc;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍑哄簱鏃堕棿")
@Column(name = "cksj")
@@ -115,6 +113,14 @@
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 16, scale = 6)
private Double ckzz;
+
+ @Column(name = "qzsfkl")
+ @PropertyDef(label = "姘村垎鍑忛噺")
+ private Double qzsfkl;
+
+ @Column(name = "qzzzkl")
+ @PropertyDef(label = "鏉傝川鍑忛噺")
+ private Double qzzzkl;
@Column(name = "qzszkl")
@PropertyDef(label = "姘存潅鎬诲噺閲�")
@@ -136,6 +142,10 @@
@PropertyDef(label = "鎹熻�楃巼")
private Double lossPer;
+ @PropertyDef(label = "鏄惁瓒呰��")
+ @Column(name = "sfch")
+ private Integer sfch;
+
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
@Column(name = "sysfzc", length = 1)
private String sysfzc;
@@ -144,6 +154,14 @@
@Column(name = "syyy", length = 400)
private String syyy;
+ @PropertyDef(label = "鍑烘竻纭鏍囪瘑")
+ @Column(name = "cqqrbs")
+ private Integer cqqrbs;
+
+ @Column(name = "cqqrsj")
+ @PropertyDef(label = "鍑烘竻纭鏃堕棿")
+ private Date cqqrsj;
+
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
@Column(name = "ccshr", length = 64)
private String ccshr;
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 20748ea..122b32d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -113,6 +113,9 @@
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(2);
if(apiData.getJzsysl() > apiData.getQzszkl()){
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 3387e96..e5bb7a0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -89,9 +89,9 @@
continue;
}
api1310 = new Api1310();
- if(fz40Quality.getId().contains("ZJ_")){
+ if (fz40Quality.getId().contains("ZJ_")) {
api1310.setZjbgdh(fz40Quality.getType() + fz40Quality.getId().substring(3));
- }else {
+ } else {
api1310.setZjbgdh(fz40Quality.getType() + fz40Quality.getId());
}
api1310.setHwdm(api1105.getHwdm());
@@ -150,6 +150,11 @@
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.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
api1310.setDbsl(fz40Quality.getDbsl() == null ? 0.0 : fz40Quality.getDbsl());
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java
index 0e90a96..93bba76 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1209Rep.java
@@ -22,6 +22,6 @@
* @param end
* @return
*/
- @Query("from Fz40InoutLossOver where deptId=:deptId and submitTime >=:start and submitTime <:end order by submitTime ")
+ @Query("from Fz40InoutLossOver where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
List<Fz40InoutLossOver> listMLossOver(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
--
Gitblit v1.9.3