修改bug

liurunyu

2025-08-21 9ba987e9232b71cefbb800114dd09985d7fef888

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

New file
@@ -0,0 +1,109 @@
package com.dy.pipIrrRemote.report.qo;

import com.dy.common.webUtil.QueryConditionVo;
import lombok.*;

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

/**
 * @author ZhuBaoMin
 * @date 2024-07-24 16:25
 * @LastEditTime 2024-07-24 16:25
 * @Description 开关阀报查询对象
 */

@Data
@EqualsAndHashCode(callSuper = false)
@ToString(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class OpenCloseValveQO extends QueryConditionVo {
    /**
     * 取水口ID，最新记录跳转历史记录时使用
     */
    private Long intakeId;

    /**
     * 取水口编号
     */
    private String intakeNum;

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

    /**
     * 阀控器地址
     */
    private String rtuAddr;

    /**
     * 查询开始日期_开阀
     */
    private String timeStart_open;

    /**
     * 查询结束日期_开阀
     */
    private String timeStop_open;

    /**
     * 查询开始日期_关阀
     */
    private String timeStart_close;

    /**
     * 查询结束日期_关阀
     */
    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";
        }

    }


}