Quellcode durchsuchen

销售订单报表

liuchaohui vor 3 Jahren
Ursprung
Commit
34dde368a1

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/SoSoDetailsMapper.xml

@@ -32,7 +32,7 @@
         left join UFDATA_901_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         left join UFDATA_901_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
         <if test="map.startYearMonth!=null and map.startYearMonth!='' and map.endYearMonth!=null and map.endYearMonth!=''">
             AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{map.startYearMonth}
             AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{map.endYearMonth}
@@ -76,7 +76,7 @@
         left join UFDATA_902_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         left join UFDATA_902_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
             <if test="map.startYearMonth!=null and map.startYearMonth!='' and map.endYearMonth!=null and map.endYearMonth!=''">
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{map.startYearMonth}
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{map.endYearMonth}
@@ -120,7 +120,7 @@
         left join UFDATA_903_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         left join UFDATA_903_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
             <if test="map.startYearMonth!=null and map.startYearMonth!='' and map.endYearMonth!=null and map.endYearMonth!=''">
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{map.startYearMonth}
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{map.endYearMonth}
@@ -174,7 +174,7 @@
             left join UFDATA_901_2021.dbo.Department de on ss.cDepCode=de.cDepCode
             left join UFDATA_901_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
             <where>
-                (ss.iStatus = 1 or ss.iStatus = 0 )
+                ss.cVerifier is not null
             <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}
@@ -215,7 +215,7 @@
             left join UFDATA_902_2021.dbo.Department de on ss.cDepCode=de.cDepCode
             left join UFDATA_902_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
             <where>
-                (ss.iStatus = 1 or ss.iStatus = 0 )
+                ss.cVerifier is not null
                 <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
                     AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
                     AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}
@@ -256,7 +256,7 @@
             left join UFDATA_903_2021.dbo.Department de on ss.cDepCode=de.cDepCode
             left join UFDATA_903_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
             <where>
-                (ss.iStatus = 1 or ss.iStatus = 0 )
+                ss.cVerifier is not null
                 <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
                     AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
                     AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}
@@ -305,7 +305,7 @@
         left join UFDATA_901_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         left join UFDATA_901_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
         <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
             AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
             AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}
@@ -346,7 +346,7 @@
         left join UFDATA_902_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         left join UFDATA_902_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
             <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}
@@ -387,7 +387,7 @@
         left join UFDATA_903_2021.dbo.Customer cc on ss.cCusCode = cc.cCusCode
         left join UFDATA_903_2021.dbo.Department de on ss.cDepCode=de.cDepCode
         <where>
-            (ss.iStatus = 1 or ss.iStatus = 0 )
+            ss.cVerifier is not null
             <if test="startYearMonth!=null and startYearMonth!='' and endYearMonth!=null and endYearMonth!=''">
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ >= ]]> #{startYearMonth}
                 AND CONVERT ( CHAR ( 7 ), ssd.dPreDate, 120 ) <![CDATA[ <= ]]> #{endYearMonth}