From 67bd40a70ffd00ecc8dee1b3a8017bd9e7758de8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 01 三月 2024 09:04:46 +0800
Subject: [PATCH] 优化药品接口中保质期类型
---
src/main/java/com/fzzy/api/entity/Api1108.java | 7 +++----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 7 +++----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index 5f1b3cd..6a1e4a6 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -91,10 +91,9 @@
@Column(name = "czclfs", length = 1000)
private String czclfs;
- @PropertyDef(label = "淇濊川鏈�")
- @Column(name = "bzq")
- @JSONField(format = "yyyy-MM-dd")
- private Date bzq;
+ @PropertyDef(label = "淇濊川鏈�", description = "鍑犲勾銆佸嚑涓湀绛�")
+ @Column(name = "bzq", length = 50)
+ private String bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
index 0887bf8..9e72513 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
@@ -86,10 +86,9 @@
@PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
private String czclfs;
- @Column(name = "bzq", length = 20)
- @PropertyDef(label = "淇濊川鏈�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date bzq;
+ @Column(name = "bzq", length = 50)
+ @PropertyDef(label = "淇濊川鏈�", description = "鍑犲勾銆佸嚑涓湀绛�")
+ private String bzq;
// @Column(name = "SPEC_", length = 50)
// @PropertyDef(label = "瑙勬牸璇存槑")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
index 1b2885d..0c9c72c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
@@ -83,7 +83,7 @@
apiData.setCcdd(StringUtils.isEmpty(sysData.getCcdd())?"":sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
apiData.setBzwclfs(StringUtils.isEmpty(sysData.getBzwclfs())?"":sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
apiData.setCzclfs(StringUtils.isEmpty(sysData.getCzclfs())?"":sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
- apiData.setBzq(null == sysData.getBzw()?new Date():sysData.getBzq());//淇濊川鏈�
+ apiData.setBzq(StringUtils.isEmpty(sysData.getBzw())? "1骞�": sysData.getBzq());//淇濊川鏈�
apiData.setCgrq(null == sysData.getBzw()?new Date():sysData.getCgrq());//閲囪喘鏃ユ湡
apiData.setKcsl(sysData.getCount());//搴撳瓨鏁伴噺
apiData.setKcsldw(StringUtils.isEmpty(sysData.getKcsldw())?"":sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
--
Gitblit v1.9.3