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-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
index 609c9fd..f6d3ff7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
@@ -28,14 +28,15 @@
     @Autowired
     private RmManureLastMapper rmManureLastDao ;
 
-    /**
-     * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
-     * @param qo
-     * @return
-     */
-    public QueryResultVo<List<VoManure>> selectHistory(ManureQo qo) {
-        qo.completionTime();
+    public VoManure oneLast(Long manureId) {
+        List<VoManure> list = this.rmManureLastDao.selectSomeByManureId(manureId) ;
+        if(list != null && list.size() > 0) {
+            return list.get(0) ;
+        }
+        return null ;
+    }
 
+    public QueryResultVo<List<VoManure>> oneHistory(ManureQo qo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
         Long itemTotal = rmManureHistoryDao.selectCount(params);
 
@@ -53,7 +54,7 @@
      * @param qo
      * @return
      */
-    public QueryResultVo<List<VoManure>> selectLast(ManureQo qo) {
+    public QueryResultVo<List<VoManure>> someLast(ManureQo qo) {
         qo.completionTime();
 
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
@@ -67,4 +68,25 @@
         rsVo.obj = rmManureLastDao.selectSome(params);
         return rsVo ;
     }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
+     * @param qo
+     * @return
+     */
+    public QueryResultVo<List<VoManure>> someHistory(ManureQo qo) {
+        qo.completionTime();
+
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+        Long itemTotal = rmManureHistoryDao.selectCount(params);
+
+        QueryResultVo<List<VoManure>> rsVo = new QueryResultVo<>() ;
+        rsVo.pageSize = qo.pageSize ;
+        rsVo.pageCurr = qo.pageCurr ;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = rmManureHistoryDao.selectSome(params);
+        return rsVo ;
+    }
+
 }

--
Gitblit v1.8.0