Merge branch '20250402_sun' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/utils/IDCardUtil.java

@@ -53,12 +53,18 @@ public class IDCardUtil {
         if (!isNumeric(ai)) {
             return false;
         }
-
-        // 出生年月是否有效
-        String strYear = ai.substring(6, 10); // 年份
-        String strMonth = ai.substring(10, 12); // 月份
-        String strDay = ai.substring(12, 14); // 月份
-        if (!isDataFormat(strYear + "-" + strMonth + "-" + strDay)) {
+        String strYear;
+        String strMonth;
+        String strDay;
+        try {
+            // 出生年月是否有效
+            strYear = ai.substring(6, 10); // 年份
+            strMonth = ai.substring(10, 12); // 月份
+            strDay = ai.substring(12, 14); // 月份
+            if (!isDataFormat(strYear + "-" + strMonth + "-" + strDay)) {
+                return false;
+            }
+        } catch (Exception ignored) {
             return false;
         }
 

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/controller/GljtSqLrController.java

@@ -194,10 +194,18 @@ public class GljtSqLrController extends BaseController
     }
 
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, String xzqh) throws Exception{
+    public AjaxResult importData(MultipartFile file, String xzqh) throws Exception {
         ExcelUtil<GljtSqLrImport> util = new ExcelUtil<>(GljtSqLrImport.class);
         List<GljtSqLrImport> list = util.importExcel(file.getInputStream());
         String message = gljtSqLrService.importGljtLr(list, xzqh);
         return AjaxResult.success(message);
     }
+
+    @PostMapping("/importData2")
+    public AjaxResult importData2(MultipartFile file, String xzqh) throws Exception {
+        ExcelUtil<GljtSqLrImport> util = new ExcelUtil<>(GljtSqLrImport.class);
+        List<GljtSqLrImport> list = util.importExcel(file.getInputStream());
+        String message = gljtSqLrService.importGljtLr2(list, xzqh);
+        return AjaxResult.success(message);
+    }
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/IGljtSqLrService.java

@@ -70,4 +70,6 @@ public interface IGljtSqLrService
     public int deleteGljtSqLrByIds(String[] ids);
 
     public String importGljtLr(List<GljtSqLrImport> lrImport, String xzqh);
+
+    public String importGljtLr2(List<GljtSqLrImport> lrImport, String xzqh);
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqLrServiceImpl.java

@@ -491,7 +491,7 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
                 if (!IDCardUtil.idCardValidate(lr.getSqrZjhm())) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，证件号码[").append(lr.getSqrZjhm()).append("]未通过检测！<br />");
                 SysDeptJl jd = deptList.stream().filter(d -> StringUtils.equals(d.getName(), lr.getJd())).findFirst().orElse(new SysDeptJl());
                 if (StringUtils.isEmpty(jd.getCode())) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，街道[").append(lr.getJd()).append("]未通过检测！<br />");
-                SysDeptJl sq = deptList.stream().filter(d -> StringUtils.equals(d.getParentId(), jd.getId()) && StringUtils.equals(d.getName(), lr.getSq())).findFirst().orElse(new SysDeptJl());
+                SysDeptJl sq = deptList.stream().filter(d -> StringUtils.equals(d.getParentId(), jd.getId()) && StringUtils.equals(d.getName(), lr.getSq().trim())).findFirst().orElse(new SysDeptJl());
                 if (StringUtils.isEmpty(sq.getCode())) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，社区[").append(lr.getSq()).append("]未通过检测！<br />");
                 String mz = mzList.stream().filter(m -> m.getDictLabel().contains(lr.getMz())).findFirst().orElse(new SysDictData()).getDictValue();
                 if (StringUtils.isEmpty(mz)) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，民族[").append(lr.getMz()).append("]未通过检测！<br />");
@@ -553,6 +553,101 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
         return res.toString();
     }
 
+    @Override
+    public String importGljtLr2(List<GljtSqLrImport> list, String xzqh) {
+        StringBuilder res = new StringBuilder();
+//        res.append("导入结束<br />");
+        if (CollectionUtils.isEmpty(list)) throw new ServiceException("不能导入空数据");
+        GljtQxpz qxpz = gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>().likeRight(GljtQxpz::getXzqh, xzqh.substring(0, 6)));
+        GljtXmpz xmpz = gljtXmpzMapper.selectOne(new LambdaQueryWrapper<GljtXmpz>().likeRight(GljtXmpz::getXzqh, xzqh.substring(0, 6)));
+        if (ObjectUtils.isEmpty(qxpz) || ObjectUtils.isEmpty(xmpz)) throw new ServiceException("区县配置及项目配置不能为空");
+        List<SysDeptJl> deptList = sysDeptJlMapper.selectList(new LambdaQueryWrapper<SysDeptJl>()
+                .likeRight(SysDeptJl::getCode, xzqh.substring(0, 6)));
+        if (CollectionUtils.isEmpty(deptList)) throw new ServiceException("输入行政区划有误");
+        SysDeptJl top = deptList.stream().filter(d -> StringUtils.equals(d.getLevel(), "3")).findFirst().orElse(null);
+        try {
+            List<SysDictData> mzList = DictUtils.getDictCache("C0009");
+            List<SysDictData> snList = DictUtils.getDictCache("GL021");
+            List<SysDictData> pcList = DictUtils.getDictCache("GL013");
+            List<SysDictData> isList = DictUtils.getDictCache("CZ035");
+            List<SysDictData> gxList = DictUtils.getDictCache("XZ061");
+            List<SysDictData> yhList = DictUtils.getDictCache("C0044");
+            List<GljtSqLr> inList = new ArrayList<>();
+            for (GljtSqLrImport lr: list) {
+                StringBuilder stringBuilder = new StringBuilder();
+                lr.setSqrZjhm(lr.getSqrZjhm().trim());
+                if (!IDCardUtil.idCardValidate(lr.getSqrZjhm())) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，证件号码[").append(lr.getSqrZjhm()).append("]未通过检测！<br />");
+                String mz = mzList.stream().filter(m -> m.getDictLabel().contains(lr.getMz())).findFirst().orElse(new SysDictData()).getDictValue();
+                if (StringUtils.isEmpty(mz)) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，民族[").append(lr.getMz()).append("]未通过检测！<br />");
+                String sn = snList.stream().filter(s -> StringUtils.equals(s.getDictLabel(), lr.getSndj())).findFirst().orElse(new SysDictData()).getDictValue();
+                if (StringUtils.isEmpty(sn)) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，健康状况[").append(lr.getSndj()).append("]未通过检测！<br />");
+                String db = isList.stream().filter(s -> StringUtils.equals(s.getDictLabel(), lr.getIsdb())).findFirst().orElse(new SysDictData()).getDictValue();
+                if (StringUtils.isEmpty(db)) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，是否低保[").append(lr.getIsdb()).append("]未通过检测！<br />");
+                String gx = gxList.stream().filter(s -> StringUtils.equals(s.getDictLabel(), lr.getJhrGx())).findFirst().orElse(new SysDictData()).getDictValue();
+                String yh = yhList.stream().filter(s -> StringUtils.equals(s.getDictLabel(), lr.getKhyh())).findFirst().orElse(new SysDictData()).getDictValue();
+                if (!checkDate(lr.getSqrq())) stringBuilder.append("[").append(lr.getSqrXm()).append("]老人，申请日期[").append(lr.getSqrq()).append("]未通过检测！<br />");
+                if (StringUtils.isEmpty(yh)) yh = "9999";
+                if (StringUtils.isEmpty(stringBuilder)) {
+                    GljtSqLr in = new GljtSqLr();
+                    String csrq = lr.getSqrZjhm().substring(6, 14);
+                    String genderCode = lr.getSqrZjhm().substring(16, 17);
+                    String xb = Integer.parseInt(genderCode) % 2 == 0 ? "2" : "1";
+                    String pc = GljtSqUtils.getBtbzByCsrq(csrq, db, xmpz);
+                    BeanUtil.copyProperties(lr, in, new CopyOptions().ignoreNullValue());
+                    in.setId(IdUtils.simpleUUID());
+                    in.setCsrq(csrq);
+                    in.setXb(xb);
+                    in.setPc(pc);
+                    in.setKhyh(yh);
+                    in.setIsdb(db);
+                    in.setMz(mz);
+                    in.setSndj(sn);
+                    in.setJhrGx(gx);
+                    in.setXzqh(xzqh);
+                    in.setFfyf(lr.getSqrq().substring(0, 6));
+                    in.setJkzkDjzt("0");
+                    in.setStatus("1");
+                    in.setCreateTimeStr(lr.getSqrq());
+                    in.setSqShjg("01");
+                    in.setJdShjg("01");
+                    in.setMzShjg("01");
+                    in.setSqShyj("通过");
+                    in.setJdShyj("通过");
+                    in.setMzShyj("通过");
+                    in.setSqShsj(lr.getSqrq());
+                    in.setJdShsj(lr.getSqrq());
+                    in.setMzShsj(lr.getSqrq());
+                    in.setSqShrxm("系统");
+                    in.setJdShrxm("系统");
+                    in.setMzShrxm("系统");
+                    in.setSqbfys("0");
+                    in.setSqbfje("0");
+                    in.setFzjg(top.getName() + "公安局");
+                    in.setIsImport("1");
+                    in.setIsgs("0");
+                    inList.add(in);
+//                    gljtSqLrMapper.delete(new LambdaQueryWrapper<GljtSqLr>().eq(GljtSqLr::getSqrZjhm, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, lr.getSqrZjhm())));
+//                    gljtSqLrMapper.insert(in);
+                } else {
+                    res.append(stringBuilder);
+                }
+            }
+            if (StringUtils.isNotEmpty(res)) {
+                res.insert(0, "导入失败，未通过检测数据如下：<br />");
+                return res.toString();
+            } else {
+                res.insert(0, "导入成功！<br />");
+                inList.forEach(i -> {
+                    gljtSqLrMapper.delete(new LambdaQueryWrapper<GljtSqLr>().eq(GljtSqLr::getSqrZjhm, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, i.getSqrZjhm())));
+                    gljtSqLrMapper.insert(i);
+                });
+            }
+        } catch (Exception e) {
+            throw new ServiceException(e.getMessage());
+        }
+        return res.toString();
+    }
+
     private String cleanIdCard(String sfzh) {
         if (StringUtils.isEmpty(sfzh)) {
             return sfzh;