Browse Source

政策-审核记录时间

yangzian 3 years ago
parent
commit
531912d466

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

@@ -180,6 +180,7 @@ public class CwjsPolicyInfoController {
 			 policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			 policyApprovalLog.setApprovalStatus(0);
 			 policyApprovalLog.setApprovalContent("提交政策");
+			 policyApprovalLog.setCreateTime(new Date());
 			 policyApprovalLogService.save(policyApprovalLog);
 
 		}
@@ -278,6 +279,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalStatus(0);
 			 policyApprovalLog.setApprovalContent(approvalContent);
+			 policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 
 		}
@@ -296,6 +298,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalContent(approvalContent);
+			policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 
 
@@ -625,6 +628,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			policyApprovalLog.setApprovalStatus(0);
 			policyApprovalLog.setApprovalContent("创建政策");
+			policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 
 			result.success("添加成功!");
@@ -684,6 +688,7 @@ public class CwjsPolicyInfoController {
 			policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
 			policyApprovalLog.setApprovalStatus(0);
 			policyApprovalLog.setApprovalContent("修改政策");
+			policyApprovalLog.setCreateTime(new Date());
 			policyApprovalLogService.save(policyApprovalLog);
 
 			result.success("修改成功!");

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

@@ -145,6 +145,7 @@
              group_abbreviation = #{groupAbbreviation},
              approved_progress = #{approvedProgress},
              advance_pay = #{advancePay},
+             customer_flag = #{customerFlag},
              accounting_period = #{accountingPeriod},
              rebate_type = #{rebateType},
              rebate_rate = #{rebateRate},

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

@@ -189,6 +189,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
         policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
         policyApprovalLog.setApprovalStatus(2);//0-审核通过  1-审核不通过 2-转给领导
         policyApprovalLog.setApprovalContent("转审领导。");
+        policyApprovalLog.setCreateTime(new Date());
         policyApprovalLogService.save(policyApprovalLog);
     }