新增或者修改 修复

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

@@ -67,6 +67,12 @@ public class Czrk extends BaseEntity {
     @Excel(name = "联系号码")
     private String phoneNum;
 
+    /**
+     * 人员分类
+     */
+    @Excel(name = "人员分类")
+    private String keyIndustries;
+
     /**
      * 户籍号
      */

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

@@ -73,8 +73,8 @@ public class RyrlController extends BaseController {
      * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/sts")
-    public AjaxResult stsByApplet(Long townId, Long villageId, String userName) {
-        return AjaxResult.success("成功", czrkService.stsByApplet(townId, villageId, userName));
+    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));
     }
 
 

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

@@ -80,7 +80,8 @@ public interface CzrkMapper {
     List<Czrk> listByCode(String code);
 
 
-    int stsByYrl(@Param("deptIdList") List<Long> deptIdList, @Param("userName") String userName);
+    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);
 
-    int stsByWrl(@Param("deptIdList") List<Long> deptIdList, @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/CzrkServiceImpl.java

@@ -5,6 +5,7 @@ import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.number.NumberUtils;
+import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.sql.SqlUtil;
 import com.boman.common.core.web.page.PageDomain;
 import com.boman.common.core.web.page.TableSupport;
@@ -321,7 +322,11 @@ public class CzrkServiceImpl implements ICzrkService {
         if (isEmpty(id)) {
             return null;
         }
-        return czrkMapper.selectCzrkById(id);
+
+        Czrk czrk = czrkMapper.selectCzrkById(id);
+        List<CzrkJzdz> czrkJzdzList = czrkJzdzService.listByIdCard(Collections.singletonList(czrk.getIdCard()));
+        czrk.setCzrkJzdzList(czrkJzdzList);
+        return czrk;
     }
 
     @Override
@@ -338,28 +343,24 @@ public class CzrkServiceImpl implements ICzrkService {
         }
 
         int count = czrkMapper.countIdCard(czrk.getIdCard());
-        if (count > 0) {
-            return AjaxResult.error(String.format("该人员[身份证号为: %s]已存在，请勿重复添加", czrk.getIdCard()));
-        }
+        if (count > 0) return AjaxResult.error(String.format("该人员[身份证号为: %s]已存在，请勿重复添加", czrk.getIdCard()));
 
         czrk.setCreateBy(username);
         czrk.setUpdateBy(username);
         count = czrkMapper.insertCzrk(czrk);
-        if (count <= 0) {
-            return AjaxResult.error();
-        }
+        if (count <= 0) return AjaxResult.error();
 
         List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
-        if (isEmpty(czrkJzdzList)) {
-            return AjaxResult.error("该人员常住地址未添加");
-        }
+        if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
 
         int sort = 0, childCount = 0;
         for (CzrkJzdz czrkJzdz : czrkJzdzList) {
             czrkJzdz.setCzrkId(czrk.getId());
             czrkJzdz.setSort(++sort);
-            czrkJzdz.setCreateBy(SecurityUtils.getUsername());
-            czrkJzdz.setUpdateBy(SecurityUtils.getUsername());
+            czrkJzdz.setUserName(czrk.getUserName());
+            czrkJzdz.setIdCard(czrk.getIdCard());
+            czrkJzdz.setCreateBy(username);
+            czrkJzdz.setUpdateBy(username);
             childCount += czrkJzdzService.insertCzrkJzdz(czrkJzdz);
         }
 
@@ -369,31 +370,32 @@ public class CzrkServiceImpl implements ICzrkService {
     @Override
     public AjaxResult editRlry(Czrk czrk) {
         String username = SecurityUtils.getUsername();
-        if (isNotEmpty(czrk.getVillageTowns())) {
-            czrk.setRlr(SecurityUtils.getUsername());
-            czrk.setIsRl("是");
-            czrk.setRlTime(new Date(System.currentTimeMillis()));
-        } else {
-            czrk.setIsRl("否");
-            czrk.setRlTime(null);
+        String isRl = czrk.getIsRl();
+        if ("否".equals(isRl)) {
+            if (isNotEmpty(czrk.getVillageTowns())) {
+                czrk.setRlr(username);
+                czrk.setIsRl("是");
+                czrk.setRlTime(new Date(System.currentTimeMillis()));
+            } else {
+                czrk.setIsRl("否");
+                czrk.setRlTime(null);
+            }
         }
 
         czrk.setUpdateBy(username);
         int count = czrkMapper.updateCzrk(czrk);
-        if (count <= 0) {
-            return AjaxResult.error();
-        }
+        if (count <= 0) return AjaxResult.error();
 
         List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
-        if (isEmpty(czrkJzdzList)) {
-            return AjaxResult.error("该人员常住地址未添加");
-        }
+        if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
 
         czrkJzdzService.deleteByCzrkId(czrk.getId());
         int sort = 0, childCount = 0;
         for (CzrkJzdz czrkJzdz : czrkJzdzList) {
             czrkJzdz.setCzrkId(czrk.getId());
             czrkJzdz.setSort(++sort);
+            czrkJzdz.setUserName(czrk.getUserName());
+            czrkJzdz.setIdCard(czrk.getIdCard());
             czrkJzdz.setCreateBy(username);
             czrkJzdz.setUpdateBy(username);
             childCount += czrkJzdzService.insertCzrkJzdz(czrkJzdz);
@@ -403,25 +405,28 @@ public class CzrkServiceImpl implements ICzrkService {
     }
 
     @Override
-    public JSONObject stsByApplet(Long townId, Long villageId, String userName) {
-        List<Long> deptIdList = new ArrayList<>(16);
-        // 未加搜索条件
-        if (isEmpty(townId) && isEmpty(villageId)) {
-            deptIdList = getDeptIdList(null);
-        } else {
-            // 查村
-            if (!isEmpty(townId) && !isEmpty(villageId)) {
-                List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(villageId);
-                deptIdList = sysDepts.stream().map(SysDept::getId).collect(Collectors.toList());
-            } else if (!isEmpty(townId) && isEmpty(villageId)) {
-                // 查镇
-                List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(townId);
-                deptIdList = sysDepts.stream().map(SysDept::getId).collect(Collectors.toList());
-            }
+    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName) {
+        Long areaId = null;
+        int type = 0;
+        if (ObjectUtils.isNotEmpty(provinceId)) {
+            areaId = provinceId;
+            type = 1;
+        } else if (ObjectUtils.isNotEmpty(cityId)) {
+            areaId = cityId;
+            type = 2;
+        } else if (ObjectUtils.isNotEmpty(regionId)) {
+            areaId = regionId;
+            type = 3;
+        } else if (ObjectUtils.isNotEmpty(townId)) {
+            areaId = townId;
+            type = 4;
+        } else if (ObjectUtils.isNotEmpty(villageId)) {
+            areaId = villageId;
+            type = 5;
         }
 
-        int yrl = czrkMapper.stsByYrl(deptIdList, userName);
-        int wrl = czrkMapper.stsByWrl(deptIdList, userName);
+        int yrl = czrkMapper.stsByYrl(type, areaId, userName);
+        int wrl = czrkMapper.stsByWrl(type, areaId, userName);
         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/ICzrkService.java

@@ -78,7 +78,7 @@ public interface ICzrkService {
     AjaxResult addRlry(Czrk czrk);
     AjaxResult editRlry(Czrk czrk);
 
-    JSONObject stsByApplet(Long townId, Long villageId, String userName);
+    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName);
     JSONObject stsByCzrk();
     JSONObject stsByCzrkHomePage();
 

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

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listByIdCard" resultMap="CzrkJzdzResult">
-        select id, czrk_id, id_card, province, city, region, town, village, now_in from czrk_jzdz
+        <include refid="selectCzrkJzdzVo"/>
         where id_card in
         <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
             #{idCard}

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="houseType"    column="house_type"    />
         <result property="rlr"    column="rlr"    />
         <result property="rlTime"    column="rl_time"    />
+        <result property="keyIndustries"    column="key_industries"    />
         <result property="yhzgx"    column="yhzgx"    />
         <result property="workUnit"    column="work_unit"    />
         <result property="provinceId"    column="province_id"    />
@@ -104,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              , 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
         from czrk
-        left join czrk_jzdz jzdz on czrk.id = jzdz.id
+        left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
         <where>
             <!-- 已认领 -->
             <if test="isRl != null and isRl != ''">and czrk.is_rl = #{isRl}</if>
@@ -332,12 +333,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userName != null  and userName != ''">
             and (vi.user_name like concat('%', #{userName}, '%') or vi.id_card like concat('%', #{userName}, '%'))
         </if>
-        <if test="deptIdList != null  and deptIdList.size() > 0">
-            and vi.dept_id in
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
-        </if>
+        <choose>
+            <when test="type == 1">and vi.province_id = #{areaId}</when>
+            <when test="type == 2">and vi.city_id = #{areaId}</when>
+            <when test="type == 3">and vi.region_id = #{areaId}</when>
+            <when test="type == 4">and vi.village_towns_id = #{areaId}</when>
+            <when test="type == 5">and vi.village_id = #{areaId}</when>
+        </choose>
     </select>
 
     <select id="stsByWrl" resultType="int">
@@ -349,12 +351,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userName != null  and userName != ''">
             and (vi.user_name like concat('%', #{userName}, '%') or vi.id_card like concat('%', #{userName}, '%'))
         </if>
-        <if test="deptIdList != null  and deptIdList.size() > 0">
-            and vi.dept_id in
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
-        </if>
+        <choose>
+            <when test="type == 1">and vi.province_id = #{areaId}</when>
+            <when test="type == 2">and vi.city_id = #{areaId}</when>
+            <when test="type == 3">and vi.region_id = #{areaId}</when>
+            <when test="type == 4">and vi.village_towns_id = #{areaId}</when>
+            <when test="type == 5">and vi.village_id = #{areaId}</when>
+        </choose>
     </select>