Commit 90273e3c9d2b91dfff0441b412055513eb8fa452

Authored by 房远帅
1 parent 848c4710

客户资信:变更导入编号不存在的数据直接跳过不报错

@@ -73,37 +73,38 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust @@ -73,37 +73,38 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
73 checkList.add(data.getCode()); 73 checkList.add(data.getCode());
74 QueryCustomerCreditVo vo = new QueryCustomerCreditVo(); 74 QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
75 vo.setSerialNumber(data.getCode()); 75 vo.setSerialNumber(data.getCode());
76 - vo.setStatus("PASS");  
77 CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class); 76 CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
78 List<CustomerCredit> query = customerCreditService.query(vo); 77 List<CustomerCredit> query = customerCreditService.query(vo);
79 - if (CollectionUtils.isEmpty(query)) {  
80 - throw new DefaultClientException(  
81 - "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中不存在或未审核通过");  
82 - }  
83 - CustomerCredit customerCredit = query.get(0);  
84 - if (StringUtil.isBlank(data.getAnnualTotalSales())) {  
85 - data.setAnnualTotalSales(customerCredit.getAnnualTotalSales());  
86 - }  
87 - if (StringUtil.isBlank(data.getMainIndustry())) {  
88 - data.setMainIndustry(customerCredit.getMainIndustry());  
89 - }  
90 - if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {  
91 - data.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());  
92 - }  
93 - if (StringUtil.isBlank(data.getCompanyCreditLimit())) {  
94 - data.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());  
95 - } else {  
96 - if (!isNumeric(data.getCompanyCreditLimit())) { 78 + if (CollectionUtils.isNotEmpty(query)) {
  79 + CustomerCredit customerCredit = query.get(0);
  80 + if ("PASS".equals(customerCredit.getStatus())) {
  81 + if (StringUtil.isBlank(data.getAnnualTotalSales())) {
  82 + data.setAnnualTotalSales(customerCredit.getAnnualTotalSales());
  83 + }
  84 + if (StringUtil.isBlank(data.getMainIndustry())) {
  85 + data.setMainIndustry(customerCredit.getMainIndustry());
  86 + }
  87 + if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
  88 + data.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());
  89 + }
  90 + if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
  91 + data.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());
  92 + } else {
  93 + if (!isNumeric(data.getCompanyCreditLimit())) {
97 throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行“授信额度”必须是数字!"); 94 throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行“授信额度”必须是数字!");
  95 + }
98 } 96 }
  97 + if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
  98 + data.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());
  99 + }
  100 + if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
  101 + data.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());
  102 + }
  103 + } else {
  104 + throw new DefaultClientException(
  105 + "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中未审核通过");
  106 + }
99 } 107 }
100 - if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {  
101 - data.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());  
102 - }  
103 - if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {  
104 - data.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());  
105 - }  
106 -  
107 } 108 }
108 109
109 @Override 110 @Override
@@ -112,6 +113,13 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust @@ -112,6 +113,13 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
112 List<CustomerCreditChangeImportModel> datas = this.getDatas(); 113 List<CustomerCreditChangeImportModel> datas = this.getDatas();
113 for (int i = 0; i < datas.size(); i++) { 114 for (int i = 0; i < datas.size(); i++) {
114 CustomerCreditChangeImportModel data = datas.get(i); 115 CustomerCreditChangeImportModel data = datas.get(i);
  116 + QueryCustomerCreditVo vo1 = new QueryCustomerCreditVo();
  117 + vo1.setSerialNumber(data.getCode());
  118 + List<CustomerCredit> query1 = customerCreditService.query(vo1);
  119 + //系统中不存在的编码直接跳过
  120 + if (CollectionUtils.isEmpty(query1)) {
  121 + continue;
  122 + }
115 QueryCustomerCreditVo vo = new QueryCustomerCreditVo(); 123 QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
116 vo.setSerialNumber(data.getCode()); 124 vo.setSerialNumber(data.getCode());
117 vo.setStatus("PASS"); 125 vo.setStatus("PASS");