فهرست منبع

垫款 初版1.2优化修改

zhaoxian 2 سال پیش
والد
کامیت
0b9714c40f

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentApplicationController.java

@@ -83,7 +83,7 @@ public class FinancePaymentApplicationController {
             queryWrapper.ge("create_time", application.getStartDate() + " 00:00:00");
             queryWrapper.le("create_time", application.getEndDate() + " 23:59:59");
         }
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         Page<FinancePaymentApplication> page = new Page<FinancePaymentApplication>(pageNo, pageSize);
         IPage<FinancePaymentApplication> pageList = financePaymentApplicationService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentPoolController.java

@@ -73,7 +73,7 @@ public class FinancePaymentPoolController {
             queryWrapper.ge("create_time", pool.getStartDate() + " 00:00:00");
             queryWrapper.le("create_time", pool.getEndDate() + " 23:59:59");
         }
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         Page<FinancePaymentPool> page = new Page<FinancePaymentPool>(pageNo, pageSize);
         IPage<FinancePaymentPool> pageList = financePaymentPoolService.page(page, queryWrapper);
         result.setSuccess(true);

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentApplicationMapper.xml

@@ -91,14 +91,14 @@
                  WHERE t1.application_id = #{id}
                  UNION ALL
                  SELECT t1.audit_status,
-                        '-',
-                        '-',
+                        t1.revieweder_id,
+                        t1.revieweder,
                         t4.role_name,
                         t1.approval_content,
                         t1.files,
                         t1.update_time
                  FROM finance_payment_application t1
-                          LEFT JOIN sys_user_role t3 ON t1.applicanter_id = t3.user_id
+                          LEFT JOIN sys_user_role t3 ON t1.revieweder_id = t3.user_id
                           LEFT JOIN sys_role t4 ON t3.role_id = t4.id
                  WHERE t1.id = #{id}
              ) t

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -13,8 +13,8 @@
                  WHERE t1.recharge_id = #{id}
                  UNION ALL
                  SELECT t1.audit_status,
-                        '-',
-                        '-',
+                        t1.revieweder_id,
+                        t1.revieweder,
                         t4.role_name,
                         t1.approval_content,
                         t1.files,

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

@@ -198,7 +198,7 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
             }
             this.updateById(application);
             //添加审核记录
-            insertRecord(application.getId(), oldApplication.getRevieweder(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles());
+            insertRecord(application.getId(), oldApplication.getReviewederId(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles());
         }
         return Result.ok();
     }