diff --git a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java index b5ea967..5f9898f 100644 --- a/src/main/java/cn/timer/api/controller/insure/InsureContorll.java +++ b/src/main/java/cn/timer/api/controller/insure/InsureContorll.java @@ -377,7 +377,7 @@ public class InsureContorll { insureUser.setCreateTime(new Date()); insureUser.insert(); if (dataMap.get("errcode").toString().equals("suc")) { - y.setIsInsure(1); + y.setIsInsure(1);/*废弃*/ y.insertOrUpdate(); } } @@ -491,7 +491,7 @@ public class InsureContorll { log.info("增员异常:policyDateStart:" + insureDto.getPolicyDateStart() + "policyDateEnd:" + insureDto.getPolicyDateEnd()); throw new CustomException("增员异常"); } - y.setIsInsure(1); + y.setIsInsure(1);/*废弃*/ y.insertOrUpdate(); }); InsureLog.builder().requestParam(JSONObject.toJSONString(setParams(JSONObject.toJSONString(bodyMap), appid, secret))).type(2) @@ -641,7 +641,7 @@ public class InsureContorll { } catch (ParseException e) { log.error("获取保单信息异常:", e); } - y.setIsInsure(1); + y.setIsInsure(1);/*废弃*/ y.insertOrUpdate(); }); oldInsureUserList.forEach(o -> { @@ -1175,6 +1175,11 @@ public class InsureContorll { throw new CustomException("导入错误,人员为空"); } for (InsureUser insureUser : userList) { + InsureUser getInsurer = InsureUser.builder().build().selectOne(new QueryWrapper<InsureUser>().lambda() + .eq(InsureUser::getPolicyId,policy.getId()).eq(InsureUser::getStatus,1).eq(InsureUser::getInsureStatus,1).eq(InsureUser::getPolicyDateStart,insureUser.getPolicyDateStart()).eq(InsureUser::getPolicyDateEnd,insureUser.getPolicyDateEnd())); + if(getInsurer!=null){ + continue; + } /*根据名字,身份,所属企业获取员工*/ YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda() .eq(YgglMainEmp::getName, insureUser.getInsuredEContact()) @@ -1182,10 +1187,6 @@ public class InsureContorll { .eq(YgglMainEmp::getOrgCode, insureUser.getOrgCode())); if (ygglMainEmp != null) { - /*如果导入的人已经投保*/ - if (ygglMainEmp.getIsInsure() == 1) { - continue; - } insureUser.setInsuredMobile(ygglMainEmp.getPhone()); } else { QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(String.valueOf(System.currentTimeMillis())).pw(Md5.md5(pwd)).regTime(new Date()).orgId(insureUser.getOrgCode()).username(insureUser.getInsuredEContact()).sts(CommonEnum.U_STS_ON.getType()).build(); @@ -1198,7 +1199,7 @@ public class InsureContorll { ygglMainEmp.setZjNum(insureUser.getInsuredNo()); ygglMainEmp.setOrgCode(insureUser.getOrgCode()); } - ygglMainEmp.setIsInsure(1); + ygglMainEmp.setIsInsure(1);/*废弃*/ ygglMainEmp.insertOrUpdate(); insureUser.setInsuredName(company.getAttestName()); insureUser.setPolicyId(policy.getId()); @@ -1336,7 +1337,7 @@ public class InsureContorll { y.setZjType(0); y.setZjNum(iu.getInsuredNo()); y.setOrgCode(qyzxEntInfoM.getId()); - y.setIsInsure(0); + y.setIsInsure(0);/*废弃*/ y.insert(); } iu.setOrgCode(qyzxEntInfoM.getId()); @@ -1821,7 +1822,7 @@ public class InsureContorll { ygglMainEmp.setZjType(0); ygglMainEmp.setZjNum(insureUser.getInsuredNo()); ygglMainEmp.setOrgCode(insurePolicy.getOrgCode()); - ygglMainEmp.setIsInsure(0); + ygglMainEmp.setIsInsure(0);/*废弃*/ ygglMainEmp.insert(); } insureUser.setPolicyDateEnd(insurePolicy.getPolicyDateEnd());