فهرست منبع

政策-操作记录

yangzian 3 سال پیش
والد
کامیت
d0f1adf3c5

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

@@ -394,11 +394,10 @@ public class CwjsPolicyInfoController {
 			CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),1);	// 查询 被拒 审核意见 最新的一条
 			cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
 
-			/*
-			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2);	// 查询 手动转发领导的 审核意见 最新的一条
-			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
-			*/
-			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId(),3);	// 查询 老板 审核意见 最新的一条
+			CwjsPolicyApprovalLog forwardContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2);	// 查询 转发领导的理由 最新的一条
+			cwjsPolicy.setTheForwardingBossContent(Check.isNull(forwardContent) ? "" : forwardContent.getApprovalContent());
+
+			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId(),3);	// 查询 老板审核意见 最新的一条
 			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
 
 			CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId());	// 查询 法务 审核意见 最新的一条

+ 5 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/CwjsPolicyInfo.java

@@ -170,9 +170,13 @@ public class CwjsPolicyInfo implements Serializable{
 	/* 是否显示老板审批的 操作 yes显示 no 不显示*/
 	@TableField(exist = false)
 	private String theBossRight;
-	/* 给老板审核的理由*/
+	/* 老板审核的内容*/
 	@TableField(exist = false)
 	private String theBossContent;
+
+	/* 给老板审核的理由*/
+	@TableField(exist = false)
+	private String theForwardingBossContent;
 	/* 法务审核意见*/
 	@TableField(exist = false)
 	private String legalAffairsContent;