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

guoshilong

2024-01-31 982bc25185dada2373603699ae412b4631b7e08c

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

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

@@ -287,10 +287,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 ,
        (
@@ -302,10 +302,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 ,
        (
@@ -317,10 +317,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 ,
        (