From 42e128b6d4bc5f1f43a21cafd6f2105c74bbac5e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 14 八月 2025 17:17:05 +0800
Subject: [PATCH] 熏蒸备案同步调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java | 6 ------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 2 +-
4 files changed, 5 insertions(+), 8 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 43ad9ca..6fdf978 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -38,9 +38,6 @@
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date tbrq;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜", description = "浼佷笟淇＄敤浠ｇ爜")
- private String dwdm;
@Column(name = "sqxzrq")
@PropertyDef(label = "鐢宠鐔忚捀鏃ユ湡")
@@ -107,9 +104,6 @@
@PropertyDef(label = "鐔忚捀娉ㄦ剰浜嬮」")
private String xzzysx;
- @Column(name = "FILE_STORAGE_ID_", length = 19)
- @PropertyDef(label = "鏂囦欢瀛樺偍ID")
- private String fileStorageId;
@Column(name = "DRUG_NAME_", length = 64)
@PropertyDef(label = "鑽墏鍚嶇О")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 2e2f386..a866215 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -155,7 +155,7 @@
apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
- apiData.setZhgxsj(sysData.getCreateTime());
+ apiData.setZhgxsj(sysData.getUpdateTime());
apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "瀹℃壒浜�" : sysData.getAuditUser());
apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
apiData.setSswcsj(sysData.getRelEndTime());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 3722b72..1fa9991 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -196,7 +196,7 @@
//妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
apiData.setJjlx(sysData.getJjlx());
- apiData.setBzbdbz(sysData.getDbz());
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
index 321c13c..496442d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
@@ -113,6 +113,7 @@
api9201.setYjlx(data.getDrugType().trim());
api9201.setLqrq(data.getLqsj());
api9201.setZhgxsj(data.getUpdateTime());
+ api9201.setXcfzr(data.getXcfzr().trim());
if (data.getLqr().contains("銆�")) {
api9201.setLqr(data.getLqr().replace('銆�', '|').trim());
}
@@ -159,6 +160,8 @@
api9201Way = new Gd2022Api1023Way();
BeanUtils.copyProperties(data, api9201Way);
wayList = new ArrayList<>();
+ api9201Way.setSqfs(data.getSqfs().trim());
+ api9201Way.setXzfs(data.getXzfs().trim());
wayList.add(api9201Way);
api9201.setWay(JSON.toJSONString(wayList));
--
Gitblit v1.9.3