Jelajahi Sumber

Merge branch 'V2.0.1' into test

zhaoxian 3 tahun lalu
induk
melakukan
f5d08c9290

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/ManagerSaleValueMapper.java

@@ -71,10 +71,10 @@ public interface ManagerSaleValueMapper extends BaseMapper<ManagerSaleValue> {
 
     Long queryKsHourProjectTopTotal(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<JSONObject> queryKsHourProjectTop(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("days") Long days);
+    List<JSONObject> queryKsHourProjectTop(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("days") Long days, @Param("hour") Integer hour );
 
     Long queryTtHourProjectTopTotal(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<JSONObject> queryTtHourProjectTop(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("days") Long days);
+    List<JSONObject> queryTtHourProjectTop(@Param("projectIds") List<Long> projectIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("days") Long days, @Param("hour") Integer hour );
 
 }

+ 5 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml

@@ -480,6 +480,7 @@
         </foreach>
         AND stat_date >= DATE_FORMAT(DATE_ADD(#{startTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
         AND stat_date &lt;= DATE_FORMAT(DATE_ADD(#{endTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
+        AND hour &lt;= #{hour}
         GROUP BY project_id ) t3 ON
         t1.project_id = t3.project_id
         WHERE
@@ -490,6 +491,7 @@
         </foreach>
         AND stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND stat_date &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
+        AND hour &lt;= #{hour}
         GROUP BY
         t1.project_id
         ORDER BY
@@ -524,6 +526,7 @@
         </foreach>
         AND stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
+        AND
         GROUP BY project_id
         )t2 ON t1.project_id = t2.project_id
         LEFT JOIN (
@@ -536,6 +539,7 @@
         </foreach>
         AND stat_datetime >= DATE_FORMAT(DATE_ADD(#{startTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT(DATE_ADD(#{endTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
+        AND hour &lt;= #{hour}
         GROUP BY project_id ) t3 ON
         t1.project_id = t3.project_id
         WHERE
@@ -546,6 +550,7 @@
         </foreach>
         AND t1.stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND t1.stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
+        AND hour &lt;= #{hour}
         GROUP BY
         t1.project_id
         ORDER BY

+ 4 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -353,24 +353,26 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
 
     private PageInfo getProjectDailyCharges(List<Long> projectIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
         Long days = 1L;
+        Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
         if (endTime == null) {
             endTime = startTime;
         } else {
             days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
+            hour = 23;
         }
 
         //1 头条
         if ("1".equals(mediaId)) {
             Long total = baseMapper.queryTtHourProjectTopTotal(projectIds, startTime, endTime);
             PageHelper.startPage(pageNo, pageSize, false);
-            List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days);
+            List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days, hour);
             PageInfo pageInfo = new PageInfo(list);
             pageInfo.setTotal(total);
             return pageInfo;
         } else if ("2".equals(mediaId)) {
             Long total = baseMapper.queryKsHourProjectTopTotal(projectIds, startTime, endTime);
             PageHelper.startPage(pageNo, pageSize, false);
-            List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days);
+            List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days, hour);
             PageInfo pageInfo = new PageInfo(list);
             pageInfo.setTotal(total);
             return pageInfo;