create by Strive

create date 2021/02/18

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.xml

@@ -11,6 +11,7 @@
         <result column="number" property="number"/>
         <result column="openid" property="openid"/>
         <result column="qrcode" property="qrcode"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="invalid_date" property="invalidDate"/>
         <result column="verif_date" property="verifDate"/>
         <result column="facility_no" property="facilityNo"/>
@@ -63,6 +64,7 @@
         invalid_date,
         verif_date,
         facility_no,
+        hospital_id,
         accounts_id,
         del_flag,
         status,
@@ -92,7 +94,8 @@
         #{qrcode, jdbcType=VARCHAR},
         now(),
         now(),
-        now(),
+        #{facilityNo, jdbcType=VARCHAR},
+        #{hospitalId, jdbcType=BIGINT},
         #{accountsId, jdbcType=BIGINT},
         #{delFlag, jdbcType=TINYINT},
         #{status, jdbcType=VARCHAR},
@@ -160,7 +163,10 @@
                 verif_date = #{verifDate, jdbcType=TIMESTAMP},
             </if>
             <if test="facilityNo != null">
-                facility_no = #{facilityNo, jdbcType=TIMESTAMP},
+                facility_no = #{facilityNo, jdbcType=VARCHAR},
+            </if>
+            <if test="hospitalId != null">
+                hospital_id = #{hospitalId, jdbcType=BIGINT},
             </if>
             <if test="accountsId != null">
                 accounts_id = #{accountsId, jdbcType=BIGINT},

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/model/Couponrecord.java

@@ -46,13 +46,15 @@ public class Couponrecord implements Serializable {
     private Date verifDate;
     /* 设备号 */
     @ExportConfig(value = "设备号", width = 100, showLevel = 1)
-    private Date facilityNo;
+    private String facilityNo;
     /* 过期时间 */
     @ExportConfig(value = "过期时间", width = 100, showLevel = 1)
     private Date expireDate;
     /* 过期时间 */
     @ExportConfig(value = "生效时间", width = 100, showLevel = 1)
     private Date takeEffectDate;
+    /* 医院id */
+    private Long hospitalId;
     /* 所属的账号 */
     private Long accountsId;
     /* 删除标识 */

aidea-modules/hospital-module/src/main/java/com/cftech/hospital/dao/HospitalMapper.xml

@@ -18,6 +18,7 @@
         <result column="level" property="level"/>
         <result column="org_id" property="orgId"/>
         <result column="org_name" property="orgName"/>
+        <result column="facility_no" property="facilityNo"/>
         <result column="accounts_id" property="accountsId"/>
         <result column="del_flag" property="delFlag"/>
         <result column="status" property="status"/>
@@ -70,6 +71,7 @@
         t.reliability,
         t.level,
         t.org_id,
+        t.facility_no,
         t.accounts_id,
         t.del_flag,
         t.status,
@@ -104,6 +106,7 @@
         #{reliability, jdbcType=VARCHAR},
         #{level, jdbcType=VARCHAR},
         #{orgId, jdbcType=VARCHAR},
+        #{facilityNo, jdbcType=VARCHAR},
         #{accountsId, jdbcType=BIGINT},
         #{delFlag, jdbcType=TINYINT},
         #{status, jdbcType=VARCHAR},
@@ -162,6 +165,9 @@
             <if test="latitude != null">
                 latitude = #{latitude, jdbcType=VARCHAR},
             </if>
+            <if test="facilityNo != null">
+                facility_no = #{facilityNo, jdbcType=VARCHAR},
+            </if>
             <if test="remarks != null">
                 remarks = #{remarks, jdbcType=VARCHAR},
             </if>

aidea-modules/hospital-module/src/main/java/com/cftech/hospital/model/Hospital.java

@@ -44,6 +44,9 @@ public class Hospital implements Serializable {
     /* 试剂盒检测下限 */
     @ExportConfig(value = "城市", width = 100, showLevel = 1)
     private String city;
+    /* 设备号 */
+    @ExportConfig(value = "设备号", width = 100, showLevel = 1)
+    private String facilityNo;
     /* 所属的账号 */
     private Long accountsId;
     /* 删除标识 */