Commit 9ae5df94 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent bd42c09e
......@@ -302,7 +302,7 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】与第" + policyNoMap.get(excel.getPolicyNo()) + "行重复,未导入"));
continue;
}
if (existMap.get(excel.getPolicyNo()) == null){
if (existMap.get(excel.getPolicyNo()) != null){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】已存在,未导入"));
continue;
}
......@@ -320,6 +320,14 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的险种与保险公司不一致,未导入"));
continue;
}
if (LocalDateUtil.parseLocalDate(excel.getPolicyStart()) == null){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的保单开始时间格式错误,未导入"));
continue;
}
if (LocalDateUtil.parseLocalDate(excel.getPolicyEnd()) == null){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的保单截止时间格式错误,未导入"));
continue;
}
policy = new TInsurancePolicy();
policy.setPolicyNo(excel.getPolicyNo());
policy.setInsuranceCompanyName(excel.getInsuranceCompanyName());
......@@ -332,8 +340,9 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
policy.setDeleteFlag(CommonConstants.ZERO_INT);
//插入保单维护信息
baseMapper.insert(policy);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保存成功",CommonConstants.GREEN));
//插入保单维护操作日志
tBusinessOperateService.saveModificationRecord(policy.getId(), null, policy, InsurancesConstants.IMPORT_POLICY_REMARK);
tBusinessOperateService.saveModificationRecord(policy.getId(), policy, policy, InsurancesConstants.IMPORT_POLICY_REMARK);
policyNoMap.put(excel.getPolicyNo(), excel.getRowIndex().toString());
// 清理map list 等数据
......@@ -352,7 +361,7 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
List<TInsurancePolicy> policies = this.baseMapper.selectList(Wrappers.<TInsurancePolicy>query().lambda()
.in(TInsurancePolicy::getPolicyNo,existNos).eq(TInsurancePolicy::getDeleteFlag,CommonConstants.ZERO_INT));
if (Common.isNotNull(policies)) {
existMap = policies.stream().collect(Collectors.toMap(TInsurancePolicy::getPolicyNo, TInsurancePolicy::getId));
existMap = policies.stream().collect(Collectors.toMap(TInsurancePolicy::getPolicyNo, TInsurancePolicy::getId,(v1, v2) -> v1));
}
}
if (!Common.isNotNull(existMap)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment