Browse Source

垫款 初版1.2优化修改

zhaoxian 2 years ago
parent
commit
daa2bce5a4

+ 6 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/service/impl/FinancePaymentApplicationServiceImpl.java

@@ -114,9 +114,9 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
         if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
         if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
             if ("financialReview".equals(reviewederId)) {
             if ("financialReview".equals(reviewederId)) {
                 application.setReviewederId(application.getUserId());
                 application.setReviewederId(application.getUserId());
-                SysUser user = userService.getById(application.getApplicanterId());
+                SysUser user = userService.getById(application.getUserId());
                 if (!Check.isNull(user)) {
                 if (!Check.isNull(user)) {
-                    application.setApplicanter(user.getRealname());
+                    application.setRevieweder(user.getRealname());
                 }
                 }
             }
             }
             this.updateById(application);
             this.updateById(application);
@@ -127,9 +127,9 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
             }
             }
             application.setFiles(Check.isNull(application.getFiles()) ? "-" : application.getFiles());
             application.setFiles(Check.isNull(application.getFiles()) ? "-" : application.getFiles());
             application.setReviewederId(application.getUserId());
             application.setReviewederId(application.getUserId());
-            SysUser user = userService.getById(application.getApplicanterId());
+            SysUser user = userService.getById(application.getUserId());
             if (!Check.isNull(user)) {
             if (!Check.isNull(user)) {
-                application.setApplicanter(user.getRealname());
+                application.setRevieweder(user.getRealname());
             }
             }
             this.updateById(application);
             this.updateById(application);
             //添加记录
             //添加记录
@@ -192,9 +192,9 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
             application.setAuditStatus("3");
             application.setAuditStatus("3");
             application.setApprovalContent(Check.isNull(application.getApprovalContent()) ? "-" : application.getApprovalContent());
             application.setApprovalContent(Check.isNull(application.getApprovalContent()) ? "-" : application.getApprovalContent());
             application.setReviewederId(application.getUserId());
             application.setReviewederId(application.getUserId());
-            SysUser user = userService.getById(application.getApplicanterId());
+            SysUser user = userService.getById(application.getUserId());
             if (!Check.isNull(user)) {
             if (!Check.isNull(user)) {
-                application.setApplicanter(user.getRealname());
+                application.setRevieweder(user.getRealname());
             }
             }
             this.updateById(application);
             this.updateById(application);
             //添加审核记录
             //添加审核记录