Merge remote-tracking branch 'origin/dev' into dev

jeecg-module-system/src/main/java/org/jeecg/modules/statisticAnalysis/mapper/xml/StatisticAnalysisMapper.xml

@@ -14,14 +14,8 @@
               ON t1.movement_master_id = t2.id
               WHERE
                   t1.project_name = '总计'
-                AND t2.check_time >= STR_TO_DATE( CONCAT( #{year}
-                  , '-01-01' )
-                  , '%Y-%m-%d' )
-                AND t2.check_time
-               < DATE_ADD( STR_TO_DATE(CONCAT(#{year}
-                  , '-01-01')
-                  , '%Y-%m-%d')
-                  , INTERVAL 1 YEAR)) t
+                AND t2.check_time >= STR_TO_DATE(CONCAT( #{year},'-01-01'),'%Y-%m-%d')
+                AND t2.check_time < DATE_ADD(STR_TO_DATE(CONCAT(#{year},'-01-01'),'%Y-%m-%d'),INTERVAL 1 YEAR)) t
         GROUP BY t.light_rail_id,
                  t.check_month
         ORDER BY t.check_month ASC
@@ -33,6 +27,9 @@
                COUNT(1)           AS checkNum
         FROM t_ek_rail_wear_record t1
         INNER JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
+        WHERE
+             t2.check_time >= STR_TO_DATE(CONCAT( #{startMonth},'-01'),'%Y-%m-%d')
+            AND t2.check_time < DATE_ADD(STR_TO_DATE(CONCAT(#{endMonth}, '-01'), '%Y-%m-%d'), INTERVAL 1 MONTH)
         GROUP BY t2.light_rail_name,
                  t1.damage_type,
                  t1.damage_degree

jeecg-module-system/src/main/resources/application-uat.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.94.207.62:3306/hzgw_uat?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://47.94.207.62:3306/hzgw_uat1?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
           driver-class-name: com.mysql.cj.jdbc.Driver