修改代码

pz-admin/src/main/java/com/pz/web/controller/system/DataViewController.java

@@ -3,9 +3,12 @@ package com.pz.web.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
+import com.pz.common.core.domain.dto.RoleDTO;
+import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.system.domain.bo.DbghOrderBo;
 import com.pz.system.domain.bo.DbghOrderBo;
 import com.pz.system.domain.bo.OrderColumnarBo;
 import com.pz.system.domain.bo.OrderColumnarBo;
@@ -117,8 +120,6 @@ public class DataViewController extends BaseController {
         return R.ok(dataViewVo);
         return R.ok(dataViewVo);
     }
     }
 
 
-    private final TotalOrderMapper totalOrderMapper;
-
     /**
     /**
      * 数据总览柱状图
      * 数据总览柱状图
      */
      */

pz-system/src/main/java/com/pz/system/mapper/TotalOrderMapper.java

@@ -68,7 +68,7 @@ public interface TotalOrderMapper extends BaseMapperPlus<TotalOrderMapper, Total
 
 
     /**
     /**
      * 数据总览
      * 数据总览
-     * @param type
+     * @param time
      * @return
      * @return
      */
      */
     List<OrderColumnarVo> findOrderColumnarVoList(@Param("time") String time);
     List<OrderColumnarVo> findOrderColumnarVoList(@Param("time") String time);

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -1245,13 +1245,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         List<OrderLineVo> list = new ArrayList<>();
         List<OrderLineVo> list = new ArrayList<>();
         List<String> recentDates;
         List<String> recentDates;
         switch (bo.getType()) {
         switch (bo.getType()) {
+            case 0:
+                recentDates = DateUtils.getRecentDates(6);
+                break;
             case 1:
             case 1:
-                recentDates = DateUtils.getRecentDates(7);
+                recentDates = DateUtils.getRecentDates(29);
                 break;
                 break;
             case 2:
             case 2:
-                recentDates = DateUtils.getRecentDates(30);
-                break;
-            case 3:
                 recentDates = DateUtils.getDateRange(bo.getStartTime(), bo.getEndTime());
                 recentDates = DateUtils.getDateRange(bo.getStartTime(), bo.getEndTime());
                 break;
                 break;
             default:
             default:

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

@@ -126,17 +126,6 @@
                  LEFT JOIN total_order t ON t.business_id = b.id
                  LEFT JOIN total_order t ON t.business_id = b.id
             AND t.`status` = 2
             AND t.`status` = 2
             AND DATE (t.create_time) = DATE (#{time})
             AND DATE (t.create_time) = DATE (#{time})
-        LEFT JOIN total_order t ON t.business_id = b.id
-        AND t.`status` = 2
-        <if test="type == 1">
-            AND DATE(t.finish_time) = CURDATE()
-        </if>
-        <if test="type == 2">
-            AND DATE(t.finish_time) BETWEEN DATE_SUB(CURDATE(), INTERVAL 6 DAY) AND CURDATE()
-        </if>
-        <if test="type == 3">
-            AND DATE(t.finish_time) BETWEEN DATE_SUB(CURDATE(), INTERVAL 29 DAY) AND CURDATE()
-        </if>
         GROUP BY b.id;
         GROUP BY b.id;
     </select>
     </select>
 </mapper>
 </mapper>