Kaynağa Gözat

政策-审核记录

yangzian 3 yıl önce
ebeveyn
işleme
59c49a2394

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

@@ -199,13 +199,6 @@ public class CwjsPolicyInfoController {
 					cwjsPolicyInfo.setApprovedStatus(3);
 					cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
-					CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
-					policyApprovalLog.setPolicyId(id);
-					policyApprovalLog.setCreateUserId(userId);
-					policyApprovalLog.setApprovalStatus(0);
-					policyApprovalLog.setApprovalContent(approvalContent);
-					policyApprovalLogService.save(policyApprovalLog);
-
 					/**
 					 * 终审通过后 添加 起始时间
 					 */
@@ -229,13 +222,6 @@ public class CwjsPolicyInfoController {
 							cwjsPolicyInfo.setApprovedStatus(3);
 							cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
-							CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
-							policyApprovalLog.setPolicyId(id);
-							policyApprovalLog.setCreateUserId(userId);
-							policyApprovalLog.setApprovalStatus(0);
-							policyApprovalLog.setApprovalContent(approvalContent);
-							policyApprovalLogService.save(policyApprovalLog);
-
 							/**
 							 * 终审通过后 添加 起始时间
 							 */
@@ -258,12 +244,6 @@ public class CwjsPolicyInfoController {
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
-				 CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
-				 policyApprovalLog.setPolicyId(id);
-				 policyApprovalLog.setCreateUserId(userId);
-				 policyApprovalLog.setApprovalStatus(0);
-				 policyApprovalLog.setApprovalContent(approvalContent);
-				 policyApprovalLogService.save(policyApprovalLog);
 
 				 /**
 				  * 终审通过后 添加 起始时间
@@ -275,13 +255,7 @@ public class CwjsPolicyInfoController {
 			 //老板
 			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
 				 cwjsPolicyInfo.setApprovedStatus(3);
-				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-				 CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
-				 policyApprovalLog.setPolicyId(id);
-				 policyApprovalLog.setCreateUserId(userId);
-				 policyApprovalLog.setApprovalStatus(3);
-				 policyApprovalLog.setApprovalContent(approvalContent);
-				 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.getCreateUserId());
+        policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getApprovedProgress());
         policyApprovalLog.setApprovalStatus(0);
-        policyApprovalLog.setApprovalContent("终审通过");
+        policyApprovalLog.setApprovalContent("终审通过");
         policyApprovalLogMapper.insert(policyApprovalLog);