From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确，分析源码，找到bug原因是，财务对账统计只有用户点击后才会触发统计功能，把历史上及当天进行了统计，如果当天统计时未下班，例如是中午触发统计了，而下午又进行了充值售水，但下班后未再点击触发对账统计，那么今天的对账统计完成了但数据不对。编写自动任务，在下半夜进行对账统计。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 6591aad..e2ef459 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -11,6 +11,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.*;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrProject.intake.qo.QoIntake;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
@@ -105,10 +106,11 @@
@GetMapping(path = "one")
@SsoAop()
public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
- if (this.intakeSv.selectById(id) == null) {
+ VoAllIntake po = this.intakeSv.selectById(id) ;
+ if (po == null) {
return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
} else {
- return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ return BaseResponseUtils.buildSuccess(po);
}
}
@@ -351,9 +353,9 @@
*/
@GetMapping(path = "getFreeIntakes")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntakeSimple>>> getFreeIntakes() {
+ public BaseResponse<List<VoIntakeSimple>> getFreeIntakes(QoIntake qo) {
try {
- QueryResultVo<List<VoIntakeSimple>> res = intakeSv.getFreeIntakes();
+ List<VoIntakeSimple> res = intakeSv.getFreeIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
--
Gitblit v1.8.0