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-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
index 6f67db7..60a4696 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -66,10 +66,30 @@
     @SsoAop()
     public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
         try {
-            QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
-            return BaseResponseUtils.buildSuccess(res);
+            //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
+            return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
         } catch (Exception e) {
             log.error("鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰曞紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
+
+    /**
+     * 鑾峰彇涓�涓贰妫�鍛橀棶棰樹笂鎶ヨ褰曡鎯�
+     * @param issueReportId
+     * @return
+     */
+    @GetMapping(path = "/getOneIssueReport")
+    @SsoAop()
+    public BaseResponse<VoIssueReport> getOneIssueReport(@RequestParam("issueReportId") Long issueReportId) {
+        try {
+            VoIssueReport issueReport = issueSv.getIssueReportById(issueReportId);
+            if(issueReport == null) {
+                return BaseResponseUtils.buildNonExist();
+            }
+            return BaseResponseUtils.buildSuccess(issueReport);
+        } catch (Exception e) {
+            log.error("鑾峰彇闂涓婃姤璁板綍璇︽儏寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
         }
     }
@@ -105,9 +125,11 @@
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> replyReport(@RequestBody @Valid OpeReportReply po, BindingResult bindingResult) {
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-
+        if (issueSv.getReportReply(po.getReportId()).get("code").equals("0001")){
+            return BaseResponseUtils.buildErrorMsg("璇ラ棶棰樹笂鎶ュ凡鍥炲锛岃鍕块噸澶嶅洖澶�");
+        }
         String result = issueSv.replyReport(po);
         if(!result.equals("sucess")) {
             return BaseResponseUtils.buildErrorMsg(result);

--
Gitblit v1.8.0