yumeng %!s(int64=4) %!d(string=hai) anos
pai
achega
6f49d0b900

+ 15 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MaterialReportOverViewMapper.xml

@@ -88,7 +88,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt;= #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
     </select>
     </select>
 
 
@@ -106,7 +106,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_date >= #{startDate}
+        AND stat_date &gt;= #{startDate}
         AND stat_date &lt;= #{endDate}
         AND stat_date &lt;= #{endDate}
     </select>
     </select>
 
 
@@ -122,7 +122,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND DATE_FORMAT(create_time, '%Y-%m-%d')>= #{startDate}
+        AND DATE_FORMAT(create_time, '%Y-%m-%d')&gt;= #{startDate}
         AND DATE_FORMAT(create_time, '%Y-%m-%d')&lt;= #{endDate}
         AND DATE_FORMAT(create_time, '%Y-%m-%d')&lt;= #{endDate}
     </select>
     </select>
 
 
@@ -155,7 +155,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt;= #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
         group by stat_datetime
         group by stat_datetime
         order by stat_datetime
         order by stat_datetime
@@ -176,7 +176,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt; #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
         group by DATE_FORMAT(stat_datetime, '%Y-%m')
         group by DATE_FORMAT(stat_datetime, '%Y-%m')
         order by stat_datetime asc
         order by stat_datetime asc
@@ -197,7 +197,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_date >= #{startDate}
+        AND stat_date &gt;= #{startDate}
         AND stat_date &lt;= #{endDate}
         AND stat_date &lt;= #{endDate}
         group by stat_date
         group by stat_date
         order by stat_date
         order by stat_date
@@ -218,7 +218,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_date >= #{startDate}
+        AND stat_date &gt; #{startDate}
         AND stat_date &lt;= #{endDate}
         AND stat_date &lt;= #{endDate}
         group by DATE_FORMAT(stat_date, '%Y-%m')
         group by DATE_FORMAT(stat_date, '%Y-%m')
         order by stat_date
         order by stat_date
@@ -242,7 +242,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt; #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
         AND md5!=''
         AND md5!=''
         GROUP BY md5
         GROUP BY md5
@@ -274,7 +274,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt;= #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
         GROUP BY t1.md5
         GROUP BY t1.md5
         ORDER BY ${target} ${order}
         ORDER BY ${target} ${order}
@@ -298,7 +298,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND stat_datetime >= #{startDate}
+        AND stat_datetime &gt;= #{startDate}
         AND stat_datetime &lt;= #{endDate}
         AND stat_datetime &lt;= #{endDate}
         GROUP BY t1.md5) t
         GROUP BY t1.md5) t
     </select>
     </select>
@@ -323,7 +323,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND t1.stat_date >= #{startDate}
+        AND t1.stat_date &gt;= #{startDate}
         AND t1.stat_date &lt;= #{endDate}
         AND t1.stat_date &lt;= #{endDate}
         GROUP BY t1.signature
         GROUP BY t1.signature
         ORDER BY charge desc
         ORDER BY charge desc
@@ -357,7 +357,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND t1.stat_date >= #{startDate}
+        AND t1.stat_date &gt;= #{startDate}
         AND t1.stat_date &lt;= #{endDate}
         AND t1.stat_date &lt;= #{endDate}
         GROUP BY t1.signature
         GROUP BY t1.signature
         ) t1
         ) t1
@@ -388,7 +388,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         </if>
         </if>
-        AND t1.stat_date >= #{startDate}
+        AND t1.stat_date &gt;= #{startDate}
         AND t1.stat_date &lt;= #{endDate}
         AND t1.stat_date &lt;= #{endDate}
         GROUP BY t1.signature
         GROUP BY t1.signature
         ) t1
         ) t1
@@ -418,7 +418,7 @@
         FROM
         FROM
         etl_design_daily_report,(SELECT @i:=0) i
         etl_design_daily_report,(SELECT @i:=0) i
         where
         where
-        stat_date >= #{startDate}
+        stat_date &gt;= #{startDate}
         AND stat_date &lt;= #{endDate}
         AND stat_date &lt;= #{endDate}
         AND user_id IN
         AND user_id IN
         <foreach collection="userIds" item="item" separator=","
         <foreach collection="userIds" item="item" separator=","
@@ -441,7 +441,7 @@
         FROM
         FROM
         etl_design_daily_report
         etl_design_daily_report
         where
         where
-        stat_date >= #{startDate}
+        stat_date &gt;= #{startDate}
         AND stat_date &lt;= #{endDate}
         AND stat_date &lt;= #{endDate}
         AND user_id IN
         AND user_id IN
         <foreach collection="userIds" item="item" separator=","
         <foreach collection="userIds" item="item" separator=","