From 961d92663926cb8aaff3126c04a1c6af9f1d88c1 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 24 一月 2024 23:20:51 +0800
Subject: [PATCH] 熏蒸备案调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java | 135 +++++++++++++++++++++++++++++++++
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 9 ++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java | 1
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 70 +++++++++++------
4 files changed, 189 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
index 896350f..b81cee6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -165,4 +166,138 @@
@Transient
private List<Fz40DrugLogPeople> drugLogPeople;
+ /**
+ * 鍌ㄧ伯绮儏鏄庣粏琛�
+ */
+
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ * 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+ /**
+ * 鐔忚捀澶囨鏂瑰紡
+ */
+
+ @Column(name = "Way_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+
+ /**
+ * 鐔忚捀浣滀笟浜哄憳
+ */
+
+
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index 215e7db..b437922 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -112,33 +112,51 @@
//鍌ㄧ伯绮儏鏄庣粏琛�
List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
- if (null != dtls && dtls.size() > 0) {
- dtlList = new ArrayList<>();
- for (Fz40DrugLogDtl dtl : dtls) {
- gdApi1023Dtl = new GdApi1023Dtl();
- BeanUtils.copyProperties(dtl, gdApi1023Dtl);
- gdApi1023Dtl.setCfdm(dtl.getDepotId());
- gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
- gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
- gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
- gdApi1023Dtl.setLssl(dtl.getNumber());
- gdApi1023Dtl.setSf(dtl.getPerWet());
- gdApi1023Dtl.setZz(dtl.getPerImpurity());
- dtlList.add(gdApi1023Dtl);
- }
- gdApi1023.setDtls(dtlList);
- }
+ gdApi1023Dtl = new GdApi1023Dtl();
+ BeanUtils.copyProperties(data, gdApi1023Dtl);
+ gdApi1023Dtl.setCfdm(data.getDepotId());
+ gdApi1023Dtl.setLspzdm(data.getFoodVariety());
+ gdApi1023Dtl.setLsxzdm(data.getFoodType());
+ gdApi1023Dtl.setLsdjdm(data.getFoodLevel());
+ gdApi1023Dtl.setLssl(data.getNumber());
+ gdApi1023Dtl.setSf(data.getPerWet());
+ gdApi1023Dtl.setZz(data.getPerImpurity());
+ dtlList = new ArrayList<>();
+ dtlList.add(gdApi1023Dtl);
+ gdApi1023.setDtls(dtlList);
+// if (null != dtls && dtls.size() > 0) {
+// dtlList = new ArrayList<>();
+// for (Fz40DrugLogDtl dtl : dtls) {
+// gdApi1023Dtl = new GdApi1023Dtl();
+// BeanUtils.copyProperties(dtl, gdApi1023Dtl);
+// gdApi1023Dtl.setCfdm(dtl.getDepotId());
+// gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
+// gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
+// gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
+// gdApi1023Dtl.setLssl(dtl.getNumber());
+// gdApi1023Dtl.setSf(dtl.getPerWet());
+// gdApi1023Dtl.setZz(dtl.getPerImpurity());
+// dtlList.add(gdApi1023Dtl);
+// }
+// gdApi1023.setDtls(dtlList);
+// }
- List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
- if (null != ways && ways.size() > 0) {
- wayList = new ArrayList<>();
- for (Fz40DrugLogWay way : ways) {
- gdApi1023Way = new GdApi1023Way();
- BeanUtils.copyProperties(way, gdApi1023Way);
- wayList.add(gdApi1023Way);
- }
- gdApi1023.setWays(wayList);
- }
+
+ gdApi1023Way = new GdApi1023Way();
+ BeanUtils.copyProperties(data, gdApi1023Way);
+ wayList = new ArrayList<>();
+ wayList.add(gdApi1023Way);
+ gdApi1023.setWays(wayList);
+// List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+// if (null != ways && ways.size() > 0) {
+// wayList = new ArrayList<>();
+// for (Fz40DrugLogWay way : ways) {
+// gdApi1023Way = new GdApi1023Way();
+// BeanUtils.copyProperties(way, gdApi1023Way);
+// wayList.add(gdApi1023Way);
+// }
+// gdApi1023.setWays(wayList);
+// }
List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
if (null != peoples && peoples.size() > 0) {
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index e0b6d36..4bff26c 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -305,6 +305,10 @@
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
</PropertyDef>
+ <PropertyDef name="cfmc">
+ <Property/>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -1128,6 +1132,11 @@
<Property name="property">jhxzjsrq</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfmc</Property>
+ <Property name="property">cfmc</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
index 83ca124..5f5ceac 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
@@ -27,6 +27,7 @@
private Double cw; //浠撴俯
private Double cnsd; //浠撳唴婀垮害
private String clfs; //鍌ㄧ伯鏂瑰紡
+ private String cfmc; //浠撴埧鍚嶇О
@JSONField(format = "yyyy-MM-dd")
private Date rkrq; //鍏ュ簱鏃ユ湡
--
Gitblit v1.9.3