修复

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 常住人口对象 czrk
@@ -17,13 +18,13 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
-public class Czrk extends BaseEntity {
+public class Czrk extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
     public static final String IS_DEL_N = "N";
     public static final String IS_DEL_Y = "Y";
-    public static final String CZ = "CZ";
-    public static final String HJ = "HJ";
+    public static final String CZ = "cz";
+    public static final String HJ = "hj";
 
     /**
      * 主键
@@ -208,7 +209,7 @@ public class Czrk extends BaseEntity {
      * 是否删除 默认为 "N"
      */
     @Excel(name = "是否删除")
-    private String isDel = "N";
+    private String isDel = IS_DEL_N;
 
     /**
      * 删除原因

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

@@ -126,7 +126,7 @@ public class CzrkJzdz {
      * Y有效地址，N无效地址
      */
     @Excel(name = "Y有效地址，N无效地址")
-    private String status;
+    private String status = "Y";
 
     private java.sql.Timestamp createTime;
     private java.sql.Timestamp updateTime;

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/obj/ObjectUtils.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 
 /**
@@ -228,6 +229,9 @@ public class ObjectUtils {
                 .stream().filter(predicate).collect(Collectors.toList());
     }
 
+    public static <T> int count(List<T> input, ToIntFunction<T> toIntFunction) {
+        return requireNonNull(input, "list is null").stream().mapToInt(toIntFunction).sum();
+    }
 
     public static <T> boolean anyMatch(List<T> input, Predicate<T> predicate){
         return requireNonNull(input, "list is null").stream().anyMatch(predicate);

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -8,6 +8,7 @@ import com.boman.domain.Czrk;
 import com.boman.domain.TableDataInfo;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.service.czrk.ICzrkService;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +46,12 @@ public class CzrkController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/listByJs")
+    public TableDataInfo listByJs(Czrk czrk) {
+        List<Czrk> list = czrkService.listByJs(czrk);
+        return getDataTable(list);
+    }
+
     /**
      * 导出常住人口列表
      */
@@ -91,9 +98,9 @@ public class CzrkController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('system:czrk:remove')")
     @Log(title = "常住人口", businessType = BusinessType.DELETE)
-    @GetMapping("delete/{id}")
-    public AjaxResult deleteCzrk(@PathVariable("id") Long id) {
-        return toAjax(czrkService.deleteCzrk(id));
+    @GetMapping("/deleteCzrk")
+    public AjaxResult deleteCzrk(Czrk czrk) {
+        return toAjax(czrkService.deleteCzrk(czrk));
     }
 
     /**
@@ -125,4 +132,14 @@ public class CzrkController extends BaseController {
     public AjaxResult stsByCzrk() {
         return AjaxResult.success("成功", czrkService.stsByCzrk());
     }
+
+    /**
+     * 功能描述: 当前单位：镇，村：7个，组：300个，常住人口：5000人，新增 2人  减少 2人
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/stsByCzrkHomePage")
+    public AjaxResult stsByCzrkHomePage() {
+        return AjaxResult.success("成功", czrkService.stsByCzrkHomePage());
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/controller/RyrlController.java

@@ -23,7 +23,7 @@ public class RyrlController extends BaseController {
     private ICzrkService czrkService;
 
     /**
-     * 功能描述: 认领人员list, 如果isDel="Y", 则为回收站的功能，默认是isDelr="N"
+     * 功能描述: 认领人员list, 如果isDel="Y", 则为回收站的功能，默认是isDel="N"
      *
      * @param czrk czrk
      * @return com.boman.domain.TableDataInfo
@@ -57,7 +57,7 @@ public class RyrlController extends BaseController {
     }
 
     /**
-     * 功能描述: 根据id回显
+     * 功能描述: 根据id回显 查czrk和czrk_jzdd
      *
      * @param id id
      * @return com.boman.domain.dto.AjaxResult
@@ -73,8 +73,8 @@ public class RyrlController extends BaseController {
      * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/sts")
-    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName) {
-        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName));
+    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType) {
+        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName, queryType));
     }
 
 

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkJzdzMapper.java

@@ -63,4 +63,8 @@ import java.util.List;
      int deleteCzrkJzdzByIds(Long[] ids);
 
     List<CzrkJzdz> listByIdCard(@Param("idCardList") List<String> idCardList);
+
+    List<Long> listCzrkIdByTypeAreaIdUserName(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
+
+    int updateByIdCard(CzrkJzdz czrkJzdz);
 }

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -83,5 +83,7 @@ public interface CzrkMapper {
     int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
     int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
 
+    List<Czrk> listIsRl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
+
 //    int stsByWrl(@Param("deptIdList") List<Long> deptIdList, @Param("userName") String userName);
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -101,4 +101,14 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
 
         return czrkJzdzMapper.listByIdCard(idCardList);
     }
+
+    @Override
+    public List<Long> listCzrkIdByTypeAreaIdUserName(int type, Long areaId, String userName) {
+        return czrkJzdzMapper.listCzrkIdByTypeAreaIdUserName(type, areaId, userName);
+    }
+
+    @Override
+    public int updateByIdCard(CzrkJzdz czrkJzdz) {
+        return czrkJzdzMapper.updateByIdCard(czrkJzdz);
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -31,11 +31,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.StringUtils.isNotEmpty;
-import static com.boman.common.core.utils.obj.ObjectUtils.isEmpty;
-import static com.boman.common.core.utils.obj.ObjectUtils.map;
+import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.common.redis.RedisKey.STS_CZRK_;
 import static com.google.common.base.Strings.nullToEmpty;
 
@@ -67,13 +65,7 @@ public class CzrkServiceImpl implements ICzrkService {
         setAgeScope(czrk);
 
         startPage();
-//        List<Czrk> czrks = czrkMapper.listByRlry(czrk);
         List<Czrk> czrks = czrkMapper.listByRlryRel(czrk);
-
-        // 居住地址
-//        List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
-
-//        handleList(czrks, czrk.getQueryType(), czrkJzdzList);
         handleList1(czrks);
         return czrks;
     }
@@ -92,11 +84,10 @@ public class CzrkServiceImpl implements ICzrkService {
     @Override
     public List<Czrk> listByXz(Czrk czrk) {
         setDeptIdList(czrk);
-//        List<Czrk> czrks = czrkMapper.listByXz(czrk);
-//        // 居住地址
-//        List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
-//        handleList(czrks, Czrk.HJ, czrkJzdzList);
-        List<Czrk> czrks = czrkMapper.listByRlryRel(czrk);
+
+        czrk.setStartTime(DateUtils.getTodayStartStr());
+        czrk.setEndTime(DateUtils.getTodayEndStr());
+        List<Czrk> czrks = czrkMapper.listByXz(czrk);
         handleList1(czrks);
         return czrks;
     }
@@ -104,11 +95,10 @@ public class CzrkServiceImpl implements ICzrkService {
     @Override
     public List<Czrk> listByJs(Czrk czrk) {
         setDeptIdList(czrk);
-//        List<Czrk> czrks = czrkMapper.listByJs(czrk);
-//        // 居住地址
-//        List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
-//        handleList(czrks, Czrk.HJ, czrkJzdzList);
-        List<Czrk> czrks = czrkMapper.listByRlryRel(czrk);
+
+        czrk.setStartTime(DateUtils.getTodayStartStr());
+        czrk.setEndTime(DateUtils.getTodayEndStr());
+        List<Czrk> czrks = czrkMapper.listByJs(czrk);
         handleList1(czrks);
         return czrks;
     }
@@ -264,20 +254,25 @@ public class CzrkServiceImpl implements ICzrkService {
     /**
      * 批量删除常住人口
      *
-     * @param id 需要删除的常住人口主键
+     * @param czrk 需要删除的常住人口主键和删除原因
      * @return 结果
      */
     @Override
-    public int deleteCzrk(Long id) {
-        Czrk crk = new Czrk();
-        crk.setId(id);
-        crk.setUpdateBy(AuthUtils.getLoginUser().getSysUser().getUserName());
-        if (isEmpty(crk.getDeleteReason())) {
-            log.error("删除常住人口，删除原因不能为空, id={}", id);
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    public int deleteCzrk(Czrk czrk) {
+        czrk.setUpdateBy(AuthUtils.getLoginUser().getSysUser().getUserName());
+        if (isEmpty(czrk.getDeleteReason())) {
+            log.error("删除原因不能为空, id={}", czrk.getId());
             return 0;
         }
 
-        return czrkMapper.deleteCzrk(crk);
+        int delete = czrkMapper.deleteCzrk(czrk);
+        Long czrkId = czrk.getId();
+        CzrkJzdz czrkJzdz = new CzrkJzdz();
+        czrkJzdz.setCzrkId(czrkId);
+        czrkJzdz.setStatus("N");
+        int update = czrkJzdzService.updateByIdCard(czrkJzdz);
+        return 1;
     }
 
     /**
@@ -334,7 +329,7 @@ public class CzrkServiceImpl implements ICzrkService {
     public AjaxResult addRlry(Czrk czrk) {
         String username = SecurityUtils.getUsername();
         if (isNotEmpty(czrk.getVillageTowns())) {
-            czrk.setRlr(SecurityUtils.getUsername());
+            czrk.setRlr(username);
             czrk.setIsRl("是");
             czrk.setRlTime(new Date(System.currentTimeMillis()));
         } else {
@@ -405,9 +400,9 @@ public class CzrkServiceImpl implements ICzrkService {
     }
 
     @Override
-    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName) {
+    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType) {
         Long areaId = null;
-        int type = 0;
+        int type = 0, yrl = 0, wrl = 0;
         if (ObjectUtils.isNotEmpty(provinceId)) {
             areaId = provinceId;
             type = 1;
@@ -425,8 +420,27 @@ public class CzrkServiceImpl implements ICzrkService {
             type = 5;
         }
 
-        int yrl = czrkMapper.stsByYrl(type, areaId, userName);
-        int wrl = czrkMapper.stsByWrl(type, areaId, userName);
+        if (Czrk.HJ.equals(queryType)) {
+            // 户籍
+            yrl = czrkMapper.stsByYrl(type, areaId, userName);
+            wrl = czrkMapper.stsByWrl(type, areaId, userName);
+        } else {
+            // 常住
+            // 所有的czrkId
+            List<Long> jzdzs = czrkJzdzService.listCzrkIdByTypeAreaIdUserName(type, areaId, userName);
+            // id 和 isRl
+            List<Czrk> rls = czrkMapper.listIsRl(type, areaId, userName);
+            // 满足搜索条件的czrk
+            List<Czrk> filter = filter(rls, czrk -> jzdzs.contains(czrk.getId()));
+            for (Czrk czrk : filter) {
+                if ("是".equals(czrk.getIsRl())) {
+                    yrl++;
+                } else if ("否".equals(czrk.getIsRl())) {
+                    wrl++;
+                }
+            }
+        }
+
         JSONObject result = new JSONObject(3);
         result.put("yrl", yrl);
         result.put("wrl", wrl);

boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java

@@ -62,4 +62,8 @@ public interface ICzrkJzdzService {
     int deleteByCzrkId(Long czrkId);
 
     List<CzrkJzdz> listByIdCard(List<String> idCardList);
+
+    List<Long> listCzrkIdByTypeAreaIdUserName(int type, Long areaId, String userName);
+
+    int updateByIdCard(CzrkJzdz czrkJzdz);
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkService.java

@@ -2,9 +2,7 @@ package com.boman.web.core.service.czrk;
 
 import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.Czrk;
-import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.dto.AjaxResult;
-import org.checkerframework.checker.units.qual.C;
 
 import java.util.List;
 
@@ -69,7 +67,7 @@ public interface ICzrkService {
      */
     int deleteCzrkById(Long id);
 
-    int deleteCzrk(Long id);
+    int deleteCzrk(Czrk czrk);
     int reduction(String id);
     List<Czrk> family(String code);
 
@@ -78,7 +76,7 @@ public interface ICzrkService {
     AjaxResult addRlry(Czrk czrk);
     AjaxResult editRlry(Czrk czrk);
 
-    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName);
+    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType);
     JSONObject stsByCzrk();
     JSONObject stsByCzrkHomePage();
 

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

@@ -141,12 +141,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateTime != null">update_time = sysdate(),</if>
             <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
 
+    <update id="updateByIdCard" >
+        update czrk_jzdz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="czrkId != null">czrk_id = #{czrkId},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="townId != null">town_id = #{townId},</if>
+            <if test="town != null">town = #{town},</if>
+            <if test="villageId != null">village_id = #{villageId},</if>
+            <if test="village != null">village = #{village},</if>
+            <if test="nowIn != null">now_in = #{nowIn},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = sysdate(),</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where id_card = #{idCard}
+    </update>
+
     <delete id="deleteCzrkJzdzById" parameterType="Long">
         delete from czrk_jzdz where id = #{id}
     </delete>
@@ -161,4 +189,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="listCzrkIdByTypeAreaIdUserName" resultType="java.lang.Long">
+        SELECT jzdz.czrk_id
+        FROM czrk
+        LEFT JOIN czrk_jzdz jzdz ON czrk.id = jzdz.czrk_id
+        where czrk.is_del = 'N'
+        <if test="userName != null  and userName != ''">
+            and jzdz.user_name like concat('%', #{userName}, '%')
+        </if>
+        <choose>
+            <when test="type == 1">and jzdz.province_id = #{areaId}</when>
+            <when test="type == 2">and jzdz.city_id = #{areaId}</when>
+            <when test="type == 3">and jzdz.region_id = #{areaId}</when>
+            <when test="type == 4">and jzdz.village_towns_id = #{areaId}</when>
+            <when test="type == 5">and jzdz.village_id = #{areaId}</when>
+        </choose>
+        GROUP BY czrk.id
+    </select>
 </mapper>

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cityId"    column="city_id"    />
         <result property="city"    column="city"    />
         <result property="regionId"    column="region_id"    />
+        <result property="isRl"    column="is_rl"    />
         <result property="region"    column="region"    />
         <result property="villageTownsId"    column="village_towns_id"    />
         <result property="villageTowns"    column="village_towns"    />
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, user_name, gender, age, birthday,dept_id, id_card, phone_num, code, house_type, rlr, 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, status, create_by, create_time
-             , update_by, update_time, is_del, delete_reason, dept_id, is_rl from czrk
+             , update_by, update_time, is_del, delete_reason, dept_id, is_rl, key_industries from czrk
     </sql>
 
     <select id="listByRlry"  resultMap="CzrkResult">
@@ -101,10 +102,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listByRlryRel"  resultType="com.boman.domain.Czrk">
-        select czrk.id, czrk.user_name userName, czrk.phone_num phoneNum, czrk.id_card idCard, czrk.gender, czrk.province
-             , czrk.city, czrk.region, czrk.house_type houseType, czrk.update_by updateBy, czrk.code, czrk.rlr
-             , czrk.update_time updateTime, czrk.delete_reason deleteReason, czrk.now_in nowIn, jzdz.province provinceXjd
-             , jzdz.city cityXjd, jzdz.region regionXjd, jzdz.town villageTownsXjd, jzdz.village villageXjd, jzdz.now_in domicile
+        SELECT
+            czrk.id,
+            ANY_VALUE(czrk.user_name) userName,
+            ANY_VALUE(czrk.phone_num) phoneNum,
+            ANY_VALUE(czrk.id_card) idCard,
+            ANY_VALUE(czrk.gender),
+            ANY_VALUE(czrk.province),
+            ANY_VALUE(czrk.is_rl),
+            ANY_VALUE(czrk.city),
+            ANY_VALUE(czrk.region),
+            ANY_VALUE(czrk.house_type) houseType,
+            ANY_VALUE(czrk.update_by) updateBy,
+            ANY_VALUE(czrk. CODE),
+            ANY_VALUE(czrk.rlr),
+            ANY_VALUE(czrk.update_time) updateTime,
+            ANY_VALUE(czrk.delete_reason) deleteReason,
+            ANY_VALUE(czrk.now_in) nowIn,
+            ANY_VALUE(jzdz.province) provinceXjd,
+            ANY_VALUE(jzdz.city) cityXjd,
+            ANY_VALUE(jzdz.region) regionXjd,
+            ANY_VALUE(jzdz.town) villageTownsXjd,
+            ANY_VALUE(jzdz.village) villageXjd,
+            ANY_VALUE(jzdz.now_in) domicile
         from czrk
         left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
         <where>
@@ -157,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        order by czrk.update_time DESC
+        GROUP BY czrk.id ORDER BY czrk.update_time DESC
     </select>
 
     <select id="listByXz"  resultMap="CzrkResult">
@@ -180,8 +200,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gender != null  and gender != ''"> and vi.gender = #{gender}</if>
         <if test="idCard != null  and idCard != ''"> and vi.id_card like concat('%', #{idCard}, '%')</if>
         <if test="phoneNum != null  and phoneNum != ''"> and vi.phone_num = #{phoneNum}</if>
-        <if test="params.startAge != null  and params.startAge != ''"> and vi.age &gt;= #{params.startAge}</if>
-        <if test="params.endAge != null  and params.endAge != ''"> and vi.age &lt;= #{params.endAge}</if>
+        <!--<if test="params.startAge != null  and params.startAge != ''"> and vi.age &gt;= #{params.startAge}</if>
+       <if test="params.endAge != null  and params.endAge != ''"> and vi.age &lt;= #{params.endAge}</if>-->
         <if test="status != null  and status != ''"> and vi.status = #{status}</if>
         <if test="code != null  and code != ''"> and vi.code = #{code}</if>
         <if test="birthday != null  and birthday != ''"> and vi.birthday = #{birthday}</if>
@@ -248,8 +268,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gender != null  and gender != ''"> and vi.gender = #{gender}</if>
         <if test="idCard != null  and idCard != ''"> and vi.id_card like concat('%', #{idCard}, '%')</if>
         <if test="phoneNum != null  and phoneNum != ''"> and vi.phone_num = #{phoneNum}</if>
-        <if test="params.startAge != null  and params.startAge != ''"> and vi.age &gt;= #{params.startAge}</if>
-        <if test="params.endAge != null  and params.endAge != ''"> and vi.age &lt;= #{params.endAge}</if>
+        <!--<if test="params.startAge != null  and params.startAge != ''"> and vi.age &gt;= #{params.startAge}</if>
+        <if test="params.endAge != null  and params.endAge != ''"> and vi.age &lt;= #{params.endAge}</if>-->
         <if test="status != null  and status != ''"> and vi.status = #{status}</if>
         <if test="code != null  and code != ''"> and vi.code = #{code}</if>
         <if test="birthday != null  and birthday != ''"> and vi.birthday = #{birthday}</if>
@@ -343,6 +363,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </choose>
     </select>
 
+    <select id="listIsRl" resultMap="CzrkResult">
+        SELECT id, is_rl
+        from czrk
+        where is_del = 'N'
+        <if test="userName != null  and userName != ''">
+            and user_name like concat('%', #{userName}, '%')
+        </if>
+        <choose>
+            <when test="type == 1">and province_id = #{areaId}</when>
+            <when test="type == 2">and city_id = #{areaId}</when>
+            <when test="type == 3">and region_id = #{areaId}</when>
+            <when test="type == 4">and village_towns_id = #{areaId}</when>
+            <when test="type == 5">and village_id = #{areaId}</when>
+        </choose>
+    </select>
+
     <select id="stsByWrl" resultType="int">
         select count(vi.id)
         from czrk vi
@@ -373,6 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null">id_card,</if>
             <if test="phoneNum != null">phone_num,</if>
             <if test="code != null">code,</if>
+            <if test="keyIndustries != null">key_Industries,</if>
             <if test="houseType != null">house_type,</if>
             <if test="rlr != null">rlr,</if>
             <if test="rlTime != null">rl_time,</if>
@@ -408,6 +445,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null">#{idCard},</if>
             <if test="phoneNum != null">#{phoneNum},</if>
             <if test="code != null">#{code},</if>
+            <if test="keyIndustries != null">#{keyIndustries},</if>
             <if test="houseType != null">#{houseType},</if>
             <if test="rlr != null">#{rlr},</if>
             <if test="rlTime != null">#{rlTime},</if>
@@ -446,6 +484,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null">id_card = #{idCard},</if>
             <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="houseType != null">house_type = #{houseType},</if>
             <if test="rlr != null">rlr = #{rlr},</if>
             <if test="rlTime != null">rl_time = #{rlTime},</if>