bug: 统计累计 周 月是对总量统计

720yun_fd_manage/gis_application/src/main/resources/application-sit.properties

@@ -39,7 +39,7 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 #spring.redis.password=
 
 # v4-sit-4dkankan
-# \u5185\u7F51ip:172.18.156.39
+# \u5185\u7F51ip:172.18.156.39 -> \u516C\u7F51ip:120.24.144.164
 spring.redis.host=172.18.156.39
 spring.redis.password=bgh0cae240
 

720yun_fd_manage/gis_application/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 server.port=8001
 server.servlet.context-path=/qjkankan
 
-spring.profiles.active=locPro
-#spring.profiles.active=locSit
+#spring.profiles.active=locPro
+spring.profiles.active=locSit
 #spring.profiles.active=locSitAws
 
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/ReportServiceImpl.java

@@ -116,7 +116,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String weekTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-        builder.append(" select groupKey, sum(total) as count,type from (");
+//        builder.append(" select groupKey, sum(total) as count,type from (");
+        builder.append(" select groupKey, total as count,type from (");
         builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, total," +
                 " type from tb_report where is_delete=0 ");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
@@ -134,7 +135,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String monthTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-        builder.append(" select groupKey, sum(total) as count,type from (");
+//        builder.append(" select groupKey, sum(total) as count,type from (");
+        builder.append(" select groupKey, total as count,type from (");
         builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, total,type from tb_report where is_delete=0");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");
@@ -168,7 +170,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String weekWorkTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
+//        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
+        builder.append(" select groupKey, mix,age, pano,type from (");
         builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, " +
                 "mix, pano, age,type from tb_report where is_delete=0 ");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
@@ -186,7 +189,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String monthWorkTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
+//        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
+        builder.append(" select groupKey, mix,age, pano,type from (");
         builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, mix,age, pano,type from tb_report where is_delete=0");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");