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/divide/DivideCtrl.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
index 3b1096a..830de5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -10,6 +10,7 @@
 import com.dy.pipIrrGlobal.pojoBa.BaClient;
 import com.dy.pipIrrGlobal.pojoPr.PrDivide;
 import com.dy.pipIrrGlobal.voPr.VoDivide;
+import com.dy.pipIrrGlobal.voPr.VoDivideDetails;
 import com.dy.pipIrrGlobal.voSe.VoActiveCard;
 import com.dy.pipIrrProject.result.ProjectResultCode;
 import io.swagger.v3.oas.annotations.Operation;
@@ -67,12 +68,13 @@
     @SsoAop()
     public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(QueryVo vo){
         try {
-            QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
-            if(res.itemTotal != null && res.itemTotal > 0) {
-                return BaseResponseUtils.buildSuccess(res);
-            }else {
-                return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage());
-            }
+            //QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
+            //if(res.itemTotal != null && res.itemTotal > 0) {
+            //    return BaseResponseUtils.buildSuccess(res);
+            //}else {
+            //    return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage());
+            //}
+            return BaseResponseUtils.buildSuccess(divideSv.getDivides(vo));
         } catch (Exception e) {
             log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -95,14 +97,16 @@
     })
     @GetMapping(path = "/getone/{id}")
     @SsoAop()
-    public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){
+    //public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){
+    public BaseResponse<VoDivideDetails> getOneDivide(@PathVariable("id") Long id){
         try {
-            PrDivide res = divideSv.getOneDivide(id);
-            if(res != null) {
-                return BaseResponseUtils.buildSuccess(res);
-            }else {
-                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage());
-            }
+            //PrDivide res = divideSv.getOneDivide(id);
+            //if(res != null) {
+            //    return BaseResponseUtils.buildSuccess(res);
+            //}else {
+            //    return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage());
+            //}
+            return BaseResponseUtils.buildSuccess(divideSv.getDivideDetails(id));
         } catch (Exception e) {
             log.error("鏌ヨ鍐滄埛寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;

--
Gitblit v1.8.0