Merge branch 'master_after20' into master_cj_zq

@@ -11,6 +11,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -117,8 +118,16 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust
       updateCustomerCreditVo.setAnnualTotalSales(data.getAnnualTotalSales());
       updateCustomerCreditVo.setMainIndustry(data.getMainIndustry());
       //年度款料概况=占用天数+吨盈利
-      String str = "占用天数（天）:" + data.getOccupationDays() + " | 吨盈利（元/吨）:" + data.getProfitPerTon();
-      updateCustomerCreditVo.setAnnualMaterialOverview(str);
+      String annualMaterialOverview = customerCredit.getAnnualMaterialOverview();
+      String occupationDays = data.getOccupationDays();
+      String profitPerTon = data.getProfitPerTon();
+      if (StringUtils.isNotBlank(occupationDays) || StringUtils.isNotBlank(profitPerTon)) {
+          annualMaterialOverview = "占用天数（天）:" +
+                  (StringUtils.isNotBlank(occupationDays) ? occupationDays : "") +
+                  " | 吨盈利（元/吨）:" +
+                  (StringUtils.isNotBlank(profitPerTon) ? profitPerTon : "");
+      }
+      updateCustomerCreditVo.setAnnualMaterialOverview(annualMaterialOverview);
       updateCustomerCreditVo.setCompanySettlementPeriod(data.getCompanySettlementPeriod());
       updateCustomerCreditVo.setCompanyCreditLimit(data.getCompanyCreditLimit());
       updateCustomerCreditVo.setCompanyMaterialSupplyPlan(data.getCompanyMaterialSupplyPlan());