8小时后台--

增员替换已投保bug

src/main/java/cn/timer/api/controller/insure/InsureContorll.java

@@ -61,6 +61,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -796,7 +797,7 @@ public class InsureContorll {
     @PostMapping(value = "/importUser")
     @ApiOperation(value = "12.导入用户--运营后台", httpMethod = "POST", notes = "导入用户")
     @Transactional(rollbackFor = Exception.class)
-    public Result<Object> importUser(@RequestParam("orgCode") String orgCode, @RequestParam("file") MultipartFile file) {
+    public Result<Object> importUser(@RequestParam("orgCode") String orgCode,@RequestParam("policyId") Integer policyId, @RequestParam("file") MultipartFile file) {
         SimpleDateFormat dtf = new SimpleDateFormat("yyyyMMdd");
         QyzxEntInfoM company = QyzxEntInfoM.builder().id(Integer.valueOf(orgCode)).build().selectById();
         if (company == null) {
@@ -889,15 +890,25 @@ public class InsureContorll {
                     QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(String.valueOf(System.currentTimeMillis())).pw(Md5.md5(pwd)).regTime(new Date()).orgId(company.getId()).username(u.getName()).sts(CommonEnum.U_STS_ON.getType()).build();
                     qyzxEmpLogin.insert();
                     u.setEmpNum(qyzxEmpLogin.getId());
-                    u.insert();
                 });
             }
             allList = ygglMainEmpMapper.selectListByIZjNum(yg.stream().map(YgglMainEmp::getZjNum).toArray(String[]::new), company.getId());
-            selectUserList = allList.stream().filter(s -> s.getIsInsure() == 0).collect(Collectors.toList());
+//            selectUserList = allList.stream().filter(s -> s.getIsInsure() == 0).collect(Collectors.toList());
             //假期规则初始化
             String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
             List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
 
+            /*投保前验证人员当月是否已投保*/
+            InsurePolicy policy = InsurePolicy.builder().id(policyId).build().selectById();
+            List<InsureUser> insureUserList = insureUserMapper.selectListByIds(allList.stream().map(YgglMainEmp::getId).map(String::valueOf).toArray(String[]::new), null, new SimpleDateFormat("yyyy-MM").format(policy.getPolicyDateStart()));
+            if (insureUserList.size() > 0) {
+                String name = "";
+                for (InsureUser insureUser : insureUserList) {
+                    name+=insureUser.getInsuredEContact()+',';
+                }
+                return ResultUtil.error("被保人"+name+"当月已投保");
+            }
+
         } catch (IOException e) {
             log.error("一键校验异常：", e);
             throw new CustomException("一键校验异常");
@@ -913,17 +924,18 @@ public class InsureContorll {
             }
 
         }
-        List<String> message = allList.stream().filter(s -> s.getIsInsure() == 1).map(YgglMainEmp::getName).collect(Collectors.toList());
-        if (message.size() > 0) {
-            return ResultUtil.data(selectUserList, JSONObject.toJSONString(message) + "已投过保");
-        }
+
+//        List<String> message = allList.stream().filter(s -> s.getIsInsure() == 1).map(YgglMainEmp::getName).collect(Collectors.toList());
+//        if (message.size() > 0) {
+//            return ResultUtil.data(selectUserList, JSONObject.toJSONString(message) + "已投过保");
+//        }
         return ResultUtil.data(selectUserList, "导入成功");
     }
 
     @PostMapping(value = "/importUserClient")
     @ApiOperation(value = "13.导入用户--8小时后台", httpMethod = "POST", notes = "导入用户")
     @Transactional(rollbackFor = Exception.class)
-    public Result<Object> importUserClient(@CurrentUser UserBean userBean, @RequestParam("file") MultipartFile file) {
+    public Result<Object> importUserClient(@CurrentUser UserBean userBean,@RequestParam("policyId")Integer policyId, @RequestParam("file") MultipartFile file) {
         SimpleDateFormat dtf = new SimpleDateFormat("yyyyMMdd");
         QyzxEntInfoM company = QyzxEntInfoM.builder().id(Integer.valueOf(userBean.getOrgCode())).build().selectById();
         if (company == null) {
@@ -1015,11 +1027,21 @@ public class InsureContorll {
                 newList.forEach(u -> u.insert());
             }
             allList = ygglMainEmpMapper.selectListByIZjNum(yg.stream().map(YgglMainEmp::getZjNum).toArray(String[]::new), company.getId());
-            selectUserList = allList.stream().filter(s -> s.getIsInsure() == 0).collect(Collectors.toList());
+//            selectUserList = allList.stream().filter(s -> s.getIsInsure() == 0).collect(Collectors.toList());
             //假期规则初始化
             String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
             List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, userBean.getOrgCode()));
 
+            /*投保前验证人员当月是否已投保*/
+            InsurePolicy policy = InsurePolicy.builder().id(policyId).build().selectById();
+            List<InsureUser> insureUserList = insureUserMapper.selectListByIds(allList.stream().map(YgglMainEmp::getId).map(String::valueOf).toArray(String[]::new), null, new SimpleDateFormat("yyyy-MM").format(policy.getPolicyDateStart()));
+            if (insureUserList.size() > 0) {
+                String name = "";
+                for (InsureUser insureUser : insureUserList) {
+                    name+=insureUser.getInsuredEContact()+',';
+                }
+                return ResultUtil.error("被保人"+name+"当月已投保");
+            }
         } catch (IOException e) {
             log.error("导入用户：", e);
             throw new CustomException("导入用户");
@@ -1032,10 +1054,11 @@ public class InsureContorll {
                 }
             }
         }
-        List<String> message = allList.stream().filter(s -> s.getIsInsure() == 1).map(YgglMainEmp::getName).collect(Collectors.toList());
-        if (message.size() > 0) {
-            return ResultUtil.data(selectUserList, JSONObject.toJSONString(message) + "已投过保");
-        }
+//
+//        List<String> message = allList.stream().filter(s -> s.getIsInsure() == 1).map(YgglMainEmp::getName).collect(Collectors.toList());
+//        if (message.size() > 0) {
+//            return ResultUtil.data(selectUserList, JSONObject.toJSONString(message) + "已投过保");
+//        }
         return ResultUtil.data(selectUserList, "导入成功");
     }
 
@@ -1196,9 +1219,9 @@ public class InsureContorll {
                 policy.setUpdateTime(new Date());
                 policy.insert();
             } else {
+                policy = oldPolicy;
                 oldPolicy.setPolicyFile(policy.getPolicyFile());
                 policy.setUpdateTime(new Date());
-                policy = oldPolicy;
                 policy.updateById();
             }
             Result<String> ossUrl = ossService.upload(policy.getId(), "policy", file);
@@ -1271,7 +1294,7 @@ public class InsureContorll {
         }finally {
             if(xw!=null){
                 try {
-                    xw.close();
+                        xw.close();
                 } catch (IOException e) {
                     e.printStackTrace();
                 }