工作票统计sql修改

src/main/resources/mapper/ticket/WorkticketMapper.xml

@@ -291,12 +291,20 @@
         LEFT JOIN WINDFARM f ON  w.WORKDEPT = f.WFNAME
         <where>
         <if test="st !=null and et !=null">
-            and ((w.startdate >= #{st}  and w.startdate  &lt;= #{et})
-            and  (w.enddate >= #{st}  and w.enddate  &lt;= #{et}
-            and (w.enddate &lt;= CONVERT(varchar,GETDATE(),20) or w.newdate &lt;= CONVERT(varchar,GETDATE(),20))
-            or  (w.finaltime >= #{st}  and w.finaltime  &lt;= #{et}))
-        </if>
 
+            and ((w.finaltime >= #{st} and w.finaltime &lt;= #{et})
+            or (w.startdate >= #{st} and w.startdate &lt;= #{et}
+            and w.enddate >= #{st} and w.enddate &lt;= #{et}
+            AND w.enddate &lt;= CONVERT ( VARCHAR, GETDATE ( ), 20 )
+            and  w.finaltime is  null
+            and  w.newdate is  null)
+            or (  w.newdate IS not null
+            and w.startdate >= #{st} and w.startdate &lt;= #{et}
+            AND w.enddate >= #{st} and w.enddate &lt;= #{et}
+            AND w.newdate >= #{st} and w.newdate &lt;= #{et}
+            and w.newdate &lt;= CONVERT ( VARCHAR, GETDATE ( ), 20 )))
+
+        </if>
 
         <if test="'' != type and null != type">
             and  w.wtickettype = #{type}
@@ -307,11 +315,12 @@
         </if>
 
         </where>
-        ))
-        select  *  from cte1
-        where ticketnum not in (select c.ticketnum from cte1 c where   c.newdate is not null and c.finaltime is null) ORDER BY ticketnum
+
+        )
+        select  *  from cte1 order by ticketnum,startdate
 
     </select>
+
     <select id="selectWorkticketPer" resultType="java.util.Map">
         WITH cte1 AS (
         SELECT
@@ -332,10 +341,18 @@
         <where>
             <if test="st !=null and et !=null">
 
-                and ((w.startdate >= #{st}  and w.startdate  &lt;= #{et})
-                and  (w.enddate >= #{st}  and w.enddate  &lt;= #{et})
-                AND (w.enddate &lt;= CONVERT(varchar,GETDATE(),20) or w.newdate &lt;= CONVERT(varchar,GETDATE(),20))
-                or  (w.finaltime >= #{st}  and w.finaltime  &lt;= #{et}))
+                and ((w.finaltime >= #{st} and w.finaltime &lt;= #{et})
+                or (w.startdate >= #{st} and w.startdate &lt;= #{et}
+                and w.enddate >= #{st} and w.enddate &lt;= #{et}
+                AND w.enddate &lt;= CONVERT ( VARCHAR, GETDATE ( ), 20 )
+                and  w.finaltime is  null
+                and  w.newdate is  null)
+                or (  w.newdate IS not null
+                and w.startdate >= #{st} and w.startdate &lt;= #{et}
+                AND w.enddate >= #{st} and w.enddate &lt;= #{et}
+                AND w.newdate >= #{st} and w.newdate &lt;= #{et}
+                and w.newdate &lt;= CONVERT ( VARCHAR, GETDATE ( ), 20 )))
+
             </if>
 
 
@@ -363,7 +380,7 @@
         SUM(CASE WHEN tag = 1 THEN 1 ELSE 0 END) AS failnum,
         ROUND(ISNULL(COALESCE(CAST(SUM(CASE WHEN tag = 0 THEN 1 ELSE 0 END) AS FLOAT), 0)/NULLIF(count(tag) ,0),0), 2)*100 per
         from cte1
-        where ticketnum not in (select c.ticketnum from cte1 c where   c.newdate is not null and c.finaltime is null)
+