From 83d62e9d30480008e764d204b537f235c03c7e2c Mon Sep 17 00:00:00 2001
From: loser <12524321+loser111@user.noreply.gitee.com>
Date: Wed, 10 May 2023 15:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=89=A9=E8=B5=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/supplies/nucleic/nucleic/add.html  | 6 ++++++
 .../src/main/resources/templates/supplies/nucleic/nucleic/edit.html | 6 ++++++
 .../src/main/resources/templates/supplies/vaccine/vaccine/add.html  | 6 ++++++
 .../src/main/resources/templates/supplies/vaccine/vaccine/edit.html | 6 ++++++
 ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml   | 2 +-
 ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml   | 5 ++---
 6 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html
index 847cd01..bf3fe5e 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html
@@ -18,6 +18,12 @@
                     <input name="nucleicNumber" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">核酸编号：</label>
+                <div class="col-sm-8">
+                    <input name="nucleicIdNumber" class="form-control" type="text">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸描述：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html
index 0c8d0a1..89c28ca 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html
@@ -19,6 +19,12 @@
                     <input name="nucleicNumber" th:field="*{nucleicNumber}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">核酸编号：</label>
+                <div class="col-sm-8">
+                    <input name="nucleicIdNumber" th:field="*{nucleicIdNumber}" class="form-control" type="text">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸描述：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html
index 8155519..b1fff86 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html
@@ -18,6 +18,12 @@
                     <input name="vaccineDescription" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">疫苗编号：</label>
+                <div class="col-sm-8">
+                    <input name="vaccineIdNumber" class="form-control" type="text">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">疫苗名字：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html
index 64c245f..391d8a0 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html
@@ -13,6 +13,12 @@
                     <input name="vaccineNumber" th:field="*{vaccineNumber}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">疫苗编号：</label>
+                <div class="col-sm-8">
+                    <input name="vaccineIdNumber" th:field="*{vaccineIdNumber}" class="form-control" type="text">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">疫苗描述：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
index db5f04f..80ba83f 100644
--- a/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="nucleicName != null">nucleic_name = #{nucleicName},</if>
             <if test="nucleicNumber != null">nucleic_number = #{nucleicNumber},</if>
-            <if test="nucleicIdNumber != null ">nucleic_id_number = #{nucleicIdNumber}</if>
+            <if test="nucleicIdNumber != null ">nucleic_id_number = #{nucleicIdNumber},</if>
             <if test="nucleicDescription != null">nucleic_description = #{nucleicDescription},</if>
         </trim>
         where nucleic_id = #{nucleicId}
diff --git a/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
index 4e51526..3091cd4 100644
--- a/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVaccineVo">
-        select vaccine_id, vaccine_number, vaccine_description, vaccine_name from vaccine
+        select vaccine_id, vaccine_number, vaccine_id_number,vaccine_description, vaccine_name from vaccine
     </sql>
 
     <select id="selectVaccineList" parameterType="Vaccine" resultMap="VaccineResult">
@@ -51,8 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update vaccine
         <trim prefix="SET" suffixOverrides=",">
             <if test="vaccineNumber != null">vaccine_number = #{vaccineNumber},</if>
-         
-            <if test="vaccineIdNumber != null ">vaccine_id_number = #{vaccineIdNumber}</if>
+            <if test="vaccineIdNumber != null ">vaccine_id_number = #{vaccineIdNumber},</if>
             <if test="vaccineDescription != null">vaccine_description = #{vaccineDescription},</if>
             <if test="vaccineName != null">vaccine_name = #{vaccineName},</if>
         </trim>