Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HscjController.java

@@ -157,4 +157,14 @@ public class HscjController extends BaseController
     {
         return toAjax(hscjService.deleteHscjByIds(ids));
     }
+
+    /**
+     * 校验身份证号在采集时间内是否重复
+     */
+    @GetMapping("/checkCard")
+    public AjaxResult checkCard(Hscj hscj)
+    {
+        List<Hscj> list = hscjService.checkCard(hscj);
+        return AjaxResult.success(list.isEmpty());
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/HscjMapper.java

@@ -58,4 +58,6 @@ public interface HscjMapper
      * @return 结果
      */
     public int deleteHscjByIds(Long[] ids);
+
+    List<Hscj> checkCard(Hscj hscj);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IHscjService.java

@@ -63,4 +63,6 @@ public interface IHscjService
     public int deleteHscjById(Long id);
 
     void importList(List<Hscj> list, HttpServletResponse response);
+
+    List<Hscj> checkCard(Hscj hscj);
 }

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

@@ -267,4 +267,10 @@ public class HscjServiceImpl implements IHscjService {
             util.exportExcel(response, failureList, "核算采集错误数据");
         }
     }
+
+    @Override
+    public List<Hscj> checkCard(Hscj hscj) {
+        return hscjMapper.checkCard(hscj);
+    }
+
 }

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

@@ -243,6 +243,7 @@ public class YxryServiceImpl implements IYxryService {
 
     @Override
     public Map selectByCard(String card) {
+        List<Yxry> zlqks = yxryMapper.selectYxryByCard(card);
         Map map = new HashMap();
         // 根据身份证号查询方舱人员信息
         Fcry fcry = new Fcry();
@@ -280,6 +281,7 @@ public class YxryServiceImpl implements IYxryService {
             map.put("fcName", null);
             map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.toList()));
         }
+        map.put("card",zlqks.isEmpty());
         return map;
     }
 }

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

@@ -114,6 +114,10 @@
         <include refid="selectHscjVo"/>
         where id = #{id}
     </select>
+    <select id="checkCard" resultType="com.ruoyi.system.domain.Hscj"
+            parameterType="com.ruoyi.system.domain.Hscj">
+        select id from hscj where del_flag ='0' and card_no=#{cardNo} and date_format(cj_time,'%y%m%d') = date_format(#{cjTime},'%y%m%d')
+    </select>
 
     <insert id="insertHscj" parameterType="Hscj" useGeneratedKeys="true" keyProperty="id">
         insert into hscj