Jelajahi Sumber

政策-导出

yangzian 3 tahun lalu
induk
melakukan
6a6c763bd1

+ 12 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -972,10 +972,18 @@ public class CwjsPolicyInfoController {
 				 exportCwjsPolicyPojo.setRebateType(ExportCwjsPolicyPojo.getRebateTypeStr(vo.getRebateType()));
 				 exportCwjsPolicyPojo.setRebateRate(vo.getRebateRate()+"%");
 				 exportCwjsPolicyPojo.setDianPayCompanyRebateRate(Check.isNull(vo.getDianPayCompanyRebateRate()) ? "" : vo.getDianPayCompanyRebateRate()+"%");
-				 exportCwjsPolicyPojo.setPromotionType(vo.getPromotionType() == 0 ? "自运营" : "代运营");
-				 exportCwjsPolicyPojo.setAdvancePay(vo.getAdvancePay() == 0 ?  "否" : "是");
-				 exportCwjsPolicyPojo.setIsDianPay(vo.getIsDianPay() == 0 ?  "否" : "是");
-				 exportCwjsPolicyPojo.setCustomerFlag(vo.getCustomerFlag() == 0 ?  "否" : "是");
+				 exportCwjsPolicyPojo.setPromotionType(Check.isNull(vo.getPromotionType()) ? "-" : vo.getPromotionType() == 0 ? "自运营" : "代运营");
+				 //exportCwjsPolicyPojo.setPromotionType(vo.getPromotionType() == 0 ? "自运营" : "代运营");
+
+				 exportCwjsPolicyPojo.setAdvancePay(Check.isNull(vo.getAdvancePay()) ?  "-" : vo.getAdvancePay() == 0 ?  "否" : "是");
+				 //exportCwjsPolicyPojo.setAdvancePay(vo.getAdvancePay() == 0 ?  "否" : "是");
+
+				 exportCwjsPolicyPojo.setIsDianPay(Check.isNull(vo.getIsDianPay()) ?  "-" : vo.getIsDianPay() == 0 ?  "否" : "是");
+				 //exportCwjsPolicyPojo.setIsDianPay(vo.getIsDianPay() == 0 ?  "否" : "是");
+
+				 exportCwjsPolicyPojo.setCustomerFlag(Check.isNull(vo.getCustomerFlag()) ?  "-" : vo.getCustomerFlag() == 0 ?  "否" : "是");
+				// exportCwjsPolicyPojo.setCustomerFlag(vo.getCustomerFlag() == 0 ?  "否" : "是");
+
 				 exportCwjsPolicyPojo.setCreateTime(DateUtils.dateToStringTime(vo.getCreateTime()));
 				 exportCwjsPolicyPojo.setProductName(StringUtils.strip(vo.getPolicyProductName().toString(),"[]"));
 				 resultList.add(exportCwjsPolicyPojo);