From f7e9d18d1065a065bf06b859dc42e4ac40acda3f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 25 十二月 2023 14:47:54 +0800
Subject: [PATCH] 熏蒸备案调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java | 2
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 30 ---------------
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 27 ++++---------
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java | 1
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogPeopleRep.java | 4 +-
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java | 8 ---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 6 ++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogDtlRep.java | 2
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogWayRep.java | 2
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java | 7 ---
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java | 3 -
11 files changed, 21 insertions(+), 71 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 047d1eb..896350f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -20,7 +20,7 @@
public class Fz40DrugLogApply implements Serializable {
@Id
- @Column(name = "xzbm", length = 4)
+ @Column(name = "xzbm", length = 12)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
private String xzbm;
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
index e58ce4b..d1893b4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
@@ -27,15 +27,9 @@
@PropertyDef(label = "dtlId")
private String dtlId;
- @Column(name = "DRUG_LOG_ID_", length = 4)
+ @Column(name = "DRUG_LOG_ID_", length = 12)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
- @JSONField
private String drugLogId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
index 7f85829..428ce25 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
@@ -27,6 +27,7 @@
@PropertyDef(label = "propleId")
private String propleId;
+
@Column(name = "DRUG_LOG_ID_", length = 12)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
index 3abb594..14128e3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
@@ -28,13 +28,8 @@
private String wayId;
@Column(name = "DRUG_LOG_ID_", length = 12)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
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 085b853..09a50f5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -94,6 +94,7 @@
gdApi1023.setDwdm(kqdm.substring(0, 18));
gdApi1023.setYjmc(data.getDrugName());
gdApi1023.setYjlx(data.getDrugType());
+ gdApi1023.setLqrq(data.getLqsj());
gdApi1023.setZhgxsj(data.getUpdateTime());
//鍌ㄧ伯绮儏鏄庣粏琛�
@@ -132,13 +133,14 @@
for (Fz40DrugLogPeople people : peoples) {
gdApi1023People = new GdApi1023People();
BeanUtils.copyProperties(people, gdApi1023People);
+ gdApi1023People.setXm(people.getMx());
peopleList.add(gdApi1023People);
}
gdApi1023.setPeoples(peopleList);
}
//鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
infoData = new ApiInfoData();
- infoData.setId(ContextUtil.getUUID());
+
infoData.setKqdm(kqdm);
infoData.setInteType(Constant.API_CATEGORY_13);
infoData.setInteId(ApiCodeConstant.API_1023);
@@ -150,9 +152,11 @@
if (null == apiInfoList || apiInfoList.isEmpty()) {
gdApi1023.setCzbz(Constant.CZBZ_I);
infoData.setCzbz(Constant.CZBZ_I);
+ infoData.setId(ContextUtil.getUUID());
} else {
gdApi1023.setCzbz(apiInfoList.get(0).getCzbz());
infoData.setCzbz(apiInfoList.get(0).getCzbz());
+ infoData.setId(apiInfoList.get(0).getId());
}
infoData.setData(JSON.toJSONString(gdApi1023));
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogDtlRep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogDtlRep.java
index acc6d16..e71b705 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogDtlRep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogDtlRep.java
@@ -16,7 +16,7 @@
public interface Fzzy40SyncDrugLogDtlRep extends JpaRepository<Fz40DrugLogDtl, String> {
- @Query("from Fz40DrugLogDtl where id =:id")
+ @Query("from Fz40DrugLogDtl where drugLogId =:id")
List<Fz40DrugLogDtl> listDrugLogDtl(@Param("id") String id );
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogPeopleRep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogPeopleRep.java
index 549f6b0..d5a12b4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogPeopleRep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogPeopleRep.java
@@ -15,6 +15,6 @@
*/
public interface Fzzy40SyncDrugLogPeopleRep extends JpaRepository<Fz40DrugLogPeople, String> {
- @Query("from Fz40DrugLogPeople where id =:id")
- List<Fz40DrugLogPeople> listDrugLogPeople(@Param("id") String id );
+ @Query("from Fz40DrugLogPeople where drugLogId =:id")
+ List<Fz40DrugLogPeople> listDrugLogPeople(@Param("id") String id);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogWayRep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogWayRep.java
index a106ae2..bb2993b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogWayRep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDrugLogWayRep.java
@@ -15,6 +15,6 @@
*/
public interface Fzzy40SyncDrugLogWayRep extends JpaRepository<Fz40DrugLogWay, String> {
- @Query("from Fz40DrugLogWay where id =:id")
+ @Query("from Fz40DrugLogWay where drugLogId =:id")
List<Fz40DrugLogWay> listDrugLogWay(@Param("id") String id );
}
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 12341b5..b68b445 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -135,27 +135,16 @@
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
<Property name="dataType">DateTime</Property>
</PropertyDef>
- <Reference name="peoples">
- <Property name="dataType">[dtPeople]</Property>
- <Property name="dataProvider">gDApi1023PR#peopleList</Property>
- <Property name="parameter">$${this.peopleList}</Property>
- </Reference>
- <Reference name="ways">
- <Property name="dataProvider">gDApi1023PR#wayList</Property>
- <Property name="dataType">[dtWay]</Property>
- <Property name="parameter">$${this.wayList}</Property>
- </Reference>
- <Reference name="dtls">
- <Property name="dataProvider">gDApi1023PR#dtlList</Property>
+ <PropertyDef name="dtls">
<Property name="dataType">[dtDtl]</Property>
- <Property name="parameter">$${this.dtlList}</Property>
- </Reference>
- <PropertyDef name="dtlList"/>
- <PropertyDef name="peopleList">
- <Property></Property>
</PropertyDef>
- <PropertyDef name="wayList">
+ <PropertyDef name="peoples">
<Property></Property>
+ <Property name="dataType">[dtPeople]</Property>
+ </PropertyDef>
+ <PropertyDef name="ways">
+ <Property></Property>
+ <Property name="dataType">[dtWay]</Property>
</PropertyDef>
</DataType>
<DataType name="dtPeople">
@@ -889,7 +878,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtls");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtlList");
list.insert({});
view.get("#addDtl").show();</ClientEvent>
<Property name="caption">鏂板</Property>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
index 354906d..4084154 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -68,9 +68,6 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj; //鏈�鍚庢洿鏂版椂闂�
- private String dtlList;
- private String peopleList;
- private String wayList;
private List<GdApi1023Dtl> dtls; //瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁�
private List<GdApi1023People> peoples; //鐔忚捀浣滀笟浜哄憳淇℃伅
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index 94e7849..62d64bf 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -109,40 +109,10 @@
}
/**
- * 鑾峰彇鐔忚捀浣滀笟浜哄憳淇℃伅琛�
- * gDApi1023PR#peopleList
- */
- @DataProvider
- public List<GdApi1023People> peopleList(String code) {
- return JSON.parseArray(code, GdApi1023People.class);
- }
-
- /**
- * 鑾峰彇鐔忚捀澶囨鏂瑰紡琛ㄨ〃淇℃伅
- * gDApi1023PR#wayList
- */
- @DataProvider
- public List<GdApi1023Way> wayList(String code) {
- return JSON.parseArray(code, GdApi1023Way.class);
- }
-
- /**
- * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
- * gDApi1023PR#dtlList
- */
- @DataProvider
- public List<GdApi1023Dtl> dtlList(String code) {
- return JSON.parseArray(code, GdApi1023Dtl.class);
- }
-
- /**
* gDApi1023PR#saveData
*/
@DataResolver
public void saveData(GdApi1023 data) {
- data.setDtlList(JSON.toJSONString(data.getDtls()));
- data.setWayList(JSON.toJSONString(data.getWays()));
- data.setPeopleList(JSON.toJSONString(data.getPeoples()));
ApiInfoData infoData;
List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
if (apiInfoList.size() != 0) {
--
Gitblit v1.9.3