Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-28 22b9c3b8ff361f8054c4041b9966d79cc8ba2214

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java

@@ -40,6 +40,11 @@
    private String clientName;

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

    /**
     * 开阀IC卡编号
     */
    private String openIcNum;

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml

@@ -525,7 +525,7 @@
               oh.cl_total_amount      AS closeTotalAmount
        FROM rm_open_close_valve_history oh
        LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
        LEFT JOIN ba_client cl ON cl.id = oh.client_id
        LEFT JOIN se_client cl ON cl.id = oh.client_id
        <where>
            <if test="intakeId != null and intakeId > 0">
                AND oh.intake_id = #{intakeId}
@@ -546,7 +546,7 @@
                AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
            </if>
        </where>
        ORDER BY oh.op_dt DESC
        ORDER BY oh.id DESC
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}

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

@@ -52,16 +52,7 @@
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params);
@@ -81,16 +72,7 @@
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params);
@@ -110,37 +92,7 @@
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
        String timeStart_open = qo.getTimeStart_open();
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null && timeStart_open != "") {
            timeStart_open = timeStart_open + " 00:00:00";
        } else {
            timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStart_open(timeStart_open);

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

        String timeStart_close = qo.getTimeStart_close();
        String timeStop_close = qo.getTimeStop_close();
        if(timeStart_close != null && timeStart_close != "") {
            timeStart_close = timeStart_close + " 00:00:00";
        } else {
            timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStart_close(timeStart_close);

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

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
@@ -167,27 +119,7 @@
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) {
        String timeStart_open = qo.getTimeStart_open();
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null) {
            timeStart_open = timeStart_open + " 00:00:00";
            qo.setTimeStart_open(timeStart_open);
        }
        if(timeStop_open != null) {
            timeStop_open = timeStop_open + " 23:59:59";
            qo.setTimeStop_open(timeStop_open);
        }

        String timeStart_close = qo.getTimeStart_close();
        String timeStop_close = qo.getTimeStop_close();
        if(timeStart_close != null) {
            timeStart_close = timeStart_close + " 00:00:00";
            qo.setTimeStart_close(timeStart_close);
        }
        if(timeStop_close != null) {
            timeStop_close = timeStop_close + " 23:59:59";
            qo.setTimeStop_close(timeStop_close);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params);
@@ -214,16 +146,7 @@
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params);
@@ -243,16 +166,7 @@
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params);
@@ -272,16 +186,7 @@
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params);
@@ -301,16 +206,7 @@
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWorkReportLastMapper.getWorkReportsCount_last(params);

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

@@ -42,4 +42,14 @@
     * 查询结束日期
     */
    private String timeStop;


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

 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
@@ -56,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";
        }

    }


}