完善陆运系统

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java

@@ -30,14 +30,13 @@ public class FleetCarManageController extends BaseController
     private IFleetCarManageService fleetCarManageService;
 
     /**
-     * 查询【车辆】列表
+     * 下拉列表查询【车辆】列表id name
      */
     @GetMapping("/list")
     public TableDataInfo list(FleetCarManage fleetCarManage)
     {
         startPage();
-        //List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageList(fleetCarManage);
-        List<Map<String, Object>> list = fleetCarManageService.selectFleetCarManageListMap(fleetCarManage);
+        List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageIdNameList(fleetCarManage);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -37,13 +37,13 @@ public class FleetCompanyMsgController extends BaseController
     private IFleetCompanyMsgService fleetCompanyMsgService;
 
     /**
-     * 查询【车队】列表
+     * 下拉框查询【车队】id、name列表
      */
     @GetMapping("/list")
     public TableDataInfo list(FleetCompanyMsg fleetCompanyMsg)
     {
         startPage();
-        List<FleetCompanyMsg> list = fleetCompanyMsgService.selectFleetCompanyMsgList(fleetCompanyMsg);
+        List<FleetCompanyMsg> list = fleetCompanyMsgService.selectFleetCompanyMsgIdNameList(fleetCompanyMsg);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -42,13 +42,13 @@ public class FleetDriverMsgController extends BaseController
     private ISysUserService userService;
 
     /**
-     * 查询【司机】列表
+     * 下拉框查询【司机】id、name列表
      */
     @GetMapping("/list")
     public TableDataInfo list(FleetDriverMsg fleetDriverMsg)
     {
         startPage();
-        List<FleetDriverMsg> list = fleetDriverMsgService.selectFleetDriverMsgList(fleetDriverMsg);
+        List<FleetDriverMsg> list = fleetDriverMsgService.selectFleetDriverMsgIdNameList(fleetDriverMsg);
         return getDataTable(list);
     }
 

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

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -57,8 +58,17 @@ public class ftmsorderbillscarsController extends BaseController {
     }
 
     /**
-     *  查询判断
+     * 根据手机号查询司机的
+     * 新订单、本月订单、本月历程、本月运费
      */
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
+    @GetMapping(value = "/selectDriverPerformance")
+    public AjaxResult selectDriverPerformance(SysUser user) {
+        if (StringUtils.isNull(user.getPhonenumber()) || "".equals(user.getPhonenumber())) {
+            return AjaxResult.error("未找到查询条件，请确认");
+        }
+        return ftmsorderbillscarsService.selectDriverPerformance(user.getPhonenumber());
+    }
 
     /**
      * 导出车队派车列表

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

@@ -3,8 +3,12 @@ package com.ruoyi.web.controller.fleet.statusTracking;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,19 +41,18 @@ public class ftmsorderbillsfeesController extends BaseController {
     }
 
     /**
-     *   费用提交
+     * 费用提交
      */
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsfees:add')")
     @Log(title = "【车辆】", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestParam("ftmsorderbillsfees") String ftmsorderbillsfees )
-    {
-        return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAdd(ftmsorderbillsfees);
+    public AjaxResult add(@RequestParam("cars") String cars,
+                          @RequestParam("status") long status,
+                          @RequestParam("ftmsorderbillsfees") String ftmsorderbillsfees) {
+        if (StringUtils.isEmpty(cars) || "{}".equals(cars)) {
+            return AjaxResult.error("未找到主表数据，请确认");
+        }
+        return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAdd(cars, status, ftmsorderbillsfees);
     }
 
-
-
-
-
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -5,19 +5,21 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
+import java.util.*;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {
     public static String YYYY = "yyyy";
 
+    public static String MM = "MM";
+
+    public static String dd = "dd";
+
     public static String YYYY_MM = "yyyy-MM";
 
     public static String YYYY_MM_DD = "yyyy-MM-dd";
@@ -25,15 +27,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-    
+
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
     public static Date getNowDate()
@@ -43,7 +45,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
     public static String getDate()
@@ -51,6 +53,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTimeNow(YYYY_MM_DD);
     }
 
+    public static String getDay()
+    {
+        return dateTimeNow(dd);
+    }
+
     public static final String getTime()
     {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
@@ -124,7 +131,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             return null;
         }
     }
-    
+
     /**
      * 获取服务器启动时间
      */
@@ -182,4 +189,31 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         calendar.add(Calendar.DATE,num);
         return calendar.getTime();
     }
+
+    /**
+     *  获取当前月份第一天与最后一天
+     * @return
+     */
+    public static List<String> getMonth()
+    {
+        List<String> stringList = new ArrayList<>();
+        Calendar cale = null;
+        cale = Calendar.getInstance();
+        // 获取当月第一天和最后一天
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String firstday, lastday;
+        // 获取前月的第一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        firstday = format.format(cale.getTime()) + " 00:00:00";
+        stringList.add(firstday);
+        // 获取前月的最后一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        lastday = format.format(cale.getTime()) + " 23:59:59";
+        stringList.add(lastday);
+        return  stringList;
+    }
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/domain/FleetCarManage.java

@@ -1,611 +1,616 @@
 package com.ruoyi.basicData.domain;
 
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 【车辆】对象 fleet_car_manage
- * 
+ * 车辆对象 fleet_car_manage
+ *
  * @author ruoyi
- * @date 2021-03-04
+ * @date 2021-03-19
  */
-public class FleetCarManage extends BaseEntity
-{
+public class FleetCarManage extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 车队id */
+    /**
+     * 车队id
+     */
     @Excel(name = "车队id")
     private Long fleetCompanyId;
 
-    /** 车牌号 */
+    /**
+     * 车牌号
+     */
     @Excel(name = "车牌号")
     private String carNum;
 
-    /** 挂号 */
+    /**
+     * 驾驶员id
+     */
+    @Excel(name = "驾驶员id")
+    private Long driverId;
+
+    /**
+     * 驾驶员
+     */
     @Excel(name = "驾驶员")
     private String driverName;
 
-    /** 挂号 */
+    /**
+     * 挂号
+     */
     @Excel(name = "挂号")
     private String hangNum;
 
-    /** 燃油类型 */
+    /**
+     * 燃油类型
+     */
     @Excel(name = "燃油类型")
     private String fuelType;
 
-    /** 车辆类型 */
+    /**
+     * 车辆类型
+     */
     @Excel(name = "车辆类型")
     private String carType;
 
-    /** 车辆名称 */
+    /**
+     * 车辆名称
+     */
     @Excel(name = "车辆名称")
     private String carName;
 
-    /** 车辆品牌 */
+    /**
+     * 车辆品牌
+     */
     @Excel(name = "车辆品牌")
     private String carBrand;
 
-    /** 制造单位 */
+    /**
+     * 制造单位
+     */
     @Excel(name = "制造单位")
     private String manufactureUnit;
 
-    /** 发证机关 */
+    /**
+     * 发证机关
+     */
     @Excel(name = "发证机关")
     private String officeOfCertificate;
 
-    /** 牵引车辆型号 */
+    /**
+     * 牵引车辆型号
+     */
     @Excel(name = "牵引车辆型号")
     private String pullCarType;
 
-    /** 牵引车车架号 */
+    /**
+     * 牵引车车架号
+     */
     @Excel(name = "牵引车车架号")
     private String pullCarShelfNum;
 
-    /** 挂车型号 */
+    /**
+     * 挂车型号
+     */
     @Excel(name = "挂车型号")
     private String mountCarType;
 
-    /** 挂车车架号 */
+    /**
+     * 挂车车架号
+     */
     @Excel(name = "挂车车架号")
     private String mountCarNum;
 
-    /** 发动机型号 */
+    /**
+     * 发动机型号
+     */
     @Excel(name = "发动机型号")
     private String engine;
 
-    /** 核载人数 */
+    /**
+     * 核载人数
+     */
     @Excel(name = "核载人数")
     private Long carLoadPersion;
 
-    /** 购车日期 */
+    /**
+     * 购车日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "购车日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date buyCarDate;
 
-    /** 注册日期 */
+    /**
+     * 注册日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "注册日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date regiestDate;
 
-    /** 报废日期 */
+    /**
+     * 报废日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date abandonDate;
 
-    /** 外阔尺寸mm */
+    /**
+     * 外阔尺寸mm
+     */
     @Excel(name = "外阔尺寸mm")
     private Long outerSize;
 
-    /** 总重量kg */
+    /**
+     * 总重量kg
+     */
     @Excel(name = "总重量kg")
     private Long sumWeight;
 
-    /** 核定重量kg */
+    /**
+     * 核定重量kg
+     */
     @Excel(name = "核定重量kg")
     private Long vouchWeight;
 
-    /** 装备质量kg */
+    /**
+     * 装备质量kg
+     */
     @Excel(name = "装备质量kg")
     private Long equipWeight;
 
-    /** 行驶证头src */
+    /**
+     * 行驶证头src
+     */
     @Excel(name = "行驶证头src")
     private String drivingLicenseSrc;
 
-    /** 行驶证挂件src */
+    /**
+     * 行驶证挂件src
+     */
     @Excel(name = "行驶证挂件src")
     private String drivingPendantSrc;
 
-    /** 运营证头src */
+    /**
+     * 运营证头src
+     */
     @Excel(name = "运营证头src")
     private String operationLicenseSrc;
 
-    /** 技术评定证书src */
+    /**
+     * 技术评定证书src
+     */
     @Excel(name = "技术评定证书src")
     private String technologySrc;
 
-    /** 营运挂载src */
+    /**
+     * 营运挂载src
+     */
     @Excel(name = "营运挂载src")
     private String drivingLoadSrc;
 
-    /** 二级维护src */
+    /**
+     * 二级维护src
+     */
     @Excel(name = "二级维护src")
     private String secondLvMaintainSrc;
 
-    /** 交强险src */
+    /**
+     * 交强险src
+     */
     @Excel(name = "交强险src")
     private String tafficConstranintInsuranceSrc;
 
-    /** 商业保险src */
+    /**
+     * 商业保险src
+     */
     @Excel(name = "商业保险src")
     private String businessInsuranceSrc;
 
-    /** 承运人保险src */
+    /**
+     * 承运人保险src
+     */
     @Excel(name = "承运人保险src")
     private String accpetCarrageInsuranceSrc;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date creatTime;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date modificationTime;
 
-    /** 状态(1新建，2暂存，6提交) */
-    @Excel(name = "状态(1新建，2暂存，6提交)")
-    private Long billStatus;
-
-
-    /** 删除状态 */
-    private String delFlag;
-
     /**
-     * 创建者
+     * 状态(1新建，2暂存，6提交)
      */
-    private String createBy;
-
+    @Excel(name = "状态(1新建，2暂存，6提交)")
+    private Long billStatus;
 
     /**
-     * 更新者
+     * 删除状态
      */
-    private String updateBy;
+    private String delFlag;
 
     /**
-     * 更新时间
+     * 备注
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setFleetCompanyId(Long fleetCompanyId) 
-    {
+
+    public void setFleetCompanyId(Long fleetCompanyId) {
         this.fleetCompanyId = fleetCompanyId;
     }
 
-    public Long getFleetCompanyId() 
-    {
+    public Long getFleetCompanyId() {
         return fleetCompanyId;
     }
-    public void setCarNum(String carNum) 
-    {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
 
-    public String getCarNum() 
-    {
+    public String getCarNum() {
         return carNum;
     }
-    public void setHangNum(String hangNum) 
-    {
+
+    public void setDriverId(Long driverId) {
+        this.driverId = driverId;
+    }
+
+    public Long getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setHangNum(String hangNum) {
         this.hangNum = hangNum;
     }
 
-    public String getHangNum() 
-    {
+    public String getHangNum() {
         return hangNum;
     }
-    public void setFuelType(String fuelType) 
-    {
+
+    public void setFuelType(String fuelType) {
         this.fuelType = fuelType;
     }
 
-    public String getFuelType() 
-    {
+    public String getFuelType() {
         return fuelType;
     }
-    public void setCarType(String carType) 
-    {
+
+    public void setCarType(String carType) {
         this.carType = carType;
     }
 
-    public String getCarType() 
-    {
+    public String getCarType() {
         return carType;
     }
-    public void setCarName(String carName) 
-    {
+
+    public void setCarName(String carName) {
         this.carName = carName;
     }
 
-    public String getCarName() 
-    {
+    public String getCarName() {
         return carName;
     }
-    public void setCarBrand(String carBrand) 
-    {
+
+    public void setCarBrand(String carBrand) {
         this.carBrand = carBrand;
     }
 
-    public String getCarBrand() 
-    {
+    public String getCarBrand() {
         return carBrand;
     }
-    public void setManufactureUnit(String manufactureUnit) 
-    {
+
+    public void setManufactureUnit(String manufactureUnit) {
         this.manufactureUnit = manufactureUnit;
     }
 
-    public String getManufactureUnit() 
-    {
+    public String getManufactureUnit() {
         return manufactureUnit;
     }
-    public void setOfficeOfCertificate(String officeOfCertificate) 
-    {
+
+    public void setOfficeOfCertificate(String officeOfCertificate) {
         this.officeOfCertificate = officeOfCertificate;
     }
 
-    public String getOfficeOfCertificate() 
-    {
+    public String getOfficeOfCertificate() {
         return officeOfCertificate;
     }
-    public void setPullCarType(String pullCarType) 
-    {
+
+    public void setPullCarType(String pullCarType) {
         this.pullCarType = pullCarType;
     }
 
-    public String getPullCarType() 
-    {
+    public String getPullCarType() {
         return pullCarType;
     }
-    public void setPullCarShelfNum(String pullCarShelfNum) 
-    {
+
+    public void setPullCarShelfNum(String pullCarShelfNum) {
         this.pullCarShelfNum = pullCarShelfNum;
     }
 
-    public String getPullCarShelfNum() 
-    {
+    public String getPullCarShelfNum() {
         return pullCarShelfNum;
     }
-    public void setMountCarType(String mountCarType) 
-    {
+
+    public void setMountCarType(String mountCarType) {
         this.mountCarType = mountCarType;
     }
 
-    public String getMountCarType() 
-    {
+    public String getMountCarType() {
         return mountCarType;
     }
-    public void setMountCarNum(String mountCarNum) 
-    {
+
+    public void setMountCarNum(String mountCarNum) {
         this.mountCarNum = mountCarNum;
     }
 
-    public String getMountCarNum() 
-    {
+    public String getMountCarNum() {
         return mountCarNum;
     }
-    public void setEngine(String engine) 
-    {
+
+    public void setEngine(String engine) {
         this.engine = engine;
     }
 
-    public String getEngine() 
-    {
+    public String getEngine() {
         return engine;
     }
-    public void setCarLoadPersion(Long carLoadPersion) 
-    {
+
+    public void setCarLoadPersion(Long carLoadPersion) {
         this.carLoadPersion = carLoadPersion;
     }
 
-    public Long getCarLoadPersion() 
-    {
+    public Long getCarLoadPersion() {
         return carLoadPersion;
     }
-    public void setBuyCarDate(Date buyCarDate) 
-    {
+
+    public void setBuyCarDate(Date buyCarDate) {
         this.buyCarDate = buyCarDate;
     }
 
-    public Date getBuyCarDate() 
-    {
+    public Date getBuyCarDate() {
         return buyCarDate;
     }
-    public void setRegiestDate(Date regiestDate) 
-    {
+
+    public void setRegiestDate(Date regiestDate) {
         this.regiestDate = regiestDate;
     }
 
-    public Date getRegiestDate() 
-    {
+    public Date getRegiestDate() {
         return regiestDate;
     }
-    public void setAbandonDate(Date abandonDate) 
-    {
+
+    public void setAbandonDate(Date abandonDate) {
         this.abandonDate = abandonDate;
     }
 
-    public Date getAbandonDate() 
-    {
+    public Date getAbandonDate() {
         return abandonDate;
     }
-    public void setOuterSize(Long outerSize) 
-    {
+
+    public void setOuterSize(Long outerSize) {
         this.outerSize = outerSize;
     }
 
-    public Long getOuterSize() 
-    {
+    public Long getOuterSize() {
         return outerSize;
     }
-    public void setSumWeight(Long sumWeight) 
-    {
+
+    public void setSumWeight(Long sumWeight) {
         this.sumWeight = sumWeight;
     }
 
-    public Long getSumWeight() 
-    {
+    public Long getSumWeight() {
         return sumWeight;
     }
-    public void setVouchWeight(Long vouchWeight) 
-    {
+
+    public void setVouchWeight(Long vouchWeight) {
         this.vouchWeight = vouchWeight;
     }
 
-    public Long getVouchWeight() 
-    {
+    public Long getVouchWeight() {
         return vouchWeight;
     }
-    public void setEquipWeight(Long equipWeight) 
-    {
+
+    public void setEquipWeight(Long equipWeight) {
         this.equipWeight = equipWeight;
     }
 
-    public Long getEquipWeight() 
-    {
+    public Long getEquipWeight() {
         return equipWeight;
     }
-    public void setDrivingLicenseSrc(String drivingLicenseSrc) 
-    {
+
+    public void setDrivingLicenseSrc(String drivingLicenseSrc) {
         this.drivingLicenseSrc = drivingLicenseSrc;
     }
 
-    public String getDrivingLicenseSrc() 
-    {
+    public String getDrivingLicenseSrc() {
         return drivingLicenseSrc;
     }
-    public void setDrivingPendantSrc(String drivingPendantSrc) 
-    {
+
+    public void setDrivingPendantSrc(String drivingPendantSrc) {
         this.drivingPendantSrc = drivingPendantSrc;
     }
 
-    public String getDrivingPendantSrc() 
-    {
+    public String getDrivingPendantSrc() {
         return drivingPendantSrc;
     }
-    public void setOperationLicenseSrc(String operationLicenseSrc) 
-    {
+
+    public void setOperationLicenseSrc(String operationLicenseSrc) {
         this.operationLicenseSrc = operationLicenseSrc;
     }
 
-    public String getOperationLicenseSrc() 
-    {
+    public String getOperationLicenseSrc() {
         return operationLicenseSrc;
     }
-    public void setTechnologySrc(String technologySrc) 
-    {
+
+    public void setTechnologySrc(String technologySrc) {
         this.technologySrc = technologySrc;
     }
 
-    public String getTechnologySrc() 
-    {
+    public String getTechnologySrc() {
         return technologySrc;
     }
-    public void setDrivingLoadSrc(String drivingLoadSrc) 
-    {
+
+    public void setDrivingLoadSrc(String drivingLoadSrc) {
         this.drivingLoadSrc = drivingLoadSrc;
     }
 
-    public String getDrivingLoadSrc() 
-    {
+    public String getDrivingLoadSrc() {
         return drivingLoadSrc;
     }
-    public void setSecondLvMaintainSrc(String secondLvMaintainSrc) 
-    {
+
+    public void setSecondLvMaintainSrc(String secondLvMaintainSrc) {
         this.secondLvMaintainSrc = secondLvMaintainSrc;
     }
 
-    public String getSecondLvMaintainSrc() 
-    {
+    public String getSecondLvMaintainSrc() {
         return secondLvMaintainSrc;
     }
-    public void setTafficConstranintInsuranceSrc(String tafficConstranintInsuranceSrc) 
-    {
+
+    public void setTafficConstranintInsuranceSrc(String tafficConstranintInsuranceSrc) {
         this.tafficConstranintInsuranceSrc = tafficConstranintInsuranceSrc;
     }
 
-    public String getTafficConstranintInsuranceSrc() 
-    {
+    public String getTafficConstranintInsuranceSrc() {
         return tafficConstranintInsuranceSrc;
     }
-    public void setBusinessInsuranceSrc(String businessInsuranceSrc) 
-    {
+
+    public void setBusinessInsuranceSrc(String businessInsuranceSrc) {
         this.businessInsuranceSrc = businessInsuranceSrc;
     }
 
-    public String getBusinessInsuranceSrc() 
-    {
+    public String getBusinessInsuranceSrc() {
         return businessInsuranceSrc;
     }
-    public void setAccpetCarrageInsuranceSrc(String accpetCarrageInsuranceSrc) 
-    {
+
+    public void setAccpetCarrageInsuranceSrc(String accpetCarrageInsuranceSrc) {
         this.accpetCarrageInsuranceSrc = accpetCarrageInsuranceSrc;
     }
 
-    public String getAccpetCarrageInsuranceSrc() 
-    {
+    public String getAccpetCarrageInsuranceSrc() {
         return accpetCarrageInsuranceSrc;
     }
-    public void setCreatTime(Date creatTime) 
-    {
+
+    public void setCreatTime(Date creatTime) {
         this.creatTime = creatTime;
     }
 
-    public Date getCreatTime() 
-    {
+    public Date getCreatTime() {
         return creatTime;
     }
-    public void setModificationTime(Date modificationTime) 
-    {
+
+    public void setModificationTime(Date modificationTime) {
         this.modificationTime = modificationTime;
     }
 
-    public Date getModificationTime() 
-    {
+    public Date getModificationTime() {
         return modificationTime;
     }
-    public void setBillStatus(Long billStatus) 
-    {
+
+    public void setBillStatus(Long billStatus) {
         this.billStatus = billStatus;
     }
 
-    public Long getBillStatus() 
-    {
+    public Long getBillStatus() {
         return billStatus;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
-    public void setRemarks(String remarks) 
-    {
+
+    public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
 
-    public String getRemarks() 
-    {
+    public String getRemarks() {
         return remarks;
     }
 
     @Override
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    @Override
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    @Override
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    @Override
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    @Override
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    @Override
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDriverName() {
-        return driverName;
-    }
-
-    public void setDriverName(String driverName) {
-        this.driverName = driverName;
-    }
-
-    @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fleetCompanyId", getFleetCompanyId())
-            .append("carNum", getCarNum())
-            .append("hangNum", getHangNum())
-            .append("fuelType", getFuelType())
-            .append("carType", getCarType())
-            .append("carName", getCarName())
-            .append("carBrand", getCarBrand())
-            .append("manufactureUnit", getManufactureUnit())
-            .append("officeOfCertificate", getOfficeOfCertificate())
-            .append("pullCarType", getPullCarType())
-            .append("pullCarShelfNum", getPullCarShelfNum())
-            .append("mountCarType", getMountCarType())
-            .append("mountCarNum", getMountCarNum())
-            .append("engine", getEngine())
-            .append("carLoadPersion", getCarLoadPersion())
-            .append("buyCarDate", getBuyCarDate())
-            .append("regiestDate", getRegiestDate())
-            .append("abandonDate", getAbandonDate())
-            .append("outerSize", getOuterSize())
-            .append("sumWeight", getSumWeight())
-            .append("vouchWeight", getVouchWeight())
-            .append("equipWeight", getEquipWeight())
-            .append("drivingLicenseSrc", getDrivingLicenseSrc())
-            .append("drivingPendantSrc", getDrivingPendantSrc())
-            .append("operationLicenseSrc", getOperationLicenseSrc())
-            .append("technologySrc", getTechnologySrc())
-            .append("drivingLoadSrc", getDrivingLoadSrc())
-            .append("secondLvMaintainSrc", getSecondLvMaintainSrc())
-            .append("tafficConstranintInsuranceSrc", getTafficConstranintInsuranceSrc())
-            .append("businessInsuranceSrc", getBusinessInsuranceSrc())
-            .append("accpetCarrageInsuranceSrc", getAccpetCarrageInsuranceSrc())
-            .append("creatTime", getCreatTime())
-            .append("modificationTime", getModificationTime())
-            .append("billStatus", getBillStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remarks", getRemarks())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("fleetCompanyId", getFleetCompanyId())
+                .append("carNum", getCarNum())
+                .append("driverId", getDriverId())
+                .append("driverName", getDriverName())
+                .append("hangNum", getHangNum())
+                .append("fuelType", getFuelType())
+                .append("carType", getCarType())
+                .append("carName", getCarName())
+                .append("carBrand", getCarBrand())
+                .append("manufactureUnit", getManufactureUnit())
+                .append("officeOfCertificate", getOfficeOfCertificate())
+                .append("pullCarType", getPullCarType())
+                .append("pullCarShelfNum", getPullCarShelfNum())
+                .append("mountCarType", getMountCarType())
+                .append("mountCarNum", getMountCarNum())
+                .append("engine", getEngine())
+                .append("carLoadPersion", getCarLoadPersion())
+                .append("buyCarDate", getBuyCarDate())
+                .append("regiestDate", getRegiestDate())
+                .append("abandonDate", getAbandonDate())
+                .append("outerSize", getOuterSize())
+                .append("sumWeight", getSumWeight())
+                .append("vouchWeight", getVouchWeight())
+                .append("equipWeight", getEquipWeight())
+                .append("drivingLicenseSrc", getDrivingLicenseSrc())
+                .append("drivingPendantSrc", getDrivingPendantSrc())
+                .append("operationLicenseSrc", getOperationLicenseSrc())
+                .append("technologySrc", getTechnologySrc())
+                .append("drivingLoadSrc", getDrivingLoadSrc())
+                .append("secondLvMaintainSrc", getSecondLvMaintainSrc())
+                .append("tafficConstranintInsuranceSrc", getTafficConstranintInsuranceSrc())
+                .append("businessInsuranceSrc", getBusinessInsuranceSrc())
+                .append("accpetCarrageInsuranceSrc", getAccpetCarrageInsuranceSrc())
+                .append("creatTime", getCreatTime())
+                .append("modificationTime", getModificationTime())
+                .append("billStatus", getBillStatus())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remarks", getRemarks())
+                .toString();
     }
 }

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

@@ -63,4 +63,11 @@ public interface FleetCarManageMapper
      * @return 结果
      */
     public int deleteFleetCarManageByIds(Long[] ids);
+
+    /**
+     *  下拉列表查询【车辆】列表id name
+     * @param fleetCarManage    条件
+     * @return  结果
+     */
+    public List<FleetCarManage> selectFleetCarManageIdNameList(FleetCarManage fleetCarManage);
 }

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

@@ -70,4 +70,11 @@ public interface FleetCompanyMsgMapper
      * @return
      */
     public FleetCompanyMsg checkFNoUnique(String companyName);
+
+    /**
+     *  下拉框查询【车队】id、name列表
+     * @param fleetCompanyMsg   条件
+     * @return  结果
+     */
+    public List<FleetCompanyMsg> selectFleetCompanyMsgIdNameList(FleetCompanyMsg fleetCompanyMsg);
 }

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

@@ -61,4 +61,11 @@ public interface FleetDriverMsgMapper
      * @return 结果
      */
     public int deleteFleetDriverMsgByIds(Long[] ids);
+
+    /**
+     *  下拉框查询【司机】id、name列表
+     * @param fleetDriverMsg    条件
+     * @return  结果
+     */
+    public List<FleetDriverMsg> selectFleetDriverMsgIdNameList(FleetDriverMsg fleetDriverMsg);
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCarManageService.java

@@ -65,4 +65,11 @@ public interface IFleetCarManageService
      * @return 结果
      */
     public int deleteFleetCarManageById(Long id);
+
+    /**
+     *  下拉列表查询【车辆】列表id name
+     * @param fleetCarManage    条件
+     * @return  结果
+     */
+    List<FleetCarManage> selectFleetCarManageIdNameList(FleetCarManage fleetCarManage);
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetCompanyMsgService.java

@@ -71,5 +71,10 @@ public interface IFleetCompanyMsgService
      */
     public String checkUFNoUnique(FleetCompanyMsg fleetCompanyMsg);
 
-
+    /**
+     *  下拉框查询【车队】id、name列表
+     * @param fleetCompanyMsg   条件
+     * @return  结果
+     */
+    public List<FleetCompanyMsg> selectFleetCompanyMsgIdNameList(FleetCompanyMsg fleetCompanyMsg);
 }

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/IFleetDriverMsgService.java

@@ -61,4 +61,11 @@ public interface IFleetDriverMsgService
      * @return 结果
      */
     public int deleteFleetDriverMsgById(Long id);
+
+    /**
+     *  下拉框查询【司机】id、name列表
+     * @param fleetDriverMsg    条件
+     * @return  结果
+     */
+    public List<FleetDriverMsg> selectFleetDriverMsgIdNameList(FleetDriverMsg fleetDriverMsg);
 }

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

@@ -203,4 +203,14 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
     {
         return fleetCarManageMapper.deleteFleetCarManageById(id);
     }
+
+    /**
+     *  下拉列表查询【车辆】列表id name
+     * @param fleetCarManage    条件
+     * @return  结果
+     */
+    @Override
+    public List<FleetCarManage> selectFleetCarManageIdNameList(FleetCarManage fleetCarManage) {
+        return fleetCarManageMapper.selectFleetCarManageIdNameList(fleetCarManage);
+    }
 }

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

@@ -80,11 +80,13 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService
             return AjaxResult.error("请填写必输项");
         }
         if(null!=fleetCompanyMsg.getId() && !fleetCompanyMsg.getId().equals("")){
+            fleetCompanyMsg.setBillStatus(6L);
             fleetCompanyMsg.setUpdateBy(SecurityUtils.getUsername());
             fleetCompanyMsg.setUpdateTime(new Date());
             fleetCompanyMsgMapper.updateFleetCompanyMsg(fleetCompanyMsg);
             return AjaxResult.success();
         }else {
+            fleetCompanyMsg.setBillStatus(6L);
             fleetCompanyMsg.setCreateBy(SecurityUtils.getUsername());
             fleetCompanyMsg.setCreatTime(new Date());
             fleetCompanyMsgMapper.insertFleetCompanyMsg(fleetCompanyMsg);
@@ -137,4 +139,14 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService
         }
         return UserConstants.UNIQUE;
     }
+
+    /**
+     *  下拉框查询【车队】id、name列表
+     * @param fleetCompanyMsg   条件
+     * @return  结果
+     */
+    @Override
+    public List<FleetCompanyMsg> selectFleetCompanyMsgIdNameList(FleetCompanyMsg fleetCompanyMsg) {
+        return fleetCompanyMsgMapper.selectFleetCompanyMsgIdNameList(fleetCompanyMsg);
+    }
 }

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

@@ -175,6 +175,16 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService
     }
 
     /**
+     *  下拉框查询【司机】id、name列表
+     * @param fleetDriverMsg    条件
+     * @return  结果
+     */
+    @Override
+    public List<FleetDriverMsg> selectFleetDriverMsgIdNameList(FleetDriverMsg fleetDriverMsg) {
+        return fleetDriverMsgMapper.selectFleetDriverMsgIdNameList(fleetDriverMsg);
+    }
+
+    /**
      * 新增用户岗位信息
      *
      * @param user 用户对象

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

@@ -2,6 +2,7 @@ package com.ruoyi.orderPlan.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -553,4 +554,8 @@ public class Ftmsorderbillscars extends BaseEntity {
     @Excel(name = "备注")
     private String remarks;
 
+    /**
+     *  查询日期区间
+     */
+    private List<String> monthList;
 }

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

@@ -125,4 +125,12 @@ public interface FtmsorderbillscarsMapper {
      * @return  结果
      */
     Map<String, Object> selectTmsorderbillsCarsByDriver(Long id);
+
+    /**
+     * 根据手机号查询司机的
+     * 新订单、本月订单、本月历程、本月运费
+     * @param ftmsorderbillscars   条件
+     * @return  结果
+     */
+    public Map<String, Object> selectMonthlyOrder(Ftmsorderbillscars ftmsorderbillscars);
 }

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

@@ -137,4 +137,12 @@ public interface IftmsorderbillscarsService {
      * @return  结果
      */
     public Map<String, Object> selectDriver(Ftmsorderbillscars ftmsorderbillscars);
+
+    /**
+     * 根据手机号查询司机的
+     * 新订单、本月订单、本月历程、本月运费
+     * @param phoneNumber   手机号
+     * @return  结果
+     */
+    public AjaxResult selectDriverPerformance(String phoneNumber);
 }

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

@@ -129,6 +129,30 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
+     * 根据手机号查询司机的
+     * 新订单、本月订单、本月历程、本月运费
+     * @param phoneNumber   手机号
+     * @return  结果
+     */
+    @Override
+    public AjaxResult selectDriverPerformance(String phoneNumber) {
+        SysUser sysUser = sysUserMapper.selectUserByTel(phoneNumber);
+        if (StringUtils.isNull(sysUser)) {
+            return AjaxResult.error("未找到司机信息，请确认手机号");
+        }
+        // 查询未接单数量
+        Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
+        ftmsorderbillscars.setOrderStatus(10L);
+        int count = ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars);
+        // 月份
+        ftmsorderbillscars.setDriverTel(phoneNumber);
+        ftmsorderbillscars.setMonthList(DateUtils.getMonth());
+        Map<String, Object> map = ftmsorderbillscarsMapper.selectMonthlyOrder(ftmsorderbillscars);
+        map.put("count", count);
+        return AjaxResult.success(map);
+    }
+
+    /**
      * 根据司机id查询详细信息
      *
      * @param ftmsorderbillscars 用户id
@@ -341,7 +365,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("更新司机状态失败，若多次失败请联系管理员");
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setfId(pId);
+        ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(orderStatus);
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfees(ftmsorderbillsfees);
         Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
@@ -665,6 +689,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("派车货量超出调度安排数量，请确认");
         }
         Ftmsorderbills tmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
+        ftmsorderbillscars.setOrgId(tmsorderbills.getId());
         ftmsorderbillscars.setMblno(tmsorderbills.getMblno());
         ftmsorderbillsplans.setCarQty(carQty);
         if (ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans) <= 0) {
@@ -793,6 +818,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         ftmsorderbillscars.setPlanDate(new Date());
         ftmsorderbillscars.setUpdateTime(new Date());
         ftmsorderbillscars.setUpdateBy(loginUser.getUsername());
+        ftmsorderbillscars.setOrgId(ftmsorderbillsplans.getOrgId());
         if (ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新车辆数据失败，若多次失败请联系管理员");

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

@@ -292,7 +292,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         if (StringUtils.isNotEmpty(status)) {
             return AjaxResult.error(status);
         }
-        tmsorderbills.setBillStatus(80L);
+        tmsorderbills.setBillStatus(60L);
         tmsorderbills.setUpdateTime(new Date());
         tmsorderbills.setUpdateBy(loginUser.getUsername());
         ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
@@ -540,7 +540,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     @Transactional
     public AjaxResult insertftmsorderbills(String tmsorder, String attachs, String fees, String plans, LoginUser loginUser) {
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
-        tmsorderbills.setBillStatus(80L);
+        tmsorderbills.setBillStatus(60L);
         tmsorderbills.setUpdateTime(new Date());
         tmsorderbills.setUpdateBy(loginUser.getUsername());
         ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);

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

@@ -23,7 +23,14 @@ public interface IftmsorderbillsfeesService {
 
     public Map<String, Object> selectFTmsorderbillsfeesByIdMap(Long id);
 
-    public AjaxResult insertFTmsorderbillsfeesAdd(String Ftmsorderbillsfees);
+    /**
+     *  费用提交、保存
+     * @param cars      主表信息
+     * @param status    状态
+     * @param fees      费用
+     * @return  结果
+     */
+    public AjaxResult insertFTmsorderbillsfeesAdd(String cars, long status, String fees);
 
 
     /**

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

@@ -2,19 +2,13 @@ package com.ruoyi.statusTracking.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.basicData.domain.TCorps;
-import com.ruoyi.basicData.domain.TFees;
-import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.basicData.mapper.TGoodsMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
@@ -75,103 +69,48 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
 
     @Override
     public Map<String, Object> selectFTmsorderbillsfeesByIdMap(Long id) {
-        Map<String, Object> map = new HashMap<>();
-        // 客户表
-        List<Long> corpsId = new ArrayList<>();
-        // 用户表
-        List<SysUser> sysUserList = new ArrayList<>();
-        // 费用
-        List<Long> feesId = new ArrayList<>();
-        // 商品
-        List<Long> goodsId = new ArrayList<>();
-        // cars
-        Ftmsorderbillscars ftmsorderbillscars = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(id);
-        // 主表
-        Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillscars.getPId());
-        if (!StringUtils.isNull(ftmsorderbills)) {
-            if (StringUtils.isNotNull(ftmsorderbills.getCorpId())) {
-                corpsId.add(ftmsorderbills.getCorpId());
-            }
-            if (StringUtils.isNotNull(ftmsorderbills.getGoodsId())) {
-                goodsId.add(ftmsorderbills.getGoodsId());
-            }
-            // 查询制单人
-            SysUser logUser = sysUserMapper.selectUserByUserName(ftmsorderbills.getCreateBy());
-            if (StringUtils.isNotNull(logUser)) {
-                SysDept sysDept = sysDeptMapper.selectDeptById(logUser.getDeptId());
-                sysUserList.add(logUser);
-                map.put("dept", sysDept);
-            }
-        }
+        Map<String, Object> map = ftmsorderbillscarsMapper.selectTmsorderbillsCarsByDriver(id);
         // 费用信息
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        //ftmsorderbillsfees.setFPid(id);
         ftmsorderbillsfees.setfPid(id);
-        List<Ftmsorderbillsfees> ftmsorderbillsfeesList= fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
-        if (StringUtils.isNotEmpty(ftmsorderbillsfeesList)) {
-            for (Ftmsorderbillsfees fees : ftmsorderbillsfeesList) {
-                //feesId.add(fees.getFFeeid());
-                feesId.add(fees.getfFeeid());
-            }
-        }
-        // 客户
-        List<TCorps> corpsList = new ArrayList<>();
-        List<Long> corpsIdList = StringUtils.integerDeduplication(corpsId);
-        for (Long corpId : corpsIdList) {
-            TCorps corps = tCorpsMapper.selectTCorpsById(corpId);
-            if (StringUtils.isNotNull(corps)) {
-                corpsList.add(corps);
-            }
-        }
-        // 商品
-        List<TGoods> goodsList = new ArrayList<>();
-        List<Long> goodsIdList = StringUtils.integerDeduplication(goodsId);
-        for (Long goods : goodsIdList) {
-            TGoods tGoods = tGoodsMapper.selectTGoodsById(goods);
-            if (StringUtils.isNotNull(tGoods)) {
-                goodsList.add(tGoods);
-            }
-        }
-        // 费用
-        List<TFees> feesList = new ArrayList<>();
-        List<Long> longList = StringUtils.integerDeduplication(feesId);
-        for (Long fees : longList) {
-            TFees tFees = tFeesMapper.selectTFeesById(fees);
-            if (StringUtils.isNotNull(tFees)) {
-                feesList.add(tFees);
-            }
-        }
-        map.put("corps", corpsList);
-        map.put("goodsList", goodsList);
-        map.put("feesList", feesList);
-        map.put("ftmsorderbills", ftmsorderbills); // 主表
-        map.put("ftmsorderbillsfees", ftmsorderbillsfeesList); // 费用
+        map.put("ftmsorderbillsfees", fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees)); // 费用
         return map;
     }
 
+    /**
+     *  费用提交、保存
+     *
+     * @param cars      主表信息
+     * @param status    状态
+     * @param fees      费用
+     * @return  结果
+     */
     @Override
-    public AjaxResult insertFTmsorderbillsfeesAdd(String Ftmsorderbillsfees) {
+    public AjaxResult insertFTmsorderbillsfeesAdd(String cars, long status, String fees) {
         Map<String, Object> map = new HashMap<>();
-        Long id =null;
+        Ftmsorderbillscars tmsorderbillscars = JSONArray.parseObject(cars, Ftmsorderbillscars.class);
+        Long pId = tmsorderbillscars.getId();
+        Long orgId = tmsorderbillscars.getOrgId();
         //  费用添加
-        if (StringUtils.isNotNull(Ftmsorderbillsfees) && !"[]".equals(Ftmsorderbillsfees)) {
-            JSONArray jsonDrArray = JSONArray.parseArray(Ftmsorderbillsfees);
+        if (StringUtils.isNotNull(fees) && !"[]".equals(fees)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> ftmsorderbillsfeesList = JSONObject.parseArray(jsonDrArray.toJSONString(), Ftmsorderbillsfees.class);
             // 删除1080数据 统一添加
-            id = ftmsorderbillsfeesList.get(0).getfPid();
-            fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPIdAndActId(id);
+            fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPIdAndActId(pId);
             for (Ftmsorderbillsfees ftmsorderbillsfees : ftmsorderbillsfeesList) {
                 // 只处理新追加的数据
                 if(null!=ftmsorderbillsfees.getActId() &&  ftmsorderbillsfees.getActId()==1090 ){
-                    ftmsorderbillsfees.setOrgId(ftmsorderbillsfees.getfPid());
-                    ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
+                    ftmsorderbillsfees.setfPid(pId);
+                    ftmsorderbillsfees.setOrgId(orgId);
+                    ftmsorderbillsfees.setfBillstatus(status);
                     ftmsorderbillsfees.setCreateTime(new Date());
+                    ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
                     fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
                 }
             }
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setfPid(id);
+        ftmsorderbillsfees.setfPid(pId);
         List<Ftmsorderbillsfees> ftmsorderbillsfeesListNew = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
         map.put("ftmsorderbillsfeesList",ftmsorderbillsfeesListNew);
         return AjaxResult.success("成功", map);

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

@@ -3,11 +3,12 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.basicData.mapper.FleetCarManageMapper">
-    
+
     <resultMap type="FleetCarManage" id="FleetCarManageResult">
         <result property="id"    column="id"    />
         <result property="fleetCompanyId"    column="fleet_company_id"    />
         <result property="carNum"    column="car_num"    />
+        <result property="driverId"    column="driver_id"    />
         <result property="driverName"    column="driver_name"    />
         <result property="hangNum"    column="hang_num"    />
         <result property="fuelType"    column="fuel_type"    />
@@ -49,15 +50,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFleetCarManageVo">
-        select id, fleet_company_id, car_num, driver_name ,hang_num, fuel_type, car_type, car_name, car_brand, manufacture_unit, office_of_certificate, pull_car_type, pull_car_shelf_num, mount_car_type, mount_car_num, engine, car_load_persion, buy_car_date, regiest_date, abandon_date, outer_size, sum_weight, vouch_weight, equip_weight, driving_license_src, driving_pendant_src, operation_license_src, technology_src, driving_load_src, second_lv_maintain_src, taffic_constranint_insurance_src, business_insurance_src, accpet_carrage_insurance_src, creat_time, modification_time, bill_status, del_flag, create_by, update_by, update_time, remarks from fleet_car_manage
+        select id, fleet_company_id, car_num, driver_id, driver_name, hang_num, fuel_type, car_type, car_name, car_brand, manufacture_unit, office_of_certificate, pull_car_type, pull_car_shelf_num, mount_car_type, mount_car_num, engine, car_load_persion, buy_car_date, regiest_date, abandon_date, outer_size, sum_weight, vouch_weight, equip_weight, driving_license_src, driving_pendant_src, operation_license_src, technology_src, driving_load_src, second_lv_maintain_src, taffic_constranint_insurance_src, business_insurance_src, accpet_carrage_insurance_src, creat_time, modification_time, bill_status, del_flag, create_by, update_by, update_time, remarks from fleet_car_manage
     </sql>
 
     <select id="selectFleetCarManageList" parameterType="FleetCarManage" resultMap="FleetCarManageResult">
         <include refid="selectFleetCarManageVo"/>
-        <where>  
+        <where>
             <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
             <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>
-            <if test="driverName != null  and driverName != ''"> and driver_name = #{driverName}</if>
+            <if test="driverId != null "> and driver_id = #{driverId}</if>
+            <if test="driverName != null  and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
             <if test="hangNum != null  and hangNum != ''"> and hang_num = #{hangNum}</if>
             <if test="fuelType != null  and fuelType != ''"> and fuel_type = #{fuelType}</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
@@ -93,7 +95,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
-    
+
+    <select id="selectFleetCarManageIdNameList" resultType="FleetCarManage" resultMap="FleetCarManageResult">
+        select id, fleet_company_id, car_num, car_name, driver_id from fleet_car_manage
+        <where>
+            <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
+            <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>
+            <if test="driverId != null "> and driver_id = #{driverId}</if>
+            <if test="driverName != null  and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
+            <if test="hangNum != null  and hangNum != ''"> and hang_num = #{hangNum}</if>
+            <if test="fuelType != null  and fuelType != ''"> and fuel_type = #{fuelType}</if>
+            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
+            <if test="carName != null  and carName != ''"> and car_name like concat('%', #{carName}, '%')</if>
+            <if test="carBrand != null  and carBrand != ''"> and car_brand = #{carBrand}</if>
+            <if test="manufactureUnit != null  and manufactureUnit != ''"> and manufacture_unit = #{manufactureUnit}</if>
+            <if test="officeOfCertificate != null  and officeOfCertificate != ''"> and office_of_certificate = #{officeOfCertificate}</if>
+            <if test="pullCarType != null  and pullCarType != ''"> and pull_car_type = #{pullCarType}</if>
+            <if test="pullCarShelfNum != null  and pullCarShelfNum != ''"> and pull_car_shelf_num = #{pullCarShelfNum}</if>
+            <if test="mountCarType != null  and mountCarType != ''"> and mount_car_type = #{mountCarType}</if>
+            <if test="mountCarNum != null  and mountCarNum != ''"> and mount_car_num = #{mountCarNum}</if>
+            <if test="engine != null  and engine != ''"> and engine = #{engine}</if>
+            <if test="carLoadPersion != null "> and car_load_persion = #{carLoadPersion}</if>
+            <if test="buyCarDate != null "> and buy_car_date = #{buyCarDate}</if>
+            <if test="regiestDate != null "> and regiest_date = #{regiestDate}</if>
+            <if test="abandonDate != null "> and abandon_date = #{abandonDate}</if>
+            <if test="outerSize != null "> and outer_size = #{outerSize}</if>
+            <if test="sumWeight != null "> and sum_weight = #{sumWeight}</if>
+            <if test="vouchWeight != null "> and vouch_weight = #{vouchWeight}</if>
+            <if test="equipWeight != null "> and equip_weight = #{equipWeight}</if>
+            <if test="drivingLicenseSrc != null  and drivingLicenseSrc != ''"> and driving_license_src = #{drivingLicenseSrc}</if>
+            <if test="drivingPendantSrc != null  and drivingPendantSrc != ''"> and driving_pendant_src = #{drivingPendantSrc}</if>
+            <if test="operationLicenseSrc != null  and operationLicenseSrc != ''"> and operation_license_src = #{operationLicenseSrc}</if>
+            <if test="technologySrc != null  and technologySrc != ''"> and technology_src = #{technologySrc}</if>
+            <if test="drivingLoadSrc != null  and drivingLoadSrc != ''"> and driving_load_src = #{drivingLoadSrc}</if>
+            <if test="secondLvMaintainSrc != null  and secondLvMaintainSrc != ''"> and second_lv_maintain_src = #{secondLvMaintainSrc}</if>
+            <if test="tafficConstranintInsuranceSrc != null  and tafficConstranintInsuranceSrc != ''"> and taffic_constranint_insurance_src = #{tafficConstranintInsuranceSrc}</if>
+            <if test="businessInsuranceSrc != null  and businessInsuranceSrc != ''"> and business_insurance_src = #{businessInsuranceSrc}</if>
+            <if test="accpetCarrageInsuranceSrc != null  and accpetCarrageInsuranceSrc != ''"> and accpet_carrage_insurance_src = #{accpetCarrageInsuranceSrc}</if>
+            <if test="creatTime != null "> and creat_time = #{creatTime}</if>
+            <if test="modificationTime != null "> and modification_time = #{modificationTime}</if>
+            <if test="billStatus != null "> and bill_status = #{billStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+
     <select id="selectFleetCarManageById" parameterType="Long" resultMap="FleetCarManageResult">
         <include refid="selectFleetCarManageVo"/>
         where id = #{id}
@@ -104,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fleetCompanyId != null">fleet_company_id,</if>
             <if test="carNum != null">car_num,</if>
+            <if test="driverId != null">driver_id,</if>
             <if test="driverName != null">driver_name,</if>
             <if test="hangNum != null">hang_num,</if>
             <if test="fuelType != null">fuel_type,</if>
@@ -142,10 +188,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remarks != null">remarks,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fleetCompanyId != null">#{fleetCompanyId},</if>
             <if test="carNum != null">#{carNum},</if>
+            <if test="driverId != null">#{driverId},</if>
             <if test="driverName != null">#{driverName},</if>
             <if test="hangNum != null">#{hangNum},</if>
             <if test="fuelType != null">#{fuelType},</if>
@@ -184,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remarks != null">#{remarks},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFleetCarManage" parameterType="FleetCarManage">
@@ -192,6 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="fleetCompanyId != null">fleet_company_id = #{fleetCompanyId},</if>
             <if test="carNum != null">car_num = #{carNum},</if>
+            <if test="driverId != null">driver_id = #{driverId},</if>
             <if test="driverName != null">driver_name = #{driverName},</if>
             <if test="hangNum != null">hang_num = #{hangNum},</if>
             <if test="fuelType != null">fuel_type = #{fuelType},</if>

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

@@ -92,7 +92,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFleetCompanyMsgVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="selectFleetCompanyMsgIdNameList" resultType="FleetCompanyMsg" resultMap="FleetCompanyMsgResult">
+        select id, company_name from fleet_company_msg
+        <where>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="loginAccount != null  and loginAccount != ''"> and login_account = #{loginAccount}</if>
+            <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
+            <if test="openingBank != null  and openingBank != ''"> and opening_bank = #{openingBank}</if>
+            <if test="bankAccount != null  and bankAccount != ''"> and bank_account = #{bankAccount}</if>
+            <if test="creditLv != null  and creditLv != ''"> and credit_lv = #{creditLv}</if>
+            <if test="paymentDays != null "> and payment_days = #{paymentDays}</if>
+            <if test="carNum != null "> and car_num = #{carNum}</if>
+            <if test="linkMan != null  and linkMan != ''"> and link_man = #{linkMan}</if>
+            <if test="linkPhone != null  and linkPhone != ''"> and link_phone = #{linkPhone}</if>
+            <if test="fax != null  and fax != ''"> and fax = #{fax}</if>
+            <if test="email != null  and email != ''"> and email = #{email}</if>
+            <if test="headOffice != null  and headOffice != ''"> and head_office = #{headOffice}</if>
+            <if test="registerdCapital != null  and registerdCapital != ''"> and registerd_capital = #{registerdCapital}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
+            <if test="insdustry != null  and insdustry != ''"> and insdustry = #{insdustry}</if>
+            <if test="creditNum != null  and creditNum != ''"> and credit_num = #{creditNum}</if>
+            <if test="taxpayerNum != null  and taxpayerNum != ''"> and taxpayer_num = #{taxpayerNum}</if>
+            <if test="industryCommerceNum != null  and industryCommerceNum != ''"> and industry_commerce_num = #{industryCommerceNum}</if>
+            <if test="organizationNum != null  and organizationNum != ''"> and organization_num = #{organizationNum}</if>
+            <if test="registerOrganization != null  and registerOrganization != ''"> and register_organization = #{registerOrganization}</if>
+            <if test="dateOfEstablishment != null "> and date_of_establishment = #{dateOfEstablishment}</if>
+            <if test="companyType != null  and companyType != ''"> and company_type = #{companyType}</if>
+            <if test="businessDeadline != null "> and business_deadline = #{businessDeadline}</if>
+            <if test="businessArea != null  and businessArea != ''"> and business_area = #{businessArea}</if>
+            <if test="annualDate != null "> and annual_date = #{annualDate}</if>
+            <if test="registerdAddress != null  and registerdAddress != ''"> and registerd_address = #{registerdAddress}</if>
+            <if test="manageScope != null  and manageScope != ''"> and manage_scope = #{manageScope}</if>
+            <if test="creatTime != null "> and creat_time = #{creatTime}</if>
+            <if test="modificationTime != null "> and modification_time = #{modificationTime}</if>
+            <if test="billStatus != null "> and bill_status = #{billStatus}</if>
+        </where>
+    </select>
+
     <insert id="insertFleetCompanyMsg" parameterType="FleetCompanyMsg" useGeneratedKeys="true" keyProperty="id">
         insert into fleet_company_msg
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -51,7 +51,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
-    
+
+    <select id="selectFleetDriverMsgIdNameList" resultType="FleetDriverMsg" resultMap="FleetDriverMsgResult">
+        select id, fleet_company_id, name, tel from fleet_driver_msg
+        <where>
+            <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null "> and sex = #{sex}</if>
+            <if test="birthday != null "> and birthday = #{birthday}</if>
+            <if test="allowDriverCar != null  and allowDriverCar != ''"> and allow_driver_car = #{allowDriverCar}</if>
+            <if test="firstCertificateDate != null "> and first_certificate_date = #{firstCertificateDate}</if>
+            <if test="idcarNum != null  and idcarNum != ''"> and idcar_num = #{idcarNum}</if>
+            <if test="tel != null  and tel != ''"> and tel = #{tel}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="resumePic != null  and resumePic != ''"> and resume_pic = #{resumePic}</if>
+            <if test="drivingPic != null  and drivingPic != ''"> and driving_pic = #{drivingPic}</if>
+            <if test="creatTime != null "> and creat_time = #{creatTime}</if>
+            <if test="modificationTime != null "> and modification_time = #{modificationTime}</if>
+            <if test="billStatus != null "> and bill_status = #{billStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+
     <select id="selectFleetDriverMsgById" parameterType="Long" resultMap="FleetDriverMsgResult">
         <include refid="selectFleetDriverMsgVo"/>
         where id = #{id}
@@ -139,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
     <select id="selectFleetDriverMsgListMap" parameterType="FleetDriverMsg" resultType="Map">
         SELECT
             dri.id AS id,

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

@@ -139,12 +139,14 @@
             f.contract_no AS contractNo,
             f.accstl_type AS accstlType,
             f.accdays,
+            f.load_date AS loadDate,
             f.load_addr AS loadAddr,
             f.md_load_addr AS mdLoadAddr,
             f.un_load_addr AS unLoadAddr,
             g.f_name AS goodsId,
             f.goods_price AS goodsPrice,
             f.mblno,
+            f.remarks,
             f.qty_plan AS qtyPlan,
             f.qty_dis_patch AS qtyDisPatch,
             f.weight_plan AS weightPlan,

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

@@ -382,10 +382,37 @@
             c.carreg_no carregNo,
             c.order_status orderStatus,
             p.f_name corpId,
-            t.bill_type billType,
-            t.trans_type transType,
-            t.trans_prop transProp,
+            CASE
+            t.bill_type
+            WHEN 1 THEN
+            '进口'
+            WHEN 2 THEN
+            '出口'
+            WHEN 3 THEN
+            '内贸'
+            WHEN 4 THEN
+            '其他'
+            END billType,
+            CASE
+            t.trans_type
+            WHEN 1 THEN
+            '集装箱'
+            WHEN 2 THEN
+            '搭建'
+            WHEN 3 THEN
+            '散货'
+            END transType,
+            CASE
+            t.trans_type
+            WHEN 1 THEN
+            '重去重回'
+            WHEN 2 THEN
+            '重去空回'
+            WHEN 3 THEN
+            '空去重回'
+            END transProp,
             g.f_name goodsId,
+            c.cntr_weight cntrWeight,
             t.qty_plan qtyPlan,
             t.weight_plan weightPlan,
             t.ysl,
@@ -404,7 +431,11 @@
             t.un_load_date tUnLoadDate,
             t.un_load_attn unLoadAttn,
             t.un_load_attn_tel unLoadAttnTel,
+            dic.dict_label cntrId,
+            pol.dict_label polId,
+            pod.dict_label podId,
             c.accept_date acceptDate,
+            c.cntr_qty cntrQty,
             c.off_data offData,
             c.load_date cLoadDate,
             c.md_load_date mdLoadDate,
@@ -416,6 +447,12 @@
             LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id
             LEFT JOIN t_corps p ON p.f_id = t.corp_id
             LEFT JOIN t_goods g ON g.f_id = t.goods_id
+            LEFT JOIN sys_dict_data pol ON pol.dict_value = t.pol_id
+            AND pol.dict_type = 'port_start'
+            LEFT JOIN sys_dict_data pod ON pod.dict_value = t.pod_id
+            AND pod.dict_type = 'port_end'
+            LEFT JOIN sys_dict_data dic ON dic.dict_value = c.cntr_id
+            AND dic.dict_type = 'data_cntrId'
         <where>
             <if test="corpId != null"> and t.corp_id = #{corpId}</if>
             <if test="billType != null"> and t.bill_type = #{billType}</if>
@@ -441,6 +478,7 @@
             <if test="unLoadAddr != null  and unLoadAddr != ''"> and t.un_load_addr like concat('%', #{unLoadAddr}, '%')</if>
             <if test="mdLoadAddr != null  and mdLoadAddr != ''"> and t.md_load_addr like concat('%', #{mdLoadAddr}, '%')</if>
         </where>
+            ORDER BY c.id desc
     </select>
 
     <select id="selectftmsorderbillscarsById" parameterType="Long" resultMap="ftmsorderbillscarsResult">
@@ -462,6 +500,7 @@
             org_id = #{id}
             AND order_status &gt;= 30
     </select>
+
     <select id="selectTmsorderbillsCarsByDriver" parameterType="Long" resultType="Map">
         SELECT
             c.id,
@@ -480,6 +519,9 @@
             t.bill_type AS billType,
             t.trans_type AS transType,
             t.trans_prop AS transProp,
+            t.md_load_addr AS tMdLoadAddr,
+            t.md_load_attn AS tMdLoadAttn,
+            t.md_load_date AS tMdLoadDate,
             t.load_addr AS tLoadAddr,
             t.load_date AS tLoadDate,
             t.load_attn AS loadAttn,
@@ -524,6 +566,20 @@
             c.id = #{id}
     </select>
 
+    <select id="selectMonthlyOrder" parameterType="ftmsorderbillscars" resultType="Map">
+        SELECT count( p_id ) countOrders, IFNULL(SUM( miles ),0) miles, IFNULL(SUM( freight_amt_dr ), 0) freightAmtDr
+        FROM F_TMSORDERBILLSCARS
+        <where>
+            driver_tel = #{driverTel}
+            <if test='monthList != null and monthList[0] != null and monthList[0]!= ""'>
+                and create_time &gt;= #{monthList[0]}
+            </if>
+            <if test='monthList != null and monthList[1] != null and monthList[1]!= ""'>
+                and create_time &lt;= #{monthList[1]}
+            </if>
+        </where>
+    </select>
+
     <insert id="insertftmsorderbillscars" parameterType="ftmsorderbillscars" useGeneratedKeys="true" keyProperty="id">
         insert into F_TMSORDERBILLSCARS
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -73,12 +73,14 @@
             f.contract_no AS contractNo,
             f.accstl_type AS accstlType,
             f.accdays,
+            m.company_name AS carcorPid,
             f.load_addr AS loadAddr,
             f.md_load_addr AS mdLoadAddr,
             f.un_load_addr AS unLoadAddr,
             g.f_name AS goodsId,
             f.goods_price AS goodsPrice,
             f.mblno,
+            f.load_date AS loadDate,
             f.qty_plan AS qtyPlan,
             f.qty_dis_patch AS qtyDisPatch,
             f.weight_plan AS weightPlan,
@@ -87,7 +89,7 @@
             f.bill_status AS billStatus,
             u.nick_name AS createBy,
             f.create_time AS createTime
-        FROM
+            FROM
             F_TMSORDERBILLSPLANS plan
             LEFT JOIN F_TMSORDERBILLS f ON f.id = plan.org_id
             LEFT JOIN sys_dict_data type ON type.dict_type = 'data_billType'
@@ -96,6 +98,7 @@
             AND trans.dict_value = f.trans_type
             LEFT JOIN sys_dict_data prop ON prop.dict_type = 'data_transProp'
             AND prop.dict_value = f.trans_prop
+            LEFT JOIN fleet_company_msg m ON m.id = plan.carcor_pid
             LEFT JOIN t_corps c ON c.f_id = f.corp_id
             LEFT JOIN sys_user p ON p.user_id = f.plan_user_id
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id