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/DivideSv.java |   71 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index 9633b5f..d0e8820 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -1,14 +1,17 @@
 package com.dy.pipIrrProject.divide;
 
 import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
 import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrDivide;
 import com.dy.pipIrrGlobal.voPr.VoDivide;
+import com.dy.pipIrrGlobal.voPr.VoDivideDetails;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +27,9 @@
 public class DivideSv {
     @Autowired
     private PrDivideMapper prDivideMapper;
+
+    @Autowired
+    private BaDistrictMapper baDistrictMapper;
 
     /**
      * 娣诲姞鍒嗘按鎴�
@@ -42,13 +48,78 @@
     public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
 
+        // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
         Long itemTotal = prDivideMapper.getRecordCount(params);
 
         QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = queryVo.pageSize ;
         rsVo.pageCurr = queryVo.pageCurr ;
+
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = prDivideMapper.getDivides(params);
         return rsVo ;
     }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鍒嗘按鎴垮垪琛�
+     * @param queryVo
+     * @return
+     */
+    public List<VoDivide> exportDivides(QueryVo queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+        List<VoDivide> rsVo = new ArrayList<>();
+        rsVo = prDivideMapper.getDivides(params);
+        return rsVo ;
+    }
+
+    /**
+     * 鏍规嵁鍒嗘按鎴夸富閿幏鍙栧垎姘存埧瀵硅薄
+     * 2025-01-21 搴熷純
+     * @param id
+     * @return
+     */
+    public PrDivide getOneDivide(Long id) {
+        return prDivideMapper.selectByPrimaryKey(id);
+    }
+
+    public VoDivideDetails getDivideDetails(Long id) {
+        return prDivideMapper.getDivideDetails(id);
+    }
+
+    /**
+     * 鏍规嵁涓婚敭閫昏緫鍒犻櫎涓�涓垎姘存埧
+     * @param id
+     * @return
+     */
+    public Integer deleteDivideById(Long id) {
+        return prDivideMapper.deleteDivideById(id);
+    }
+
+    /**
+     * 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
+     * @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
+     * @return 5绾ц鏀垮尯鍒掍俊鎭�
+     */
+    public Map getDistrictsByVillageId(Long villageId) {
+        return baDistrictMapper.getDistrictsByVillageId(villageId);
+    }
+
+    /**
+     * 淇敼鍒嗘按鎴垮璞�
+     * @param po 鍐滄埛瀵硅薄
+     * @return 淇敼璁板綍鏉℃暟
+     */
+    public Integer updateByPrimaryKey(PrDivide po) {
+        //return prDivideMapper.updateByPrimaryKey(po);
+        return prDivideMapper.updateByPrimaryKeySelective(po);
+    }
+
+    /**
+     * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�
+     * @param divideId 鍒嗘按鎴縄D
+     * @return 鎵�灞炵墖鍖篒D
+     */
+    public Long getBlockIdById(Long divideId) {
+        return prDivideMapper.getBlockIdById(divideId);
+    }
 }

--
Gitblit v1.8.0