Showing
1 changed file
with
11 additions
and
2 deletions
| @@ -11,6 +11,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo; | @@ -11,6 +11,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo; | ||
| 11 | import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo; | 11 | import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo; |
| 12 | import lombok.extern.slf4j.Slf4j; | 12 | import lombok.extern.slf4j.Slf4j; |
| 13 | import org.apache.commons.collections.CollectionUtils; | 13 | import org.apache.commons.collections.CollectionUtils; |
| 14 | +import org.apache.commons.lang3.StringUtils; | ||
| 14 | 15 | ||
| 15 | import java.util.ArrayList; | 16 | import java.util.ArrayList; |
| 16 | import java.util.Arrays; | 17 | import java.util.Arrays; |
| @@ -117,8 +118,16 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust | @@ -117,8 +118,16 @@ public class CustomerCreditChangeImportListener extends ExcelImportListener<Cust | ||
| 117 | updateCustomerCreditVo.setAnnualTotalSales(data.getAnnualTotalSales()); | 118 | updateCustomerCreditVo.setAnnualTotalSales(data.getAnnualTotalSales()); |
| 118 | updateCustomerCreditVo.setMainIndustry(data.getMainIndustry()); | 119 | updateCustomerCreditVo.setMainIndustry(data.getMainIndustry()); |
| 119 | //年度款料概况=占用天数+吨盈利 | 120 | //年度款料概况=占用天数+吨盈利 |
| 120 | - String str = "占用天数（天）:" + data.getOccupationDays() + " | 吨盈利（元/吨）:" + data.getProfitPerTon(); | ||
| 121 | - updateCustomerCreditVo.setAnnualMaterialOverview(str); | 121 | + String annualMaterialOverview = customerCredit.getAnnualMaterialOverview(); |
| 122 | + String occupationDays = data.getOccupationDays(); | ||
| 123 | + String profitPerTon = data.getProfitPerTon(); | ||
| 124 | + if (StringUtils.isNotBlank(occupationDays) || StringUtils.isNotBlank(profitPerTon)) { | ||
| 125 | + annualMaterialOverview = "占用天数（天）:" + | ||
| 126 | + (StringUtils.isNotBlank(occupationDays) ? occupationDays : "") + | ||
| 127 | + " | 吨盈利（元/吨）:" + | ||
| 128 | + (StringUtils.isNotBlank(profitPerTon) ? profitPerTon : ""); | ||
| 129 | + } | ||
| 130 | + updateCustomerCreditVo.setAnnualMaterialOverview(annualMaterialOverview); | ||
| 122 | updateCustomerCreditVo.setCompanySettlementPeriod(data.getCompanySettlementPeriod()); | 131 | updateCustomerCreditVo.setCompanySettlementPeriod(data.getCompanySettlementPeriod()); |
| 123 | updateCustomerCreditVo.setCompanyCreditLimit(data.getCompanyCreditLimit()); | 132 | updateCustomerCreditVo.setCompanyCreditLimit(data.getCompanyCreditLimit()); |
| 124 | updateCustomerCreditVo.setCompanyMaterialSupplyPlan(data.getCompanyMaterialSupplyPlan()); | 133 | updateCustomerCreditVo.setCompanyMaterialSupplyPlan(data.getCompanyMaterialSupplyPlan()); |