矿山域-任务卡片

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwCarOrderMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.car.entity.KwCarOrder;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -11,7 +12,7 @@ import java.util.Map;
 @Mapper
 public interface KwCarOrderMapper extends BaseMapper<KwCarOrder> {
 
-    List<Map<String, Object>> countByStatus();
+    List<Map<String, Object>> countByStatus(@Param("tenant") String tenant);
 
     @MapKey("waybillCount")
     int finishWaybillCount(String orderId);

business-modules/business-car-transport/src/main/java/com/sckw/car/service/CarTransportListService.java

@@ -221,7 +221,8 @@ public class CarTransportListService {
 
     public List<Map<String, Object>> getStatusCountListInSingleQuery() {
         // 查询每个状态的计数
-        List<Map<String, Object>> statusCounts = kwCarOrderMapper.countByStatus();
+        String tenant = TenantUtil.getTenant();
+        List<Map<String, Object>> statusCounts = kwCarOrderMapper.countByStatus(tenant);
 
         // 将查询结果转换为所需的格式
         List<OrderCarStatusEnum> sortedEnums = OrderCarStatusEnum.getSortList();

business-modules/business-car-transport/src/main/resources/mapper/KwCarOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.car.mapper.KwCarOrderMapper">
     <select id="countByStatus" resultType="java.util.Map">
-        SELECT `status`, COUNT(*) AS count FROM kw_order GROUP BY `status`
+        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0  and tenant_id = #{tenant} GROUP BY `status`
     </select>
     <select id="finishWaybillCount" resultType="java.lang.Integer">
         select count(id) from kw_waybill_order where order_id = #{orderId} and status = 5 and del_flag = 0

business-modules/business-usual-transport/src/main/resources/mapper/OrderMapper.xml

@@ -176,7 +176,7 @@
     </select>
 
     <select id="countByStatus" resultType="java.util.Map">
-        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0 GROUP BY `status` and tenant_id = #{tenant}
+        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0  and tenant_id = #{tenant} GROUP BY `status`
     </select>
     <select id="finishWaybillCount" resultType="Integer">
         select COALESCE(count(id), 0) from kw_waybill_order where order_id = #{#orderId} and status = 5 and del_flag = 0