From 2fb7ee4542f57ebbd9fff56758f02ea3dc24b677 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 18 一月 2024 13:28:25 +0800
Subject: [PATCH] 调整熏蒸备案
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 13 ++++++-------
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 18 ++++++++++++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 13 +++++++++++++
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 2 ++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java | 4 ++--
5 files changed, 41 insertions(+), 9 deletions(-)
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 09a50f5..215e7db 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -35,6 +35,10 @@
@Component
public class Fzzy40Sync1023 {
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
private Fzzy40Sync1023Rep fzzy40Sync1023Rep;
@Autowired
private Fzzy40SyncDrugLogPeopleRep drugLogPeopleRep;
@@ -91,7 +95,16 @@
BeanUtils.copyProperties(data, gdApi1023);
gdApi1023.setXzbm(data.getXzbm().substring(8));
gdApi1023.setKqdm(kqdm);
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ if(null != api1102List && api1102List.size() > 0){
+ gdApi1023.setKqmc(api1102List.get(0).getKqmc());
+ }
+
gdApi1023.setDwdm(kqdm.substring(0, 18));
+ List<Api1101> api1101List = api1101Rep.findPushData(kqdm);
+ if(null != api1101List && api1101List.size() > 0){
+ gdApi1023.setDwmc(api1101List.get(0).getDwmc());
+ }
gdApi1023.setYjmc(data.getDrugName());
gdApi1023.setYjlx(data.getDrugType());
gdApi1023.setLqrq(data.getLqsj());
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 b68b445..e0b6d36 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -13,6 +13,10 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
+ <PropertyDef name="kqmc">
+ <Property></Property>
+ <Property name="label">搴撳尯鍚嶇О</Property>
+ </PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
<Property name="label">濉姤鏃ユ湡</Property>
@@ -20,6 +24,10 @@
<PropertyDef name="dwdm">
<Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dwmc">
+ <Property></Property>
+ <Property name="label">鍗曚綅鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
<Property></Property>
@@ -564,6 +572,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">kqmc</Property>
+ <Property name="property">kqmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">tbrq</Property>
<Property name="property">tbrq</Property>
<Editor/>
@@ -574,6 +587,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">dwmc</Property>
+ <Property name="property">dwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">sqxzrq</Property>
<Property name="property">sqxzrq</Property>
<Editor/>
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 4084154..ea56f6e 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -24,12 +24,12 @@
private String xzbm; //鐔忚捀缂栫爜
private String kqdm; //搴撳尯浠ｇ爜
-
+ private String kqmc; //搴撳尯鍚嶇О
@JSONField(format = "yyyy-MM-dd")
private Date tbrq; //濉姤鏃ユ湡
private String dwdm; //鍗曚綅浠ｇ爜
-
+ private String dwmc; //鍗曚綅鍚嶇О
@JSONField(format = "yyyy-MM-dd")
private Date sqxzrq; //鐢宠鐔忚捀鏃ユ湡
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 62d64bf..d0cdada 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -182,13 +182,12 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-
- ApiInfoData infoData;
- for (GdApi1023 data : items) {
+ ApiInfoData infoData;
+ for (GdApi1023 data : items) {
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index e9ee780..a854bbd 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -890,6 +890,8 @@
return ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return ApiCodeConstant.API_CODE_CWBBXX;
+ case "1023":
+ return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
}
--
Gitblit v1.9.3