Merge remote-tracking branch 'origin/master'

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

@@ -151,4 +151,7 @@ public class CzrkJzdz {
     /** 部门id集合 */
     private List<Long> deptIdList;
 
+    /** 身份证集合集合 */
+    private List<String> idCardList;
+
 }

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

@@ -116,6 +116,18 @@ public class CzrkJzdzController extends BaseController {
         return toAjax(czrkJzdzService.updateCzrkJzdz(czrkJzdz));
     }
 
+
+    /**
+     * 修改常住人口对应的是否五天一检
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:edit')")
+    @Log(title = "修改常住人口对应的是否五天一检", businessType = BusinessType.UPDATE)
+    @PostMapping("/isFive")
+    public AjaxResult isFive(@RequestBody CzrkJzdz czrkJzdz) {
+
+        return czrkJzdzService.isFive(czrkJzdz);
+    }
+
     /**
      * 删除常住人口对应的居住地址
      */
@@ -125,4 +137,6 @@ public class CzrkJzdzController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(czrkJzdzService.deleteCzrkJzdzByIds(ids));
     }
+
+
 }

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

@@ -100,4 +100,8 @@ import java.util.List;
      * @return
      */
   String  selectChinaArea(String areaId);
+
+    int isFive(@Param("idCardList")List<String> idCardList,@Param("hzCzrkJzdz")CzrkJzdz hzCzrkJzdz);
+
+    List<CzrkJzdz> selectCzrkJzdzFiveList(@Param("idCardList")List<String> idCardList);
 }

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

@@ -294,6 +294,24 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         return AjaxResult.success(sb.toString());
     }
 
+    @Override
+    public AjaxResult isFive(CzrkJzdz czrkJzdz) {
+        List<String> idCardList = czrkJzdz.getIdCardList();
+        //批量查询看看是否存在重点人群
+        List<CzrkJzdz> czrkJzdzList = czrkJzdzMapper.selectCzrkJzdzFiveList(idCardList);
+        if(czrkJzdzList!=null && czrkJzdzList.size()>0){
+            StringBuilder sb = new StringBuilder();
+            for (CzrkJzdz jzdz : czrkJzdzList) {
+                sb.append(jzdz.getUserName()).append("，");
+            }
+            sb.append("为重点人群，修改失败");
+            return AjaxResult.error(sb.toString());
+        }
+
+        int i = czrkJzdzMapper.isFive(idCardList,czrkJzdz);
+        return AjaxResult.success("修改成功");
+    }
+
     /**
      * 根据czrdId查询对应的居住地址
      *

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

@@ -111,4 +111,6 @@ public interface ICzrkJzdzService {
      * @return
      */
     AjaxResult importCzrkJzdz(List<CzrkJzdz> czrkJzdzList);
+
+    AjaxResult isFive(CzrkJzdz czrkJzdz);
 }

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

@@ -281,6 +281,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="isFive" parameterType="com.boman.domain.CzrkJzdz">
+        update czrk_jzdz set is_nucleicAcid_five = #{hzCzrkJzdz.isNucleicAcidFive}
+        where id_card in
+        <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
+            #{idCard}
+        </foreach>
+    </update>
+
     <delete id="deleteCzrkJzdzById" parameterType="Long">
         delete from czrk_jzdz where id = #{id}
     </delete>
@@ -385,4 +393,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCzrkJzdzByIdCard" resultType="java.lang.Integer">
         select ifnull(count(1), 0) from czrk_jzdz where region_id = '340882000000' and id_card = #{idCard} limit 1
     </select>
+    <select id="selectCzrkJzdzFiveList" resultMap="CzrkJzdzResult">
+        select
+        ANY_VALUE(user_name) as user_name,
+        ANY_VALUE(id_card) as id_card
+        from czrk_jzdz
+        where is_nucleicAcid_five = '3'
+        and `status` = 'Y'
+        and id_card in
+        <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
+            #{idCard}
+        </foreach>
+        GROUP BY id_card
+    </select>
 </mapper>