Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-01-31 8973b33f6f0230738c88060be355f04b937bd537

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -218,10 +218,10 @@
                                     where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
                                       and spt.is_deleted = 0
                                <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
                                    AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
                                    AND spt.start_time &gt;= #{patrolTaskReport.startTime}
                                </if>
                                <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
                                    AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
                                    AND spt.start_time &lt;= #{patrolTaskReport.endTime}
                                </if>
                                 ) need ,
                                 (
@@ -233,10 +233,10 @@
                                     where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
                                       and spt.is_deleted = 0 and spt.state = 3
                                    <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
                                        AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
                                        AND spt.start_time &gt;= #{patrolTaskReport.startTime}
                                    </if>
                                    <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
                                        AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
                                        AND spt.start_time &lt;= #{patrolTaskReport.endTime}
                                    </if>
                                 ) finish ,
                                 (
@@ -248,10 +248,10 @@
                                     where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
                                       and spt.is_deleted = 0 and (spt.state = 1 or spt.state = 2)
                                <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
                                    AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
                                    AND spt.start_time &gt;= #{patrolTaskReport.startTime}
                                </if>
                                <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
                                    AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
                                    AND spt.start_time &lt;= #{patrolTaskReport.endTime}
                                </if>
                                 ) todo ,
                                 (
@@ -362,10 +362,10 @@
        where arb."guid" = spt.project_id
        and spt.is_deleted = 0
        <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
        </if>
        <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
        </if>
        ) need,
        (
@@ -373,10 +373,10 @@
        where arb."guid" = spt.project_id
        and spt.is_deleted = 0 and spt.state = 3
        <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
        </if>
        <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
        </if>
        ) finish,
        (
@@ -384,10 +384,10 @@
        where arb."guid" = spt.project_id
        and spt.is_deleted = 0 and (spt.state = 1 or spt.state =2)
        <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
        </if>
        <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
        </if>
        ) todo
        FROM SJZT_MD."att_res_base" arb
@@ -475,10 +475,10 @@
            AND arb."name" LIKE CONCAT('%',#{patrolTaskReport.reservoirName},'%')
        </if>
        <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
            AND DATE_FORMAT(t.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
            AND t.start_time &gt;= #{patrolTaskReport.startTime}
        </if>
        <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
            AND DATE_FORMAT(t.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
            AND t.start_time &lt;= #{patrolTaskReport.endTime}
        </if>
        <if test="patrolTaskReport.reservoirId !=null and patrolTaskReport.reservoirId !=''">
            AND arb."guid" =  #{patrolTaskReport.reservoirId}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskReport.java

@@ -16,7 +16,7 @@
    /**
     * 行政区code
     */
    private String adCode;
    private Long adCode;

    /**
     * 行政区名