瀏覽代碼

修改调整

yumeng 1 年之前
父節點
當前提交
6cea7b9a16

+ 3 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -1092,6 +1092,9 @@ public class CwjsPolicyInfoController {
                 exportCwjsPolicyPojo.setCreateTime(DateUtils.dateToStringTime(vo.getCreateTime()));
                 exportCwjsPolicyPojo.setProductName(StringUtils.strip(vo.getPolicyProductName().toString(), "[]").replace("\"", ""));
 
+                CwjsPolicyApprovalLog mediaContent = policyApprovalLogMapper.getOneByPolicyMeidaInfo(vo.getId());    // 查询 政策审核角色 审核意见 最新的一条
+                exportCwjsPolicyPojo.setMeidiaAffairsContent(Check.isNull(mediaContent) ? "" : mediaContent.getApprovalContent());
+
                 CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(vo.getId());    // 查询 老板审核意见 最新的一条
                 exportCwjsPolicyPojo.setBossContent(Check.isNull(bossContent) ? "-" : StringUtils.equals("终审通过", bossContent.getApprovalContent()) ? "-" : bossContent.getApprovalContent());
 

+ 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 meidiaAffairsContent;
+
 	@Excel(name = "老板审核意见", width = 15)
 	private String bossContent;