维修统计

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/DetectStatisticService.java

@@ -50,6 +50,6 @@ public interface DetectStatisticService {
      * @param detectStatistics
      * @return
      */
-    List<DetectStatistics> getDetectAllByConfigIdList(DetectStatistics detectStatistics)
+    List<DetectStatistics> getDetectAllByConfigIdList(DetectStatistics detectStatistics);
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/detectStatisticMapper.xml

@@ -167,8 +167,11 @@
             <if test="configId != null ">
                 AND  cdi.item_config_id = #{configId}
             </if >
-            AND	t.detect_create_time > '2019-09-02 00:00:00'
-            AND t.detect_create_time < '2019-09-04 00:00:00'
+         <!--   <if test="configId != null ">
+                AND	t.detect_create_time 大于 '2019-09-02 00:00:00'
+                AND t.detect_create_time 小于 '2019-09-04 00:00:00'
+            </if >-->
+
         </where>
             GROUP BY t.detect_production,date_format(t.detect_create_time, '%Y-%m-%d')
         ) xx

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,13 +1,13 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=watero_rst
-jdbc.password=watero_RST
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=watero_rst
+#jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=rst_test
+jdbc.password=RST_test
 
 #pool settings
 jdbc.pool.init=1