解决靖润首页 司机查看只能看自己的数据问题

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

@@ -2,6 +2,7 @@ package com.ruoyi.basicData.mapper;
 
 
 import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 
 import java.util.List;
 import java.util.Map;
@@ -84,4 +85,11 @@ public interface FleetCarManageMapper
      * @return  结果
      */
     public int updateFleetCarManageByDriverId(FleetCarManage fleetCarManage);
+
+    /**
+     *  查询可用车辆，若是车队，则查询符合车队的可用车辆
+     * @param ftmsorderbills    参数
+     * @return  结果
+     */
+    public int selectManageCount(Ftmsorderbills ftmsorderbills);
 }

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

@@ -115,6 +115,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("未找到用户信息，请添加后再提交");
             }
+            sysUser.setUserType("22");
             sysUser.setUserSystem("2");
             sysUser.setUpdateTime(new Date());
             sysUser.setPhonenumber(tCorps.getfTel());
@@ -140,7 +141,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult createUser(TCorps tCorps) {
         // 创建用户
         SysUser user = new SysUser();
-        user.setUserType("00");
+        user.setUserType("22");
         user.setUserSystem("2");
         user.setCreateTime(new Date());
         user.setNickName(tCorps.getfTel());

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbills.java

@@ -256,6 +256,11 @@ public class Ftmsorderbills extends BaseEntity {
      */
     private List<String> cLoadDate;
 
+    /**
+     * 查询派车数量的时间区间
+     */
+    private List<String> currentDay;
+
     public String getIsFleet() {
         return isFleet;
     }
@@ -734,6 +739,14 @@ public class Ftmsorderbills extends BaseEntity {
         this.cLoadDate = cLoadDate;
     }
 
+    public List<String> getcurrentDay() {
+        return currentDay;
+    }
+
+    public void setcurrentDay(List<String> currentDay) {
+        this.currentDay = currentDay;
+    }
+
     @Override
     public String toString() {
         return "Ftmsorderbills{" +
@@ -794,6 +807,7 @@ public class Ftmsorderbills extends BaseEntity {
                 ", invoiceType='" + invoiceType + '\'' +
                 ", planDate=" + planDate +
                 ", cLoadDate=" + cLoadDate +
+                ", currentDay=" + currentDay +
                 ", isFleet=" + isFleet +
                 '}';
     }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java

@@ -138,19 +138,20 @@ public interface FtmsorderbillscarsMapper {
 
     /**
      *  查询首页右上角数据
+     * @param tmsorderbills
      * @return  结果
      */
-    public List<Map<String, Object>> selectHomeUpperRightMapList();
+    public List<Map<String, Object>> selectHomeUpperRightMapList(Ftmsorderbills tmsorderbills);
 
     /**
      *  查询首页左上角新增计划数
      *  新增计划数(下了多少单的箱量)、未安排(未安排的箱量)
      *  今日派车(今日安排了多少车) 派车详情直接跳转到接单界面
      *  可派车辆(系统注册车辆-已安排车辆)
-     * @param currentDay    当前时间
+     * @param ftmsorderbills    当前时间
      * @return  结果
      */
-    public Map<String, Object> selectHomeUpperLeftCntrs(@Param("currentDay") List<String> currentDay);
+    public Map<String, Object> selectHomeUpperLeftCntrs(Ftmsorderbills ftmsorderbills);
 
     /**
      *  查询左上角 进入派车数
@@ -159,7 +160,7 @@ public interface FtmsorderbillscarsMapper {
      * @param currentDay    当前时间
      * @return  结果
      */
-    public int selectHomeUpperLeftCars(@Param("currentDay") List<String> currentDay);
+    public int selectHomeUpperLeftCars(Ftmsorderbills currentDay);
 
     /**
      *  根据司机姓名、手机号更新

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

@@ -6,10 +6,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.basicData.domain.FleetCarManage;
+import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.mapper.FleetCarManageMapper;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
 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.*;
@@ -31,6 +36,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 @Service
 public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     @Autowired
+    private TCorpsMapper tCorpsMapper;
+
+    @Autowired
     private FtmsorderbillsMapper ftmsorderbillsMapper;
 
     @Autowired
@@ -64,27 +72,35 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     @Override
     public AjaxResult queryHomeInfo() {
         Map<String, Object> map = new HashMap<>();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
+        if ("22".equals(user.getUserType())) {
+            ftmsorderbills.setIsFleet("1");
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(user.getPhonenumber());
+            ftmsorderbills.setFleetId(corps.getfId());
+        }
         //  查询右上 所有已结单、未结单数据
-        map.put("upperRight", ftmsorderbillscarsMapper.selectHomeUpperRightMapList());
+        map.put("upperRight", ftmsorderbillscarsMapper.selectHomeUpperRightMapList(ftmsorderbills));
         // 查询右下 提醒数据
         map.put("lowerRight", null);
         // 查询左上
         List<String> currentDay = DateUtils.getCurrentDay();
-        map.put("upperLeftCntrs", ftmsorderbillscarsMapper.selectHomeUpperLeftCntrs(currentDay));
+        ftmsorderbills.setcurrentDay(currentDay);
+        map.put("upperLeftCntrs", ftmsorderbillscarsMapper.selectHomeUpperLeftCntrs(ftmsorderbills));
         // 今日派车数量
-        int carQuantity = ftmsorderbillscarsMapper.selectHomeUpperLeftCars(currentDay);
+        int carQuantity = ftmsorderbillscarsMapper.selectHomeUpperLeftCars(ftmsorderbills);
         map.put("upperLeftCarQuantity", carQuantity);
         FleetCarManage fleetCarManage = new FleetCarManage();
-        fleetCarManage.setBillStatus(6L);
         fleetCarManage.setDelFlag("0");
-        int carManageQuantity = fleetCarManageMapper.selectFleetCarManageCount(fleetCarManage);
+        fleetCarManage.setBillStatus(6L);
+        int carManageQuantity = fleetCarManageMapper.selectManageCount(ftmsorderbills);
         int carNumber = carManageQuantity - carQuantity;
         if (carNumber < 0) {
             carNumber = 0;
         }
         map.put("upperLeftOldCarQuantity", carNumber);
         // 查询左下
-        map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList());
+        map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList(ftmsorderbills));
         return AjaxResult.success(map);
     }
 

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

@@ -152,12 +152,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                 return null;
             }
         }
-        String roleType = "车队";
-        // 判断是不是车队
-        SysUser sysUser = sysUserRoleMapper.selectRoleUserByUserId(user.getUserId(), roleType);
-        if (StringUtils.isNotNull(sysUser)) {
+        if ("22".equals(user.getUserType())) {
             ftmsorderbills.setIsFleet("1");
-            TCorps corps = tCorpsMapper.selectTCorpsByFTel(sysUser.getPhonenumber());
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(phonenumber);
             ftmsorderbills.setFleetId(corps.getfId());
         }
         return ftmsorderbills;

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

@@ -193,6 +193,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectManageCount" parameterType="ftmsorderbills" resultType="int">
+        SELECT
+            COUNT( f.id )
+        FROM
+            fleet_car_manage f
+            LEFT JOIN t_corps fleet ON fleet.f_id = f.fleet_company_id
+        WHERE
+            f.bill_status = 6
+            AND f.del_flag = '0'
+        <if test="isFleet != null and isFleet == 1">
+            AND fleet.f_id = #{fleetId}
+        </if>
+    </select>
+
     <insert id="insertFleetCarManage" parameterType="FleetCarManage" useGeneratedKeys="true" keyProperty="id">
         insert into fleet_car_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -435,6 +449,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billStatus != null "> and bill_status = #{billStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
-
     </select>
 </mapper>

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

@@ -668,7 +668,7 @@
         </where>
     </select>
 
-    <select id="selectHomeUpperRightMapList" resultType="Map">
+    <select id="selectHomeUpperRightMapList" parameterType="ftmsorderbills" resultType="Map">
         SELECT
             car.id,
             car.mblno,
@@ -678,15 +678,22 @@
         FROM
             F_TMSORDERBILLSCARS car
             LEFT JOIN F_TMSORDERBILLS bill ON bill.id = car.org_id
+            LEFT JOIN t_corps fleet ON fleet.f_id = car.carcor_pid
             LEFT JOIN t_corps t ON t.f_id = bill.corp_id
+        <where>
+            car.bill_status = 6
+            <if test="isFleet != null and isFleet == 1">
+                AND fleet.f_id = #{fleetId}
+            </if>
+        </where>
         ORDER BY
             car.id DESC
         LIMIT 10
     </select>
 
-    <select id="selectHomeUpperLeftCntrs" parameterType="list" resultType="Map">
+    <select id="selectHomeUpperLeftCntrs" parameterType="ftmsorderbills" resultType="Map">
         SELECT
-            IFNULL(SUM( cntr_qty ), 0)  planQuantity, IFNULL(SUM( cntr_blc_qty ), 0) surplusQuantity
+            IFNULL(SUM( cntr_qty ), 0) planQuantity, IFNULL(SUM( cntr_blc_qty ), 0) surplusQuantity
         FROM
             F_TMSORDERBILLSCNTRS
         where
@@ -694,14 +701,20 @@
             and create_time &lt;= #{currentDay[1]}
     </select>
 
-    <select id="selectHomeUpperLeftCars" parameterType="list" resultType="int">
+    <select id="selectHomeUpperLeftCars" parameterType="ftmsorderbills" resultType="int">
         SELECT
-            COUNT( id )
+            COUNT( car.id )
         FROM
-            F_TMSORDERBILLSCARS
-        where
-            create_time &gt;= #{currentDay[0]}
-            and create_time &lt;= #{currentDay[1]}
+            F_TMSORDERBILLSCARS car
+            LEFT JOIN t_corps fleet ON fleet.f_id = car.carcor_pid
+        <where>
+            car.bill_status = 6
+            and car.create_time &gt;= #{currentDay[0]}
+            and car.create_time &lt;= #{currentDay[1]}
+            <if test="isFleet != null and isFleet == 1">
+                AND fleet.f_id = #{fleetId}
+            </if>
+        </where>
     </select>
 
     <select id="getButtonValue" parameterType="ftmsorderbills" resultType="Map">