From 7b63a0ffef218d3f09de23545fc55998c2dd9f3e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 15 九月 2023 14:02:42 +0800
Subject: [PATCH] 广东专属页面--熏蒸备案修改
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 10 ++--
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java | 17 +-------
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java | 12 -----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 24 +++++------
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java | 13 ------
5 files changed, 20 insertions(+), 56 deletions(-)
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 464046d..e58ce4b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogDtl.java
@@ -27,20 +27,10 @@
@PropertyDef(label = "dtlId")
private String dtlId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- @JSONField
- private String id;
-
@Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
@JSONField
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- @JSONField
- private String deptId;
@Column(name = "tbrq")
@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 6dc8635..7f85829 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogPeople.java
@@ -27,22 +27,9 @@
@PropertyDef(label = "propleId")
private String propleId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- private String id;
-
- @Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String deptId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "mx", length = 20)
@PropertyDef(label = "濮撳悕")
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 50efdb5..3abb594 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogWay.java
@@ -27,20 +27,9 @@
@PropertyDef(label = "wayId")
private String wayId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- @JSONField
- private String id;
-
- @Column(name = "DRUG_LOG_ID_", length = 4)
+ @Column(name = "DRUG_LOG_ID_", length = 12)
@PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
- @JSONField
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- @JSONField
- private String deptId;
@Column(name = "tbrq")
@PropertyDef(label = "濉姤鏃ユ湡")
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 75b478e..ab98933 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -77,18 +77,15 @@
List<GdApi1023Way> wayList = new ArrayList<>();
List<GdApi1023People> peopleList = new ArrayList<>();
for (Fz40DrugLogApply data : list) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
if (apiInfoList.size() != 0) {
continue;
}
//鍌ㄧ伯绮儏鏄庣粏琛�
- String tbrq = "";
- if (null != data.getTbrq()) {
- tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
- }
- List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(kqdm + tbrq + data.getXzbm());
+ List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+ GdApi1023Dtl gdApi1023Dtl;
for (Fz40DrugLogDtl dtl : dtls) {
- GdApi1023Dtl gdApi1023Dtl = new GdApi1023Dtl();
+ gdApi1023Dtl = new GdApi1023Dtl();
BeanUtils.copyProperties(dtl, gdApi1023Dtl);
gdApi1023Dtl.setCfdm(dtl.getDepotId());
gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
@@ -99,18 +96,19 @@
gdApi1023Dtl.setZz(dtl.getPerImpurity());
dtlList.add(gdApi1023Dtl);
}
- List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(kqdm + tbrq + data.getXzbm());
+ List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+ GdApi1023Way gdApi1023Way;
for (Fz40DrugLogWay way : ways) {
- GdApi1023Way gdApi1023Way = new GdApi1023Way();
+ gdApi1023Way = new GdApi1023Way();
BeanUtils.copyProperties(way, gdApi1023Way);
wayList.add(gdApi1023Way);
}
- List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(kqdm + tbrq + data.getXzbm());
+ List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+ GdApi1023People gdApi1023People;
for (Fz40DrugLogPeople people : peoples) {
- GdApi1023People gdApi1023People = new GdApi1023People();
+ gdApi1023People = new GdApi1023People();
BeanUtils.copyProperties(people, gdApi1023People);
peopleList.add(gdApi1023People);
-
}
GdApi1023 gdApi1023 = new GdApi1023();
@@ -134,7 +132,7 @@
infoData.setInteId(ApiCodeConstant.API_1023);
infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
infoData.setUpdateTime(new Date());
- infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ infoData.setDataId(data.getXzbm());
if (null == apiInfoList || apiInfoList.isEmpty()) {
gdApi1023.setCzbz(Constant.CZBZ_I);
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 c35d10a..c2b54a5 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -144,7 +144,7 @@
data.setWayList(JSON.toJSONString(data.getWays()));
data.setPeopleList(JSON.toJSONString(data.getPeoples()));
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -154,7 +154,7 @@
infoData.setKqdm(data.getKqdm());
infoData.setInteId(ApiCodeConstant.API_1023);
infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ infoData.setDataId(data.getXzbm());
infoData.setData(JSON.toJSONString(data));
infoData.setCzbz(Constant.CZBZ_I);
infoData.setRemarks("澶囨敞淇℃伅");
@@ -167,7 +167,7 @@
*/
@Expose
public void delData(GdApi1023 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -179,7 +179,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -219,7 +219,7 @@
ApiInfoData infoData;
for (GdApi1023 data : items) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
--
Gitblit v1.9.3