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-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index 207d0d9..28edc55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -38,8 +38,13 @@
     @ColumnWidth(15)
     private String divideName;
 
-    @Schema(title = "鎵�灞炵墖鍖�")
-    @ExcelProperty("鎵�灞炵墖鍖�")
+    @Schema(title = "鎵�灞炵墖鍖篒D")
+    @ExcelProperty("鎵�灞炵墖鍖篒D")
+    @ColumnWidth(19)
+    private String blockId;
+
+    @Schema(title = "鎵�灞炵墖鍖哄悕绉�")
+    @ExcelProperty("鎵�灞炵墖鍖哄悕绉�")
     @ColumnWidth(15)
     private String blockName;
 
@@ -58,9 +63,39 @@
     @ColumnWidth(25)
     private String address;
 
+    @Schema(title = "瑕嗙洊鏉�")
+    @ExcelProperty("瑕嗙洊鏉�")
+    @ColumnWidth(25)
+    private String villages;
+
+    @Schema(title = "瑕嗙洊闈㈢Н")
+    @ExcelProperty("瑕嗙洊闈㈢Н")
+    @ColumnWidth(25)
+    private String area;
+
+    @Schema(title = "缁忓害")
+    @ExcelProperty("缁忓害")
+    @ColumnWidth(25)
+    private String lng;
+
+    @Schema(title = "绾害")
+    @ExcelProperty("绾害")
+    @ColumnWidth(25)
+    private String lat;
+
+    @Schema(title = "鎿嶄綔浜�")
+    @ExcelProperty("鎿嶄綔浜�")
+    @ColumnWidth(25)
+    private String operator;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(title = "鎿嶄綔鏃堕棿")
     @ExcelIgnore
     private Date operateDt;
+
+    @Schema(title = "澶囨敞")
+    @ExcelProperty("澶囨敞")
+    @ColumnWidth(250)
+    private String remarks;
 }

--
Gitblit v1.8.0