1、农户用水量日统计中增加属性“次数”； 2、临时任务中增加“转存农户日取水量，由纵型改为横型”

liurunyu

2024-12-28 fd17cc4990f991bdd69ad4f7f0b6e288b1d1fc47

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java

@@ -3,6 +3,9 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.*;

import java.time.LocalDate;
import java.time.LocalDateTime;

/**
 * @author ZhuBaoMin
 * @date 2024-07-24 16:25
@@ -28,6 +31,11 @@
    private String intakeNum;

    /**
     * 农户姓名
     */
    private String clientName;

    /**
     * 阀控器地址
     */
    private String rtuAddr;
@@ -51,4 +59,51 @@
     * 查询结束日期_关阀
     */
    private String timeStop_close;


    public void completionTime(){
        if(timeStart_open != null && timeStart_open.trim().equals("")) {
            timeStart_open = timeStart_open + " 00:00:00";
        }
        if(timeStop_open != null && timeStop_open.trim().equals("")) {
            timeStop_open = timeStop_open + " 23:59:59";
        }

        if(timeStart_close != null && timeStart_close.trim().equals("")) {
            timeStart_close = timeStart_close + " 00:00:00";
        }
        if(timeStop_close != null && timeStop_close.trim().equals("")) {
            timeStop_close = timeStop_close + " 23:59:59";
        }
    }


    public void completionTimeNoEmpty(){
        if(timeStart_open != null && !timeStart_open.trim().equals("")) {
            timeStart_open = timeStart_open + " 00:00:00";
        } else {
            timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
        }

        if(timeStop_open != null && !timeStop_open.trim().equals("")) {
            timeStop_open = timeStop_open + " 23:59:59";
        }else {
            timeStop_open = LocalDate.now() + " 23:59:59";
        }

        if(timeStart_close != null && !timeStart_close.trim().equals("")) {
            timeStart_close = timeStart_close + " 00:00:00";
        } else {
            timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
        }

        if(timeStop_close != null && !timeStop_close.trim().equals("")) {
            timeStop_close = timeStop_close + " 23:59:59";
        }else {
            timeStop_close = LocalDate.now() + " 23:59:59";
        }

    }


}