修改司机修改手机号后新建用户并修改车辆预存信息，修改状态跟踪分页功能失效问题，调整状态跟踪上面固定按钮显示信息类型

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscarsController.java

@@ -55,8 +55,9 @@ public class ftmsorderbillscarsController extends BaseController {
     @GetMapping("/query")
     public Map<String, Object> query(Ftmsorderbills ftmsorderbills) {
         Map<String, Object> map = new HashMap<>();
+        Ftmsorderbills tmsorder = ftmsorderbillscarsService.judgmentFleet(ftmsorderbills);
         startPage();
-        List<Map<String, Object>> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(ftmsorderbills);
+        List<Map<String, Object>> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
         map.put("dataTable", getDataTable(list));
         map.put("buttonValue", ftmsorderbillscarsService.getButtonValue());
         return map;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/statusTracking/ftmsorderbillsfeesController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsfeesController.java

@@ -1,15 +1,11 @@
-package com.ruoyi.web.controller.fleet.statusTracking;
+package com.ruoyi.web.controller.fleet.orderPlan;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.orderPlan.service.IftmsorderbillsfeesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

ruoyi-fleet/src/main/java/com/ruoyi/basicData/mapper/FleetCarManageMapper.java

@@ -77,4 +77,11 @@ public interface FleetCarManageMapper
      * @return  结果
      */
     public int selectFleetCarManageCount(FleetCarManage fleetCarManage);
+
+    /**
+     *  根据司机id更新车辆手机号、姓名
+     * @param fleetCarManage    参数
+     * @return  结果
+     */
+    public int updateFleetCarManageByDriverId(FleetCarManage fleetCarManage);
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.basicData.service.impl;
 
+import com.ruoyi.basicData.domain.FleetCarManage;
 import com.ruoyi.basicData.domain.FleetDriverMsg;
 import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.mapper.FleetCarManageMapper;
 import com.ruoyi.basicData.mapper.FleetDriverMsgMapper;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.service.IFleetDriverMsgService;
@@ -41,15 +43,9 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     private TCorpsMapper corpsMapper;
 
     @Autowired
-    private FleetDriverMsgMapper fleetDriverMsgMapper;
-
-    @Autowired
     private SysRoleMapper roleMapper;
 
     @Autowired
-    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
-
-    @Autowired
     private SysUserMapper userMapper;
 
     @Autowired
@@ -58,6 +54,15 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     @Autowired
     private SysUserRoleMapper userRoleMapper;
 
+    @Autowired
+    private FleetDriverMsgMapper fleetDriverMsgMapper;
+
+    @Autowired
+    private FleetCarManageMapper fleetCarManageMapper;
+
+    @Autowired
+    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
+
     /**
      * 查询【司机】
      *
@@ -105,20 +110,26 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
         tCorps.setfTypename("司机");
         tCorps.setfStatus("0");
         if (null != tCorps.getfId()) {
-            updateDriverPhone(tCorps);
+//            updateDriverPhone(tCorps);
+            AjaxResult result = this.updateFleetCarManagePhone(tCorps);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
             tCorps.setUpdateTime(new Date());
             tCorps.setUpdateBy(SecurityUtils.getUsername());
             corpsMapper.updateTCorps(tCorps);
             return AjaxResult.success();
         } else {
             SysUser sysUser = new SysUser();
+            sysUser.setUserName(tCorps.getfTel());
             sysUser.setPhonenumber(tCorps.getfTel());
-            sysUser.setUserName(tCorps.getLoginAccount());
             SysUser userPhone = userMapper.checkPhoneUnique(sysUser.getPhonenumber());
-            if (userMapper.checkUserNameUnique(sysUser.getUserName()) > 1) {
-                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
-            } else if (StringUtils.isNotNull(userPhone) && "T".equals(userPhone.getRelatedNo())) {
+            if (StringUtils.isNotNull(userPhone) && "T".equals(userPhone.getRelatedNo())) {
                 return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，手机号码已存在");
+            } else if (userMapper.checkUserNameUnique(sysUser.getUserName()) > 1) {
+                return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
             }
             long userId = 0L;
             // 查询是否有用户提前关注小程序
@@ -127,9 +138,8 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
                 // 该用户提前关注小程序了
                 user.setRelatedNo("T");
                 user.setUserSystem("2");
-                user.setNickName(tCorps.getfName());
                 user.setUpdateTime(new Date());
-                user.setStatus("0");
+                user.setNickName(tCorps.getfName());
                 user.setUpdateBy(SecurityUtils.getUsername());
                 user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
                 userMapper.updateUser(user);
@@ -194,6 +204,51 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
         ftmsorderbillscarsMapper.updateftmsorderbillscarsDriverNamePhone();
     }
 
+    @Transactional
+    public AjaxResult updateFleetCarManagePhone(TCorps tCorps) {
+        TCorps corps = corpsMapper.selectTCorpsById(tCorps.getfId());
+        SysUser sysUser = userMapper.selectUserByTel(corps.getfTel());
+        if (StringUtils.isNotNull(sysUser)) {
+            SysUser user = new SysUser();
+            // 跟新用户手机号以及姓名
+            sysUser.setNickName(tCorps.getfName());
+            if (!sysUser.getPhonenumber().equals(tCorps.getfTel())) {
+                user.setUserSystem("2");
+                user.setUserType("11");
+                user.setUserName(tCorps.getfTel());
+                user.setNickName(tCorps.getfName());
+                user.setPhonenumber(tCorps.getfTel());
+                user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
+                user.setCreateTime(new Date());
+                user.setCreateBy(SecurityUtils.getUsername());
+                userMapper.insertUser(user);
+                // 查询是否存在车队 角色
+                SysRole role = roleMapper.selectRoleByName("司机");
+                if (StringUtils.isNull(role)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("未找到司机角色，请创建司机角色后提交");
+                }
+                // 创建用户与角色关联
+                List<SysUserRole> list = new ArrayList<SysUserRole>();
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setRoleId(role.getRoleId());
+                sysUserRole.setUserId(user.getUserId());
+                list.add(sysUserRole);
+                userRoleMapper.batchUserRole(list);
+            }
+            sysUser.setUpdateTime(new Date());
+            sysUser.setUpdateBy(SecurityUtils.getUsername());
+            userMapper.updateUser(sysUser);
+        }
+        FleetCarManage fleetCarManage = new FleetCarManage();
+        fleetCarManage.setDriverId(tCorps.getfId());
+        fleetCarManage.setDriverTel(tCorps.getfTel());
+        fleetCarManage.setDriverName(tCorps.getfName());
+        fleetCarManageMapper.updateFleetCarManageByDriverId(fleetCarManage);
+        return AjaxResult.success();
+    }
+
+
     /**
      * 修改【司机】
      *

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -9,7 +9,6 @@ import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
@@ -21,8 +20,8 @@ import com.ruoyi.orderManagement.finance.service.IFTmsaccbillsService;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/domain/Ftmsorderbillsfees.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillsfees.java

@@ -1,4 +1,4 @@
-package com.ruoyi.statusTracking.domain;
+package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/mapper/FtmsorderbillsfeesMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsfeesMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.statusTracking.mapper;
+package com.ruoyi.orderPlan.mapper;
 
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java

@@ -146,4 +146,11 @@ public interface IftmsorderbillscarsService {
      * @return  结果
      */
     public Map<String, Object> getButtonValue();
+
+    /**
+     *  判断当前用户是否为车队、是否是司机
+     * @param ftmsorderbills
+     * @return
+     */
+    public Ftmsorderbills judgmentFleet(Ftmsorderbills ftmsorderbills);
 }

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/service/IftmsorderbillsfeesService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsfeesService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.statusTracking.service;
+package com.ruoyi.orderPlan.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsServiceImpl.java

@@ -10,21 +10,18 @@ import com.ruoyi.basicData.mapper.FleetCarManageMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderPlan.domain.*;
 import com.ruoyi.orderPlan.mapper.*;
 import com.ruoyi.orderPlan.service.IftmsorderbillsService;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import javax.validation.constraints.Size;
-
 /**
  * 订单主Service业务层处理
  *

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -28,15 +28,13 @@ import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import javax.validation.constraints.Size;
-
 /**
  * 车队派车Service业务层处理
  *
@@ -139,13 +137,12 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
-     * 查询司机状态跟踪列表
-     *
-     * @param ftmsorderbills 条件
-     * @return 结果
+     *  判断当前用户是否为车队、是否是司机
+     * @param ftmsorderbills    条件
+     * @return  结果
      */
     @Override
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
+    public Ftmsorderbills judgmentFleet(Ftmsorderbills ftmsorderbills) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         String phonenumber = user.getPhonenumber();
         if ("11".equals(user.getUserType())) {
@@ -163,6 +160,17 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TCorps corps = tCorpsMapper.selectTCorpsByFTel(sysUser.getPhonenumber());
             ftmsorderbills.setFleetId(corps.getfId());
         }
+        return ftmsorderbills;
+    }
+
+    /**
+     * 查询司机状态跟踪列表
+     *
+     * @param ftmsorderbills 条件
+     * @return 结果
+     */
+    @Override
+    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
         return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
     }
 
@@ -334,25 +342,33 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             if (StringUtils.isNull(tmsorderbillscars.getUnLoadDate())) {
                 return AjaxResult.error("未找到还卸柜时间");
             }
-            tmsorderbillscars.setOrderStatus(60L);
+            if (tmsorderbillscars.getOrderStatus() < 80L) {
+                tmsorderbillscars.setOrderStatus(60L);
+            }
         } else if ("mdLoadDate".equals(operationType)) {
             // 装卸货提交
             if (StringUtils.isNull(tmsorderbillscars.getMdLoadDate())) {
                 return AjaxResult.error("未找到装卸货时间");
             }
-            tmsorderbillscars.setOrderStatus(50L);
+            if (tmsorderbillscars.getOrderStatus() < 60L) {
+                tmsorderbillscars.setOrderStatus(50L);
+            }
         } else if ("loadDate".equals(operationType)) {
             // 提箱提交
             if (StringUtils.isNull(tmsorderbillscars.getLoadDate())) {
                 return AjaxResult.error("未找到提箱时间");
             }
-            tmsorderbillscars.setOrderStatus(40L);
+            if (tmsorderbillscars.getOrderStatus() < 50L) {
+                tmsorderbillscars.setOrderStatus(40L);
+            }
         } else if ("acceptDate".equals(operationType)) {
             // 接单提交
             if (StringUtils.isNull(tmsorderbillscars.getAcceptDate())) {
                 return AjaxResult.error("未找到接单时间");
             }
-            tmsorderbillscars.setOrderStatus(20L);
+            if (tmsorderbillscars.getOrderStatus() < 40L) {
+                tmsorderbillscars.setOrderStatus(20L);
+            }
         }
         tmsorderbillscars.setUpdateTime(new Date());
         tmsorderbillscars.setUpdateBy(SecurityUtils.getUsername());

ruoyi-fleet/src/main/java/com/ruoyi/statusTracking/service/impl/FtmsorderbillsfeesServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.statusTracking.service.impl;
+package com.ruoyi.orderPlan.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,9 +12,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
-import com.ruoyi.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.service.IftmsorderbillsfeesService;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsplansServiceImpl.java

@@ -1,12 +1,10 @@
 package com.ruoyi.orderPlan.service.impl;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -16,8 +14,8 @@ import com.ruoyi.framework.web.service.WechatService;
 import com.ruoyi.orderPlan.domain.*;
 import com.ruoyi.orderPlan.mapper.*;
 import com.ruoyi.orderPlan.service.IftmsorderbillsplansService;
-import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
-import com.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -334,6 +334,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateFleetCarManageByDriverId" parameterType="FleetCarManage">
+        update fleet_car_manage
+        set driver_tel = #{driverTel}, driver_name = #{driverName}
+        where driver_id = #{driverId}
+    </update>
+
     <delete id="deleteFleetCarManageById" parameterType="Long">
         delete from fleet_car_manage where id = #{id}
     </delete>

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -524,11 +524,12 @@
             <if test="goodsId != null">and t.goods_id = #{goodsId}</if>
             <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
             <if test="orderStatus != null">and c.order_status = #{orderStatus}</if>
-            <if test="carStatus != null and carStatus == 'acceptDate'">and c.accept_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'loadDate'">and c.load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NULL</if>
-            <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NULL</if>
+            <if test="carStatus != null and carStatus == 'planDate'">and c.plan_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'acceptDate'">and c.accept_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'loadDate'">and c.load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NOT NULL</if>
+            <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NOT NULL</if>
             <if test="isFleet != null and isFleet == 1">
                 AND fleet.f_id = #{fleetId}
             </if>
@@ -703,20 +704,29 @@
             and create_time &lt;= #{currentDay[1]}
     </select>
 
-    <select id="getButtonValue" parameterType="ftmsorderbills" resultType="Map">
+
+    <select id="getButtonValue" resultType="Map">
+--         SELECT
+--             order_status orderStatus,
+--             COUNT( id ) cntrQty
+--         FROM
+--             F_TMSORDERBILLSCARS
+--         WHERE
+--             bill_status = 6
+--         GROUP BY
+--             order_status
         SELECT
-            COUNT( CASE WHEN c.accept_date IS NULL THEN 1 END ) AS acceptDate,
-            COUNT( CASE WHEN c.load_date IS NULL THEN 1 END ) AS loadDate,
-            COUNT( CASE WHEN c.md_load_date IS NULL THEN 1 END ) AS mdLoadDate,
-            COUNT( CASE WHEN c.un_load_date IS NULL THEN 1 END ) AS unLoadDate,
-            COUNT( CASE WHEN c.waybill_date IS NULL THEN 1 END ) AS waybillDate
+            COUNT(id) AS quantity,
+            COUNT( CASE WHEN order_status = '10' THEN 1 END ) AS planDate,
+            COUNT( CASE WHEN order_status = '20' THEN 1 END ) AS acceptDate,
+            COUNT( CASE WHEN order_status = '40' THEN 1 END ) AS loadDate,
+            COUNT( CASE WHEN order_status = '50' THEN 1 END ) AS mdLoadDate,
+            COUNT( CASE WHEN order_status = '60' THEN 1 END ) AS unLoadDate,
+            COUNT( CASE WHEN order_status = '80' THEN 1 END ) AS waybillDate
         FROM
-            F_TMSORDERBILLSCARS c
-            LEFT JOIN t_corps fleet ON fleet.f_id = c.carcor_pid
+            F_TMSORDERBILLSCARS
         WHERE
-            c.bill_status = 6
-        <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
-        <if test="isFleet != null and isFleet == 1">AND fleet.f_id = #{fleetId}</if>
+            bill_status = 6
     </select>
 
     <select id="selectMissedOrdersCount" parameterType="string" resultType="Integer">

ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml → ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsfeesMapper.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.ruoyi.statusTracking.mapper.FtmsorderbillsfeesMapper">
+<mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper">
 
     <resultMap type="FTmsorderbillsfees" id="FTmsorderbillsfeesResult">
         <result property="fId" column="f_id"/>