修改 方舱加字段

ruoyi-common/src/main/java/com/ruoyi/common/utils/CheckUtils.java

@@ -37,5 +37,6 @@ public class CheckUtils
 
     public static void main(String[] args) {
         System.out.println(checkPhone("15922013137"));
+        System.out.println(checkCard("110101199003078371"));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/Fcry.java

@@ -103,6 +103,16 @@ public class Fcry extends BaseEntity
     @Transient
     private String value;
 
+
+    /** 从其他隔离点转来时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date otherGldTime;
+
+
+    /** 从其他方舱转来时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date otherFcTime;
+
     public String getRemark() {
         return remark;
     }
@@ -344,4 +354,20 @@ public class Fcry extends BaseEntity
     public void setValue(String value) {
         this.value = value;
     }
+
+    public Date getOtherFcTime() {
+        return otherFcTime;
+    }
+
+    public void setOtherFcTime(Date otherFcTime) {
+        this.otherFcTime = otherFcTime;
+    }
+
+    public Date getOtherGldTime() {
+        return otherGldTime;
+    }
+
+    public void setOtherGldTime(Date otherGldTime) {
+        this.otherGldTime = otherGldTime;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml

@@ -32,19 +32,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="committee"    column="committee"    />
         <result property="floor"    column="floor"    />
         <result property="doorplate"    column="doorplate"    />
+        <result property="otherGldTime"    column="other_gld_time"    />
+        <result property="otherFcTime"    column="other_fc_time"    />
     </resultMap>
 
     <sql id="selectFcryVo">
         select id, fc_place, room, jz_name, card_no, phone, area, street, community, unit, zr_time, zc_time, gl_place,
                status, del_flag, create_by, create_time, update_by, update_time, remark,check_card,people_type,is_positive,
-               positive_only,committee,floor,doorplate
+               positive_only,committee,floor,doorplate,other_fc_time,other_gld_time
                from fcry
     </sql>
 
     <select id="selectFcryList" parameterType="Fcry" resultMap="FcryResult">
         select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit, a.zr_time,
                a.zc_time, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
-               a.remark ,a.check_card ,a.people_type ,a.is_positive ,a.positive_only ,a.committee ,a.floor ,a.doorplate from fcry a
+               a.remark ,a.check_card ,a.people_type ,a.is_positive ,a.positive_only ,a.committee ,a.floor ,a.doorplate,
+               a.other_fc_time,a.other_gld_time from fcry a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
         where a.del_flag = 0
@@ -74,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community,
                a.floor, a.unit, a.doorplate, a.zr_time, a.gl_place, a.status, a.del_flag, a.create_by,
                a.create_time, a.update_by, a.update_time, a.remark , a.check_card , a.is_positive , a.positive_only,
-               a.other_point_time, a.people_type from fcry a
+               a.other_point_time, a.people_type,a.other_fc_time,a.other_gld_time from fcry a
         where a.del_flag = 0 and a.card_no = #{cardNo}
     </select>
 
@@ -107,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPositive != null">is_positive,</if>
             <if test="checkCard != null">check_card,</if>
             <if test="peopleType != null">people_type,</if>
+            <if test="otherFcTime != null">other_fc_time,</if>
+            <if test="otherGldTime != null">other_gld_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fcPlace != null">#{fcPlace},</if>
@@ -135,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPositive != null">#{isPositive},</if>
             <if test="checkCard != null">#{checkCard},</if>
             <if test="peopleType != null">#{peopleType},</if>
+            <if test="otherFcTime != null">#{otherFcTime},</if>
+            <if test="otherGldTime != null">#{otherGldTime},</if>
          </trim>
     </insert>
     <insert id="insertBatchFcry"  parameterType="Fcry">
@@ -176,6 +183,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPositive != null">is_positive = #{isPositive},</if>
             <if test="checkCard != null">check_card = #{checkCard},</if>
             <if test="peopleType != null">people_type = #{peopleType},</if>
+            <if test="otherGldTime != null">other_gld_time = #{otherGldTime},</if>
+            <if test="otherFcTime != null">other_fc_time = #{otherFcTime},</if>
         </trim>
         where id = #{id}
     </update>