From f58c03f4c98b3664f22a3ec4e920fb2a42473ab9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 30 一月 2024 18:08:02 +0800
Subject: [PATCH] 增加合同、计划数据同步时的附件信息同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 27 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 085b853..b437922 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,40 +95,68 @@
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());
gdApi1023.setZhgxsj(data.getUpdateTime());
//鍌ㄧ伯绮儏鏄庣粏琛�
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) {
@@ -132,13 +164,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 +183,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));
--
Gitblit v1.9.3