From 011d559cfad1f1266b0d2b0d5db0dd936d9d6d51 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 12 Nov 2024 16:21:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/thrsys/ThirdAliDrug.java  | 10 +++++++++-
 .../glxp/api/service/thrsys/ThirdAliDrugService.java   |  8 ++++++--
 src/main/resources/schemas/schema_v2.4.sql             |  8 +++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java b/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java
index 74dfaec5..a004f83d 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java
@@ -102,6 +102,13 @@ public class ThirdAliDrug implements Serializable {
     @ApiModelProperty(value = "包装级别")
     private String erpId;
 
+    /**
+     * 批准文号
+     */
+    @TableField(value = "approvalNum")
+    @ApiModelProperty(value = "批准文号")
+    private String approvalNum;
+
     /**
      * 创建时间
      */
@@ -118,7 +125,7 @@ public class ThirdAliDrug implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public ThirdAliDrug(String type, String manufacturer, String cpmctymc, String form, String formSpec, String bzgg, String spmc, String nameCode, String packRatio, String packLevel, Date createTime, Date updateTime) {
+    public ThirdAliDrug(String type, String manufacturer, String cpmctymc, String form, String formSpec, String bzgg,String approvalNum, String spmc, String nameCode, String packRatio, String packLevel, Date createTime, Date updateTime) {
         this.type = type;
         this.manufacturer = manufacturer;
         this.cpmctymc = cpmctymc;
@@ -131,5 +138,6 @@ public class ThirdAliDrug implements Serializable {
         this.packLevel = packLevel;
         this.createTime = createTime;
         this.updateTime = updateTime;
+        this.approvalNum = approvalNum;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java
index 1b09d432..df16eee4 100644
--- a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java
@@ -63,7 +63,8 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
                                 fields[3].trim(),
                                 fields[4].trim(),
                                 fields[5].trim(),
-                                fields[6].trim(),
+                                fields[5].trim(),
+                                fields[5].trim(),
                                 fields[6].trim(),
                                 fields[7].trim(),
                                 fields[8].trim(),
@@ -90,7 +91,8 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
                                 fields[2].trim(),
                                 fields[3].trim(),
                                 fields[4].trim(),
-                                fields[5].trim(),
+                                fields[4].trim(),
+                                fields[6].trim(),
                                 fields[6].trim(),
                                 fields[7].trim(),
                                 fields[8].trim(),
@@ -119,6 +121,7 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
                                 fields[3].trim(),
                                 fields[4].trim(),
                                 fields[5].trim(),
+                                fields[6].trim(),
                                 fields[7].trim(),
                                 fields[8].trim(),
                                 fields[9].trim(),
@@ -147,6 +150,7 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
                                 fields[4].trim(),
                                 fields[5].trim(),
                                 fields[7].trim(),
+                                fields[8].trim(),
                                 fields[9].trim(),
                                 fields[10].trim(),
                                 fields[11].trim(),
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index ecc5c7c2..c2735294 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -1161,4 +1161,10 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'twoLevelCount',
 
 CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount',
                          'int NULL DEFAULT null COMMENT ''三级数量''',
-                         1);
\ No newline at end of file
+                         1);
+
+
+
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'approvalNum',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''批准文号''',
+                         1);