Merge remote-tracking branch 'origin/master' into master

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

@@ -57,6 +57,10 @@ public class Fcry extends BaseEntity
     @Excel(name = "街道/镇")
     private String street;
 
+    /** 街道/镇 */
+//    @Excel(name = "居委会")
+    private String committee;
+
     /** 小区/村名称 */
     @Excel(name = "小区/村名称")
     private String community;
@@ -309,4 +313,12 @@ public class Fcry extends BaseEntity
             .append("remark", getRemark())
             .toString();
     }
+
+    public String getCommittee() {
+        return committee;
+    }
+
+    public void setCommittee(String committee) {
+        this.committee = committee;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FcryServiceImpl.java

@@ -72,6 +72,12 @@ public class FcryServiceImpl implements IFcryService
     @Override
     public int insertFcry(Fcry fcry)
     {
+        if (CheckUtils.checkCard(fcry.getCardNo()))
+            fcry.setCheckCard("正确");
+        else
+            throw new ServiceException("身份证格式不正确");
+        if (!CheckUtils.checkPhone(fcry.getPhone()))
+            throw new ServiceException("联系方式格式不正确");
         fcry.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         fcry.setCreateTime(DateUtils.getNowDate());
         return fcryMapper.insertFcry(fcry);
@@ -86,6 +92,12 @@ public class FcryServiceImpl implements IFcryService
     @Override
     public int updateFcry(Fcry fcry)
     {
+        if (CheckUtils.checkCard(fcry.getCardNo()))
+            fcry.setCheckCard("正确");
+        else
+            throw new ServiceException("身份证格式不正确");
+        if (!CheckUtils.checkPhone(fcry.getPhone()))
+            throw new ServiceException("联系方式格式不正确");
         fcry.setUpdateTime(DateUtils.getNowDate());
         return fcryMapper.updateFcry(fcry);
     }

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

@@ -25,14 +25,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="checkCard"    column="check_card"    />
+        <result property="peopleType"    column="people_type"    />
+        <result property="isPositive"    column="is_positive"    />
+        <result property="positiveOnly"    column="positive_only"    />
+        <result property="committee"    column="committee"    />
+        <result property="floor"    column="floor"    />
+        <result property="doorplate"    column="doorplate"    />
     </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 from fcry
+        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
+               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 from fcry a
+        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
         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
@@ -86,6 +98,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="doorplate != null">doorplate,</if>
+            <if test="floor != null">floor,</if>
+            <if test="committee != null">committee,</if>
+            <if test="positiveOnly != null">positive_only,</if>
+            <if test="isPositive != null">is_positive,</if>
+            <if test="checkCard != null">check_card,</if>
+            <if test="peopleType != null">people_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fcPlace != null">#{fcPlace},</if>
@@ -107,6 +126,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="doorplate != null">#{doorplate},</if>
+            <if test="floor != null">#{floor},</if>
+            <if test="committee != null">#{committee},</if>
+            <if test="positiveOnly != null">#{positiveOnly},</if>
+            <if test="isPositive != null">#{isPositive},</if>
+            <if test="checkCard != null">#{checkCard},</if>
+            <if test="peopleType != null">#{peopleType},</if>
          </trim>
     </insert>
     <insert id="insertBatchFcry"  parameterType="Fcry">
@@ -141,6 +167,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="doorplate != null">doorplate = #{doorplate},</if>
+            <if test="floor != null">floor = #{floor},</if>
+            <if test="committee != null">committee = #{committee},</if>
+            <if test="positiveOnly != null">positive_only = #{positiveOnly},</if>
+            <if test="isPositive != null">is_positive = #{isPositive},</if>
+            <if test="checkCard != null">check_card = #{checkCard},</if>
+            <if test="peopleType != null">people_type = #{peopleType},</if>
         </trim>
         where id = #{id}
     </update>