Commit d0a306f8 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 244be27f
...@@ -216,10 +216,10 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh ...@@ -216,10 +216,10 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh
for (TCheckBankNo check : list) { for (TCheckBankNo check : list) {
cur = noMap.get(check.getBankNo()); cur = noMap.get(check.getBankNo());
if (cur != null) { if (cur != null) {
if (CommonConstants.ZERO_ONE.equals(cur.getResult())) { if (CommonConstants.ZERO_ONE.equals(cur.getResult()) && null != cur.getIdNum()) {
bankMap.put(cur.getBankNo(), cur.getName().equals(check.getName())); bankMap.put(cur.getBankNo(), (cur.getName().equals(check.getName())&& cur.getIdNum().equals(check.getIdNum())));
} else { } else {
if (cur.getName().equals(check.getName())) { if (cur.getName().equals(check.getName()) && null != cur.getIdNum() && cur.getIdNum().equals(check.getIdNum())) {
bankMap.put(cur.getBankNo(), false); bankMap.put(cur.getBankNo(), false);
} else { } else {
noCurlist.add(check); noCurlist.add(check);
...@@ -435,6 +435,7 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh ...@@ -435,6 +435,7 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh
newNo = new TCheckBankNo(); newNo = new TCheckBankNo();
newNo.setBankNo(no.getBankNo()); newNo.setBankNo(no.getBankNo());
newNo.setName(no.getName()); newNo.setName(no.getName());
newNo.setIdNum(no.getIdNum());
newNo.setMessage(ChecksConstants.CHECK_CONFIG_ACCESS); newNo.setMessage(ChecksConstants.CHECK_CONFIG_ACCESS);
newNo.setResult("01"); newNo.setResult("01");
newNo.setType(CommonConstants.ONE_STRING); newNo.setType(CommonConstants.ONE_STRING);
...@@ -458,7 +459,7 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh ...@@ -458,7 +459,7 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh
public Map<String, Boolean> call() { public Map<String, Boolean> call() {
for (TCheckBankNo no : noList) { for (TCheckBankNo no : noList) {
// 1.调用银行卡信息校验api // 1.调用银行卡信息校验api
R<TCheckBankNo> resR = ChecksUtil.checkBankNoTwoMethod(no.getName(), no.getBankNo()); R<TCheckBankNo> resR = ChecksUtil.checkBankNoThree(no.getName(), no.getBankNo(), no.getIdNum(), true);
if (Common.isNotNull(resR) && resR.getCode() == CommonConstants.SUCCESS if (Common.isNotNull(resR) && resR.getCode() == CommonConstants.SUCCESS
&& Common.isNotNull(resR.getData())) { && Common.isNotNull(resR.getData())) {
TCheckBankNo newNo = resR.getData(); TCheckBankNo newNo = resR.getData();
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
a.id, a.id,
a.bank_no, a.bank_no,
a.name, a.name,
a.result a.result,
a.id_num
FROM t_check_bank_no a FROM t_check_bank_no a
where a.bank_no in where a.bank_no in
<foreach item="item" index="index" collection="noList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="noList" open="(" separator="," close=")">
......
...@@ -314,11 +314,16 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap ...@@ -314,11 +314,16 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
if (null == type){ if (null == type){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的险种名称未找到,未导入",excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的险种名称未找到,未导入",excel));
continue; continue;
} }else {
if (!type.getInsuranceCompanyId().equals(company.getId())){ type = typeMapper.selectOne(Wrappers.<TInsuranceType>query().lambda()
.eq(TInsuranceType::getName,excel.getInsuranceTypeName())
.eq(TInsuranceType::getInsuranceCompanyId,company.getId()).last(CommonConstants.LAST_ONE_SQL));
if (null == type){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的险种与保险公司不一致,未导入",excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的险种与保险公司不一致,未导入",excel));
continue; continue;
} }
}
if (LocalDateUtil.parseLocalDate(excel.getPolicyStart()) == null){ if (LocalDateUtil.parseLocalDate(excel.getPolicyStart()) == null){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的保单开始时间格式错误,未导入",excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "保单号【" + excel.getPolicyNo() + "】的保单开始时间格式错误,未导入",excel));
continue; continue;
......
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