Merge branch 'master_after20' into master_cj_zq

@@ -28,38 +28,38 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
       throw new DefaultClientException(
           "第" + context.readRowHolder().getRowIndex() + "行“编号”不能为空");
     }
-    if (StringUtil.isBlank(data.getAnnualTotalSales())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“年度总销量”不能为空");
-    }
-    if (StringUtil.isBlank(data.getMainIndustry())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“主要行业”不能为空");
-    }
-    if (StringUtil.isBlank(data.getOccupationDays())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“占用天数”不能为空");
-    }
-    if (StringUtil.isBlank(data.getProfitPerTon())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“吨盈利”不能为空");
-    }
-    if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“结算期限”不能为空");
-    }
-    if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“授信额度”不能为空");
-    }
-    if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“加工操作方案”不能为空");
-    }
-    if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“客户分类”不能为空");
-    }
+//    if (StringUtil.isBlank(data.getAnnualTotalSales())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“年度总销量”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getMainIndustry())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“主要行业”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getOccupationDays())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“占用天数”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getProfitPerTon())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“吨盈利”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“结算期限”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“授信额度”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“加工操作方案”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
+//      throw new DefaultClientException(
+//              "第" + context.readRowHolder().getRowIndex() + "行“客户分类”不能为空");
+//    }
     //客户分类
     if (StringUtil.isNotEmpty(data.getCompanySuggestedCategory()) && !validValues.contains(data.getCompanySuggestedCategory())) {
       throw new DefaultClientException(
@@ -79,6 +79,25 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
       throw new DefaultClientException(
               "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中不存在或未审核通过");
     }
+    CustomerCredit customerCredit = query.get(0);
+    if (StringUtil.isBlank(data.getAnnualTotalSales())) {
+      data.setAnnualTotalSales(customerCredit.getAnnualTotalSales());
+    }
+    if (StringUtil.isBlank(data.getMainIndustry())) {
+      data.setMainIndustry(customerCredit.getMainIndustry());
+    }
+    if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
+      data.setCompanySettlementPeriod(customerCredit.getCompanySettlementPeriod());
+    }
+    if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
+      data.setCompanyCreditLimit(customerCredit.getCompanyCreditLimit());
+    }
+    if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
+      data.setCompanyMaterialSupplyPlan(customerCredit.getCompanyMaterialSupplyPlan());
+    }
+    if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
+      data.setCompanySuggestedCategory(customerCredit.getCompanySuggestedCategory());
+    }
 
   }