Ver código fonte

政策-操作记录

yangzian 3 anos atrás
pai
commit
1cfa346453

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

@@ -129,6 +129,7 @@ public class CwjsPolicyInfoController {
 		 if(cwjsPolicyInfo==null) {
 			 return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
 		 }
+		 cwjsPolicyInfo.setLoginUserId(userId);
 		 //获取 公司主题
 		 Integer companySubjectId = cwjsPolicyInfo.getCompanySubjectId();
 
@@ -278,7 +279,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalStatus(0);
-			 policyApprovalLog.setApprovalContent(approvalContent);
+			 policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核通过" : approvalContent);
 			 policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 
@@ -297,7 +298,7 @@ public class CwjsPolicyInfoController {
 
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
-			policyApprovalLog.setApprovalContent(approvalContent);
+			policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核拒绝" : approvalContent);
 			policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 

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

@@ -176,4 +176,9 @@ public class CwjsPolicyInfo implements Serializable{
 	/* 法务审核意见*/
 	@TableField(exist = false)
 	private String legalAffairsContent;
+
+
+	@TableField(exist = false)
+	private String loginUserId;
+
 }

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

@@ -338,7 +338,15 @@
                     l.id,
                     l.policy_id policyId,
                     l.approval_status approvalStatus,
-                    IF(l.approval_status = 3,'审核通过',l.approval_content) approvalContent,
+                    CASE
+                        l.approval_status
+                        WHEN 1 THEN
+                            '审核拒绝'
+                        WHEN 2 THEN
+                            '转审领导'
+                        WHEN 3 THEN
+                            '老板审核' ELSE l.approval_content
+                        END AS approvalContent,
                     l.create_user_id userId,
                     p.create_user_name,
                     l.create_time createTime

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -189,7 +189,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
         policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
         policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getApprovedProgress());
         policyApprovalLog.setApprovalStatus(2);//0-审核通过  1-审核不通过 2-转给领导
-        policyApprovalLog.setApprovalContent("转审领导");
+        policyApprovalLog.setApprovalContent(Check.isNull(cwjsPolicyInfo.getApprovalContent()) ? "转审领导" : cwjsPolicyInfo.getApprovalContent());
         policyApprovalLog.setCreateTime(new Date());
         policyApprovalLogService.save(policyApprovalLog);
     }

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -917,9 +917,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         //添加记录
         CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
         policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
-        policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getApprovedProgress());
+        policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getLoginUserId());
         policyApprovalLog.setApprovalStatus(0);
-        policyApprovalLog.setApprovalContent("终审通过");
+        policyApprovalLog.setApprovalContent(Check.isNull(cwjsPolicyInfo.getApprovalContent()) ? "终审通过" : cwjsPolicyInfo.getApprovalContent());
         policyApprovalLogMapper.insert(policyApprovalLog);