常住人口添加人员类别字段

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -79,6 +79,11 @@ public class Czrk extends BaseEntity{
     @Excel(name = "人员分类",readConverterExp = "changzhu=常住,wugong=务工,changzhu=出嫁,qiuxue=求学,qita=其他")
     private String keyIndustries;
 
+    /**
+     * 人员类别
+     */
+    private String keyCategory;
+
     /**
      * 户籍号
      */

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -20,6 +20,7 @@
         <result property="rlrNike" column="rlr_nike"/>
         <result property="rlTime" column="rl_time"/>
         <result property="keyIndustries" column="key_industries"/>
+        <result property="keyCategory" column="key_category"/>
         <result property="yhzgx" column="yhzgx"/>
         <result property="workUnit" column="work_unit"/>
         <result property="provinceId" column="province_id"/>
@@ -117,13 +118,13 @@
         select id, user_name, gender, age, birthday,dept_id, id_card, phone_num, code, house_type, rlr,rlr_nike, rl_time, yhzgx
              , work_unit, province_id, province, city_id, city, region_id, region, village_towns_id, village_towns
              , village_id, village, villager_group_id, villager_group, now_in, remark,grid_id, status,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time, create_by, create_time
-             , update_by, update_time, is_del, delete_reason,  is_rl, key_industries from czrk
+             , update_by, update_time, is_del, delete_reason,  is_rl, key_industries,key_category from czrk
     </sql>
 
     <select id="listByCzrk" resultMap="CzrkResult">
         select id, user_name, phone_num, id_card, gender, province, city, region, village_towns, village,
         villager_group, grid_id, house_type, code,is_rl,
-        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time,is_nucleicAcid,nucleicAcid_time,to_appropriate_phone
+        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time,is_nucleicAcid,nucleicAcid_time,to_appropriate_phone,key_category
         from czrk
         <where>
             is_del = 'N'
@@ -154,6 +155,7 @@
             <if test="village != null  and village != ''">and village = #{village}</if>
             <if test="isConfirm != null  and isConfirm != ''">and is_confirm = #{isConfirm}</if>
             <if test="gridId != null  and gridId != ''">and grid_id = #{gridId}</if>
+            <if test="keyCategory != null  and keyCategory != ''">and  find_in_set(#{keyCategory}, key_category)</if>
         </where>
         order by create_time DESC
     </select>
@@ -163,7 +165,7 @@
         select c.id, c.user_name, c.phone_num,c.dept_id, c.id_card,
         c.province, c.city ,c.region , c.village_towns, c.village ,c.now_in,
         c.gender, c.grid_id, c.house_type, c.update_by, c.code,c.is_rl, c.rlr,c.rlr_nike,
-        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time
+        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.key_category
         from czrk c left join czrk_jzdz z on c.id =z.czrk_id
         <where>
             c.is_del = 'N'
@@ -188,6 +190,7 @@
             <if test="regionIdXjd != null and regionIdXjd != ''">and z.region_id = #{regionIdXjd}</if>
             <if test="villageTownsIdXjd != null and villageTownsIdXjd != ''">and z.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null and villageIdXjd != ''">and z.village_id = #{villageIdXjd}</if>
+            <if test="keyCategory != null  and keyCategory != ''">and  find_in_set(#{keyCategory}, key_category)</if>
         </where>
         order by c.create_time DESC
     </select>
@@ -273,6 +276,8 @@
                     #{deptId}
                 </foreach>
             </if>
+            <if test="keyCategory != null  and keyCategory != ''">and  find_in_set(#{keyCategory}, czrk.key_category)</if>
+
         </where>
         GROUP BY czrk.id ORDER BY czrk.update_time DESC
     </select>
@@ -306,6 +311,8 @@
         <if test="workUnit != null  and workUnit != ''">and vi.work_unit = #{workUnit}</if>
         <if test="nowIn != null  and nowIn != ''">and vi.now_in = #{nowIn}</if>
         <if test="gridId != null  and gridId != ''">and vi.grid_id = #{gridId}</if>
+        <if test="keyCategory != null  and keyCategory != ''">and  find_in_set(#{keyCategory}, key_category)</if>
+
     </select>
 
     <select id="countByCzXz" resultType="int">
@@ -692,6 +699,7 @@
             <if test="phoneNum != null">phone_num,</if>
             <if test="code != null">code,</if>
             <if test="keyIndustries != null">key_Industries,</if>
+            <if test="keyCategory != null and keyCategory != ''">key_category,</if>
             <if test="houseType != null">house_type,</if>
             <if test="rlr != null">rlr,</if>
             <if test="isRl != null">is_rl,</if>
@@ -733,6 +741,7 @@
             <if test="phoneNum != null">#{phoneNum},</if>
             <if test="code != null">#{code},</if>
             <if test="keyIndustries != null">#{keyIndustries},</if>
+            <if test="keyCategory != null and keyCategory != ''">#{keyCategory},</if>
             <if test="houseType != null">#{houseType},</if>
             <if test="rlr != null">#{rlr},</if>
             <if test="isRl != null">#{isRl},</if>
@@ -777,6 +786,7 @@
             <if test="phoneNum != null">phone_num = #{phoneNum},</if>
             <if test="code != null">code = #{code},</if>
             <if test="keyIndustries != null">key_industries = #{keyIndustries},</if>
+            <if test="keyCategory != null and keyCategory != ''">key_category = #{keyCategory},</if>
             <if test="houseType != null">house_type = #{houseType},</if>
             <if test="rlr != null">rlr = #{rlr},</if>
             <if test="rlrNike != null">rlr_nike = #{rlrNike},</if>
@@ -874,7 +884,7 @@
 
     <select id="findHjInfo" resultMap="CzrkResult">
         select c.id, c.user_name ,c.gender,
-        c.birthday,c.age,c.code,c.phone_num,c.key_industries,c.province_id,c.province,c.city_id,c.city,c.region_id,c.region,c.village_towns_id,c.village_towns,c.village_id,c.village,c.villager_group_id,c.villager_group,
+        c.birthday,c.age,c.code,c.phone_num,c.key_industries,c.key_category,c.province_id,c.province,c.city_id,c.city,c.region_id,c.region,c.village_towns_id,c.village_towns,c.village_id,c.village,c.villager_group_id,c.villager_group,
         c.now_in,c.house_type,c.code,c.yhzgx,c.remark,
         cj.province_id as province_id_jzdz,cj.province as province_jzdz,cj.city_id as city_id_jzdz,cj.city as
         city_jzdz,cj.region_id as region_id_jzdz,cj.region as region_jzdz,cj.town_id as town_id_jzdz,cj.town as
@@ -1463,7 +1473,7 @@
         z.province as provinceXjd, z.city as cityXjd,z.region as regionXjd, z.town as villageTownsXjd, z.village as
         villageXjd,z.now_in,c.grid_id
         , c.house_type, c.update_by, c.code, c.rlr,c.rlr_nike, c.update_time, c.delete_reason,
-        c.now_in,c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time
+        c.now_in,c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.key_category
         from czrk c  left join czrk_jzdz z on c.id = z.czrk_id
         <where>
             c.is_del = 'N'
@@ -1487,12 +1497,13 @@
             <if test="regionIdXjd != null and regionIdXjd != ''">and z.region_id = #{regionIdXjd}</if>
             <if test="villageTownsIdXjd != null and villageTownsIdXjd != ''">and z.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null and villageIdXjd != ''">and z.village_id = #{villageIdXjd}</if>
+            <if test="keyCategory != null and keyCategory != ''">and c.key_category = #{keyCategory}</if>
         </where>
         order by c.update_time DESC
     </select>
     <select id="listByIdCard" resultMap="CzrkResult">
         select vi.id, vi.create_time, vi.update_time, vi.is_del, vi.update_by, vi.user_name, vi.phone_num, vi.id_card
-             , vi.gender, vi.province, vi.city, vi.region, vi.now_in, vi.house_type, vi.update_by, vi.code
+             , vi.gender, vi.province, vi.city, vi.region, vi.now_in, vi.house_type, vi.update_by, vi.code,vi.key_category
         from czrk vi
         where vi.id_card in
         <foreach item="idCard" collection="czrkIdCardList" open="(" separator="," close=")">