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/voRm/VoManure.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
index ceaac69..7d82e77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,16 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "manureId", "manureName", "dt", "alarm",
+ "stirRunning1", "stirRunning2", "stirRunning3", "stirRunning4",
+ "injectRunning", "irrRunning",
+ "manureFlow", "manureTime", "stirTime",
+ "stirDuration", "injectDuration",
+ "alarmStr",
+ "stirRunning1Str", "stirRunning2Str", "stirRunning3Str", "stirRunning4Str",
+ "injectRunningStr", "irrRunningStr"
+})
public class VoManure {
public static final long serialVersionUID = 202506251634001L;
@@ -34,7 +45,7 @@
* 姘磋偉鏈哄悕绉�
*/
@Schema(description = "姘磋偉鏈哄悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long manureName;
+ public String manureName;
/**
@@ -117,4 +128,98 @@
@Schema(description = "娉ㄨ偉璁惧畾鏃堕棿(绉�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Integer injectDuration;
+
+ @Schema(hidden = true)
+ @JSONField(name = "alarmStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getAlarmStr() {
+ String str = "" ;
+ if(this.alarm != null){
+ if(this.alarm == 1){
+ str = "鏁呴殰" ;
+ }else if(this.alarm == 0){
+ str = "姝ｅ父" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "stirRunning1Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getStirRunning1Str() {
+ String str = "" ;
+ if(this.stirRunning1 != null){
+ if(this.stirRunning1 == 1){
+ str = "鍚姩" ;
+ }else if(this.stirRunning1 == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "stirRunning2Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getStirRunning2Str() {
+ String str = "" ;
+ if(this.stirRunning2 != null){
+ if(this.stirRunning2 == 1){
+ str = "鍚姩" ;
+ }else if(this.stirRunning2 == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "stirRunning3Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getStirRunning3Str() {
+ String str = "" ;
+ if(this.stirRunning3 != null){
+ if(this.stirRunning3 == 1){
+ str = "鍚姩" ;
+ }else if(this.stirRunning3 == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "stirRunning4Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getStirRunning4Str() {
+ String str = "" ;
+ if(this.stirRunning4 != null){
+ if(this.stirRunning4 == 1){
+ str = "鍚姩" ;
+ }else if(this.stirRunning4 == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "injectRunningStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getInjectRunningStr() {
+ String str = "" ;
+ if(this.injectRunning != null){
+ if(this.injectRunning == 1){
+ str = "鍚姩" ;
+ }else if(this.injectRunning == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+ @Schema(hidden = true)
+ @JSONField(name = "irrRunningStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+ public String getIrrRunningStr() {
+ String str = "" ;
+ if(this.irrRunning != null){
+ if(this.irrRunning == 1){
+ str = "鍚姩" ;
+ }else if(this.irrRunning == 0){
+ str = "鍋滄" ;
+ }
+ }
+ return str ;
+ }
+
+
}
--
Gitblit v1.8.0