From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 22:07:02 +0800
Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性,都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ); 2、工作报中数据查询SQL中增加clientAddr农户地址字段。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index da9d08a..9cbb39f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -228,16 +228,7 @@
      */
     public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
         // 瀹屽杽鏌ヨ璧锋鏃堕棿
-        String timeStart = query.getTimeStart();
-        String timeStop = query.getTimeStop();
-        if(timeStart != null) {
-            timeStart = timeStart + " 00:00:00";
-            query.setTimeStart(timeStart);
-        }
-        if(timeStop != null) {
-            timeStop = timeStop + " 23:59:59";
-            query.setTimeStop(timeStop);
-        }
+        query.completionTime();
 
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(query);
 

--
Gitblit v1.8.0