双规小程序接口

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -559,7 +559,7 @@
         SUM ( CASE WHEN pt.finish_status = '3' THEN ( CASE WHEN pl.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END )  timeOut,
         (
         CASE
-        WHEN '2' = #{type} THEN ( (1+date_part('week',pt.begin_time) - date_part('week', pt.begin_time - ((date_part('day',pt.begin_time)))::interval)) )
+        WHEN '2' = #{type} THEN ( 1+( date_part( 'week', pt.begin_time ) ) )
         ELSE  ( CASE WHEN '1' = #{type} THEN  DATE_FORMAT ( pt.check_date, '%Y-%m-%d' ) ELSE ( substr( DATE_FORMAT ( pt.check_date,  '%Y-%m' ) , 6)) END ) END
         ) stime,
         pl.plan_type as type
@@ -574,7 +574,7 @@
         <!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
         <if test="orgCode!=null">AND pt.org_code  LIKE concat(#{orgCode}::text,'%') </if>
         GROUP BY stime
-        order by stime desc
+        order by stime ASC
     </select>