ソースを参照

审核-法务

yangzian 3 年 前
コミット
10f6cb7d92

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

@@ -179,7 +179,7 @@ public class CwjsPolicyInfoController {
 			 policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
 			 policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			 policyApprovalLog.setApprovalStatus(0);
-			 policyApprovalLog.setApprovalContent("提交政策");
+			 policyApprovalLog.setApprovalContent("提交政策");
 			 policyApprovalLogService.save(policyApprovalLog);
 
 		}
@@ -308,7 +308,6 @@ public class CwjsPolicyInfoController {
 		}
 	 	if(type == 3){	//审核拒绝	给申请人发企业微信
 			cwjsPolicyInfo.setApprovedStatus(4);
-			cwjsPolicyInfo.setApprovedProgress(null);
 
 			CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
 			//老板
@@ -639,7 +638,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
 			policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			policyApprovalLog.setApprovalStatus(0);
-			policyApprovalLog.setApprovalContent("创建政策");
+			policyApprovalLog.setApprovalContent("创建政策");
 			policyApprovalLogService.save(policyApprovalLog);
 
 			result.success("添加成功!");
@@ -698,7 +697,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
 			policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			policyApprovalLog.setApprovalStatus(0);
-			policyApprovalLog.setApprovalContent("修改政策");
+			policyApprovalLog.setApprovalContent("修改政策");
 			policyApprovalLogService.save(policyApprovalLog);
 
 			result.success("修改成功!");

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

@@ -362,7 +362,7 @@
                         WHEN 4 THEN
                             '待提交' ELSE '-'
                         END AS approvalContent,
-                    IFNULL( IF ( p.approved_progress = 'legalAffairs', 'legalAffairs', p.approved_progress ), p.create_user_id ) userId,
+                    IF(p.approved_progress = 'legalAffairs' and p.approved_status = 4 , p.create_user_id, p.approved_progress ) userId,
                     p.create_user_name,
                     NOW() createTime
                 FROM