Ver Fonte

审核-消息提示

yangzian há 3 anos atrás
pai
commit
90ee6edf2a

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

@@ -279,7 +279,7 @@ public class CwjsPolicyInfoController {
 				 policyApprovalLog.setPolicyId(id);
 				 policyApprovalLog.setCreateUserId(userId);
 				 policyApprovalLog.setApprovalStatus(3);
-				 policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "暂无" : approvalContent);
+				 policyApprovalLog.setApprovalContent(approvalContent);
 				 policyApprovalLogService.save(policyApprovalLog);
 				 /**
 				  * 终审通过后 添加 起始时间
@@ -302,7 +302,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalStatus(0);
-			 policyApprovalLog.setApprovalContent("审核通过");
+			 policyApprovalLog.setApprovalContent(approvalContent);
 			policyApprovalLogService.save(policyApprovalLog);
 
 		}
@@ -343,7 +343,7 @@ public class CwjsPolicyInfoController {
 		}
 
 		cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-	 	return Result.successMsg("审核通过",cwjsPolicyInfo);
+	 	return Result.successMsg(type ==  3 ? "审核拒绝" : "审核通过",cwjsPolicyInfo);
 	 }
 
 

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -24,6 +24,7 @@
         WHERE
             r.role_name = '法务'
           AND l.policy_id = #{policyId}
+          and l.approval_content != null
         ORDER BY
             l.create_time DESC
             LIMIT 1