Procházet zdrojové kódy

政策-导出添加老板审核意见

yangzian před 3 roky
rodič
revize
b4b69fa5d9

+ 8 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -976,7 +976,14 @@ public class CwjsPolicyInfoController {
 				 exportCwjsPolicyPojo.setIsDianPay(Check.isNull(vo.getIsDianPay()) ?  "-" : vo.getIsDianPay() == 0 ?  "否" : "是");
 				 exportCwjsPolicyPojo.setCustomerFlag(Check.isNull(vo.getCustomerFlag()) ?  "-" : vo.getCustomerFlag() == 0 ?  "否" : "是");
 				 exportCwjsPolicyPojo.setCreateTime(DateUtils.dateToStringTime(vo.getCreateTime()));
-				 exportCwjsPolicyPojo.setProductName(StringUtils.strip(vo.getPolicyProductName().toString(),"[]"));
+				 exportCwjsPolicyPojo.setProductName(StringUtils.strip(vo.getPolicyProductName().toString(),"[]").replace("\"",""));
+
+				 CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(vo.getId());	// 查询 老板审核意见 最新的一条
+				 exportCwjsPolicyPojo.setBossContent(Check.isNull(bossContent) ?  "-" : StringUtils.equals("终审通过",bossContent.getApprovalContent()) ? "-" : bossContent.getApprovalContent());
+
+				 CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(vo.getId());	// 查询 法务 审核意见 最新的一条
+				 exportCwjsPolicyPojo.setLegalAffairsContent(Check.isNull(legalContent) ? "-" : legalContent.getApprovalContent());
+
 				 resultList.add(exportCwjsPolicyPojo);
 			 }
 			 Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("政策内容", "销售政策"), ExportCwjsPolicyPojo.class, resultList);

+ 3 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/ExportCwjsPolicyPojo.java

@@ -109,6 +109,9 @@ public class ExportCwjsPolicyPojo implements Serializable{
 	@Excel(name = "法务审核意见", width = 15)
 	private String legalAffairsContent;
 
+	@Excel(name = "老板审核意见", width = 15)
+	private String bossContent;
+