[CODE]: 财务从表主键自增

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.fleet.compayMsg;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -8,14 +9,7 @@ import com.ruoyi.orderManagement.domain.FleetCarManage;
 import com.ruoyi.orderManagement.service.IFleetCarManageService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -42,7 +36,8 @@ public class FleetCarManageController extends BaseController
     public TableDataInfo list(FleetCarManage fleetCarManage)
     {
         startPage();
-        List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageList(fleetCarManage);
+        //List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageList(fleetCarManage);
+        List<Map<String, Object>> list = fleetCarManageService.selectFleetCarManageListMap(fleetCarManage);
         return getDataTable(list);
     }
 
@@ -54,7 +49,8 @@ public class FleetCarManageController extends BaseController
     public TableDataInfo query(FleetCarManage fleetCarManage)
     {
         startPage();
-        List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageList(fleetCarManage);
+        //List<FleetCarManage> list = fleetCarManageService.selectFleetCarManageList(fleetCarManage);
+        List<Map<String, Object>> list = fleetCarManageService.selectFleetCarManageListMap(fleetCarManage);
         return getDataTable(list);
     }
 
@@ -84,15 +80,24 @@ public class FleetCarManageController extends BaseController
     /**
      * 新增【车辆】
      */
-    @PreAuthorize("@ss.hasPermi('fleet:carManage:add')")
+    /*@PreAuthorize("@ss.hasPermi('fleet:carManage:add')")
     @Log(title = "【车辆】", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody FleetCarManage fleetCarManage)
     {
-        fleetCarManage.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(fleetCarManageService.insertFleetCarManage(fleetCarManage));
+
+        return fleetCarManageService.insertFleetCarManage(fleetCarManage);
+    }*/
+    @PreAuthorize("@ss.hasPermi('fleet:carManage:add')")
+    @Log(title = "【车辆】", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestParam("fleetCarManage") String fleetCarManage,
+                          @RequestParam("fTmsorderbillsattachs") String fTmsorderbillsattachs )
+    {
+        return fleetCarManageService.insertFleetCarManageAdd(fleetCarManage,fTmsorderbillsattachs);
     }
 
+
     /**
      * 修改【车辆】
      */

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.fleet.compayMsg;
 
 import java.util.List;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
@@ -89,8 +90,11 @@ public class FleetCompanyMsgController extends BaseController
     @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody FleetCompanyMsg fleetCompanyMsg)
     {
-        fleetCompanyMsg.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(fleetCompanyMsgService.insertFleetCompanyMsg(fleetCompanyMsg));
+        // 校验车队唯一
+        if (UserConstants.NOT_UNIQUE.equals(fleetCompanyMsgService.checkUFNoUnique(fleetCompanyMsg))) {
+            return AjaxResult.error("新增车队'" + fleetCompanyMsg.getCompanyName() + "'失败，名称已存在");
+        }
+        return fleetCompanyMsgService.insertFleetCompanyMsg(fleetCompanyMsg);
     }
 
     /**

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

@@ -2,10 +2,12 @@ package com.ruoyi.web.controller.fleet.compayMsg;
 
 import java.util.List;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.orderManagement.domain.FleetDriverMsg;
 import com.ruoyi.orderManagement.service.IFleetDriverMsgService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,9 @@ public class FleetDriverMsgController extends BaseController
     @Autowired
     private IFleetDriverMsgService fleetDriverMsgService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询【司机】列表
      */
@@ -86,8 +91,13 @@ public class FleetDriverMsgController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FleetDriverMsg fleetDriverMsg)
     {
-        fleetDriverMsg.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(fleetDriverMsgService.insertFleetDriverMsg(fleetDriverMsg));
+        if(fleetDriverMsg.getId()==null && fleetDriverMsg.getId().equals("")){
+            //检验登录名  唯一
+            if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(fleetDriverMsg.getTel()))) {
+                return AjaxResult.error("新增用户'" + fleetDriverMsg.getTel() + "'失败，登录账号已存在");
+            }
+        }
+        return fleetDriverMsgService.insertFleetDriverMsg(fleetDriverMsg);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTableSetController.java

@@ -23,12 +23,13 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-01-30
  */
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+//@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/set")
 public class SysTableSetController extends BaseController {
 
-    private final ISysTableSetService iSysTableSetService;
+    @Autowired
+    private  ISysTableSetService iSysTableSetService;
 
     /**
      * 查询列宽修改列表

ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,11 +7,15 @@ spring:
       # 主库数据源
       master:
 #        url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://115.29.151.39:3306/Test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-        username: taidongerp
-        password: liyuan@erp
+#        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+##        url: jdbc:mysql://115.29.151.39:3306/Test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+##        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#        username: taidongerp
+#        password: liyuan@erp
+        url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: root
+
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

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

@@ -0,0 +1,598 @@
+package com.ruoyi.orderManagement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 【车辆】对象 fleet_car_manage
+ * 
+ * @author ruoyi
+ * @date 2021-03-04
+ */
+public class FleetCarManage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 车队id */
+    @Excel(name = "车队id")
+    private Long fleetCompanyId;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carNum;
+
+    /** 挂号 */
+    @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 */
+    @Excel(name = "外阔尺寸mm")
+    private Long outerSize;
+
+    /** 总重量kg */
+    @Excel(name = "总重量kg")
+    private Long sumWeight;
+
+    /** 核定重量kg */
+    @Excel(name = "核定重量kg")
+    private Long vouchWeight;
+
+    /** 装备质量kg */
+    @Excel(name = "装备质量kg")
+    private Long equipWeight;
+
+    /** 行驶证头src */
+    @Excel(name = "行驶证头src")
+    private String drivingLicenseSrc;
+
+    /** 行驶证挂件src */
+    @Excel(name = "行驶证挂件src")
+    private String drivingPendantSrc;
+
+    /** 运营证头src */
+    @Excel(name = "运营证头src")
+    private String operationLicenseSrc;
+
+    /** 技术评定证书src */
+    @Excel(name = "技术评定证书src")
+    private String technologySrc;
+
+    /** 营运挂载src */
+    @Excel(name = "营运挂载src")
+    private String drivingLoadSrc;
+
+    /** 二级维护src */
+    @Excel(name = "二级维护src")
+    private String secondLvMaintainSrc;
+
+    /** 交强险src */
+    @Excel(name = "交强险src")
+    private String tafficConstranintInsuranceSrc;
+
+    /** 商业保险src */
+    @Excel(name = "商业保险src")
+    private String businessInsuranceSrc;
+
+    /** 承运人保险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;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFleetCompanyId(Long fleetCompanyId) 
+    {
+        this.fleetCompanyId = fleetCompanyId;
+    }
+
+    public Long getFleetCompanyId() 
+    {
+        return fleetCompanyId;
+    }
+    public void setCarNum(String carNum) 
+    {
+        this.carNum = carNum;
+    }
+
+    public String getCarNum() 
+    {
+        return carNum;
+    }
+    public void setHangNum(String hangNum) 
+    {
+        this.hangNum = hangNum;
+    }
+
+    public String getHangNum() 
+    {
+        return hangNum;
+    }
+    public void setFuelType(String fuelType) 
+    {
+        this.fuelType = fuelType;
+    }
+
+    public String getFuelType() 
+    {
+        return fuelType;
+    }
+    public void setCarType(String carType) 
+    {
+        this.carType = carType;
+    }
+
+    public String getCarType() 
+    {
+        return carType;
+    }
+    public void setCarName(String carName) 
+    {
+        this.carName = carName;
+    }
+
+    public String getCarName() 
+    {
+        return carName;
+    }
+    public void setCarBrand(String carBrand) 
+    {
+        this.carBrand = carBrand;
+    }
+
+    public String getCarBrand() 
+    {
+        return carBrand;
+    }
+    public void setManufactureUnit(String manufactureUnit) 
+    {
+        this.manufactureUnit = manufactureUnit;
+    }
+
+    public String getManufactureUnit() 
+    {
+        return manufactureUnit;
+    }
+    public void setOfficeOfCertificate(String officeOfCertificate) 
+    {
+        this.officeOfCertificate = officeOfCertificate;
+    }
+
+    public String getOfficeOfCertificate() 
+    {
+        return officeOfCertificate;
+    }
+    public void setPullCarType(String pullCarType) 
+    {
+        this.pullCarType = pullCarType;
+    }
+
+    public String getPullCarType() 
+    {
+        return pullCarType;
+    }
+    public void setPullCarShelfNum(String pullCarShelfNum) 
+    {
+        this.pullCarShelfNum = pullCarShelfNum;
+    }
+
+    public String getPullCarShelfNum() 
+    {
+        return pullCarShelfNum;
+    }
+    public void setMountCarType(String mountCarType) 
+    {
+        this.mountCarType = mountCarType;
+    }
+
+    public String getMountCarType() 
+    {
+        return mountCarType;
+    }
+    public void setMountCarNum(String mountCarNum) 
+    {
+        this.mountCarNum = mountCarNum;
+    }
+
+    public String getMountCarNum() 
+    {
+        return mountCarNum;
+    }
+    public void setEngine(String engine) 
+    {
+        this.engine = engine;
+    }
+
+    public String getEngine() 
+    {
+        return engine;
+    }
+    public void setCarLoadPersion(Long carLoadPersion) 
+    {
+        this.carLoadPersion = carLoadPersion;
+    }
+
+    public Long getCarLoadPersion() 
+    {
+        return carLoadPersion;
+    }
+    public void setBuyCarDate(Date buyCarDate) 
+    {
+        this.buyCarDate = buyCarDate;
+    }
+
+    public Date getBuyCarDate() 
+    {
+        return buyCarDate;
+    }
+    public void setRegiestDate(Date regiestDate) 
+    {
+        this.regiestDate = regiestDate;
+    }
+
+    public Date getRegiestDate() 
+    {
+        return regiestDate;
+    }
+    public void setAbandonDate(Date abandonDate) 
+    {
+        this.abandonDate = abandonDate;
+    }
+
+    public Date getAbandonDate() 
+    {
+        return abandonDate;
+    }
+    public void setOuterSize(Long outerSize) 
+    {
+        this.outerSize = outerSize;
+    }
+
+    public Long getOuterSize() 
+    {
+        return outerSize;
+    }
+    public void setSumWeight(Long sumWeight) 
+    {
+        this.sumWeight = sumWeight;
+    }
+
+    public Long getSumWeight() 
+    {
+        return sumWeight;
+    }
+    public void setVouchWeight(Long vouchWeight) 
+    {
+        this.vouchWeight = vouchWeight;
+    }
+
+    public Long getVouchWeight() 
+    {
+        return vouchWeight;
+    }
+    public void setEquipWeight(Long equipWeight) 
+    {
+        this.equipWeight = equipWeight;
+    }
+
+    public Long getEquipWeight() 
+    {
+        return equipWeight;
+    }
+    public void setDrivingLicenseSrc(String drivingLicenseSrc) 
+    {
+        this.drivingLicenseSrc = drivingLicenseSrc;
+    }
+
+    public String getDrivingLicenseSrc() 
+    {
+        return drivingLicenseSrc;
+    }
+    public void setDrivingPendantSrc(String drivingPendantSrc) 
+    {
+        this.drivingPendantSrc = drivingPendantSrc;
+    }
+
+    public String getDrivingPendantSrc() 
+    {
+        return drivingPendantSrc;
+    }
+    public void setOperationLicenseSrc(String operationLicenseSrc) 
+    {
+        this.operationLicenseSrc = operationLicenseSrc;
+    }
+
+    public String getOperationLicenseSrc() 
+    {
+        return operationLicenseSrc;
+    }
+    public void setTechnologySrc(String technologySrc) 
+    {
+        this.technologySrc = technologySrc;
+    }
+
+    public String getTechnologySrc() 
+    {
+        return technologySrc;
+    }
+    public void setDrivingLoadSrc(String drivingLoadSrc) 
+    {
+        this.drivingLoadSrc = drivingLoadSrc;
+    }
+
+    public String getDrivingLoadSrc() 
+    {
+        return drivingLoadSrc;
+    }
+    public void setSecondLvMaintainSrc(String secondLvMaintainSrc) 
+    {
+        this.secondLvMaintainSrc = secondLvMaintainSrc;
+    }
+
+    public String getSecondLvMaintainSrc() 
+    {
+        return secondLvMaintainSrc;
+    }
+    public void setTafficConstranintInsuranceSrc(String tafficConstranintInsuranceSrc) 
+    {
+        this.tafficConstranintInsuranceSrc = tafficConstranintInsuranceSrc;
+    }
+
+    public String getTafficConstranintInsuranceSrc() 
+    {
+        return tafficConstranintInsuranceSrc;
+    }
+    public void setBusinessInsuranceSrc(String businessInsuranceSrc) 
+    {
+        this.businessInsuranceSrc = businessInsuranceSrc;
+    }
+
+    public String getBusinessInsuranceSrc() 
+    {
+        return businessInsuranceSrc;
+    }
+    public void setAccpetCarrageInsuranceSrc(String accpetCarrageInsuranceSrc) 
+    {
+        this.accpetCarrageInsuranceSrc = accpetCarrageInsuranceSrc;
+    }
+
+    public String getAccpetCarrageInsuranceSrc() 
+    {
+        return accpetCarrageInsuranceSrc;
+    }
+    public void setCreatTime(Date creatTime) 
+    {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime() 
+    {
+        return creatTime;
+    }
+    public void setModificationTime(Date modificationTime) 
+    {
+        this.modificationTime = modificationTime;
+    }
+
+    public Date getModificationTime() 
+    {
+        return modificationTime;
+    }
+    public void setBillStatus(Long billStatus) 
+    {
+        this.billStatus = billStatus;
+    }
+
+    public Long getBillStatus() 
+    {
+        return billStatus;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    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;
+    }
+
+    @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();
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/FleetCompanyMsg.java

@@ -0,0 +1,554 @@
+package com.ruoyi.orderManagement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 【车队】对象 fleet_company_msg
+ * 
+ * @author ruoyi
+ * @date 2021-03-04
+ */
+public class FleetCompanyMsg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyName;
+
+    /** 登陆账号 */
+    @Excel(name = "登陆账号")
+    private String loginAccount;
+
+    /** 公司地址 */
+    @Excel(name = "公司地址")
+    private String companyAddress;
+
+    /** 公司开户行 */
+    @Excel(name = "公司开户行")
+    private String openingBank;
+
+    /** 银行账号 */
+    @Excel(name = "银行账号")
+    private String bankAccount;
+
+    /** 信用等级 */
+    @Excel(name = "信用等级")
+    private String creditLv;
+
+    /** 账期天数(订单结束后最迟结款天数)  */
+    @Excel(name = "账期天数(订单结束后最迟结款天数) ")
+    private Long paymentDays;
+
+    /** 公司车辆数 */
+    @Excel(name = "公司车辆数")
+    private Long carNum;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkMan;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String linkPhone;
+
+    /** 传真 */
+    @Excel(name = "传真")
+    private String fax;
+
+    /** email */
+    @Excel(name = "email")
+    private String email;
+
+    /** 总公司 */
+    @Excel(name = "总公司")
+    private String headOffice;
+
+    /** 注册资本 */
+    @Excel(name = "注册资本")
+    private String registerdCapital;
+
+    /** 法人 */
+    @Excel(name = "法人")
+    private String legalPerson;
+
+    /** 所属行业 */
+    @Excel(name = "所属行业")
+    private String insdustry;
+
+    /** 社会统一信用代码 */
+    @Excel(name = "社会统一信用代码")
+    private String creditNum;
+
+    /** 纳税人识别号 */
+    @Excel(name = "纳税人识别号")
+    private String taxpayerNum;
+
+    /** 工商注册号 */
+    @Excel(name = "工商注册号")
+    private String industryCommerceNum;
+
+    /** 组织机构代码 */
+    @Excel(name = "组织机构代码")
+    private String organizationNum;
+
+    /** 登记机关 */
+    @Excel(name = "登记机关")
+    private String registerOrganization;
+
+    /** 成立日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateOfEstablishment;
+
+    /** 企业类型 */
+    @Excel(name = "企业类型")
+    private String companyType;
+
+    /** 营业期限 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业期限", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date businessDeadline;
+
+    /** 营业区域 */
+    @Excel(name = "营业区域")
+    private String businessArea;
+
+    /** 审核年检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核年检日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date annualDate;
+
+    /** 注册地址 */
+    @Excel(name = "注册地址")
+    private String registerdAddress;
+
+    /** 经营范围 */
+    @Excel(name = "经营范围")
+    private String manageScope;
+
+    /** 创建时间 */
+    @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;
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "状态")
+    private Long billStatus;
+
+    /**
+     * 删除状态
+     */
+    private String delFlag;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCompanyName(String companyName) 
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() 
+    {
+        return companyName;
+    }
+    public void setLoginAccount(String loginAccount) 
+    {
+        this.loginAccount = loginAccount;
+    }
+
+    public String getLoginAccount() 
+    {
+        return loginAccount;
+    }
+    public void setCompanyAddress(String companyAddress) 
+    {
+        this.companyAddress = companyAddress;
+    }
+
+    public String getCompanyAddress() 
+    {
+        return companyAddress;
+    }
+    public void setOpeningBank(String openingBank) 
+    {
+        this.openingBank = openingBank;
+    }
+
+    public String getOpeningBank() 
+    {
+        return openingBank;
+    }
+    public void setBankAccount(String bankAccount) 
+    {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBankAccount() 
+    {
+        return bankAccount;
+    }
+    public void setCreditLv(String creditLv) 
+    {
+        this.creditLv = creditLv;
+    }
+
+    public String getCreditLv() 
+    {
+        return creditLv;
+    }
+    public void setPaymentDays(Long paymentDays) 
+    {
+        this.paymentDays = paymentDays;
+    }
+
+    public Long getPaymentDays() 
+    {
+        return paymentDays;
+    }
+    public void setCarNum(Long carNum) 
+    {
+        this.carNum = carNum;
+    }
+
+    public Long getCarNum() 
+    {
+        return carNum;
+    }
+    public void setLinkMan(String linkMan) 
+    {
+        this.linkMan = linkMan;
+    }
+
+    public String getLinkMan() 
+    {
+        return linkMan;
+    }
+    public void setLinkPhone(String linkPhone) 
+    {
+        this.linkPhone = linkPhone;
+    }
+
+    public String getLinkPhone() 
+    {
+        return linkPhone;
+    }
+    public void setFax(String fax) 
+    {
+        this.fax = fax;
+    }
+
+    public String getFax() 
+    {
+        return fax;
+    }
+    public void setEmail(String email) 
+    {
+        this.email = email;
+    }
+
+    public String getEmail() 
+    {
+        return email;
+    }
+    public void setHeadOffice(String headOffice) 
+    {
+        this.headOffice = headOffice;
+    }
+
+    public String getHeadOffice() 
+    {
+        return headOffice;
+    }
+    public void setRegisterdCapital(String registerdCapital) 
+    {
+        this.registerdCapital = registerdCapital;
+    }
+
+    public String getRegisterdCapital() 
+    {
+        return registerdCapital;
+    }
+    public void setLegalPerson(String legalPerson) 
+    {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getLegalPerson() 
+    {
+        return legalPerson;
+    }
+    public void setInsdustry(String insdustry) 
+    {
+        this.insdustry = insdustry;
+    }
+
+    public String getInsdustry() 
+    {
+        return insdustry;
+    }
+    public void setCreditNum(String creditNum) 
+    {
+        this.creditNum = creditNum;
+    }
+
+    public String getCreditNum() 
+    {
+        return creditNum;
+    }
+    public void setTaxpayerNum(String taxpayerNum) 
+    {
+        this.taxpayerNum = taxpayerNum;
+    }
+
+    public String getTaxpayerNum() 
+    {
+        return taxpayerNum;
+    }
+    public void setIndustryCommerceNum(String industryCommerceNum) 
+    {
+        this.industryCommerceNum = industryCommerceNum;
+    }
+
+    public String getIndustryCommerceNum() 
+    {
+        return industryCommerceNum;
+    }
+    public void setOrganizationNum(String organizationNum) 
+    {
+        this.organizationNum = organizationNum;
+    }
+
+    public String getOrganizationNum() 
+    {
+        return organizationNum;
+    }
+    public void setRegisterOrganization(String registerOrganization) 
+    {
+        this.registerOrganization = registerOrganization;
+    }
+
+    public String getRegisterOrganization() 
+    {
+        return registerOrganization;
+    }
+    public void setDateOfEstablishment(Date dateOfEstablishment) 
+    {
+        this.dateOfEstablishment = dateOfEstablishment;
+    }
+
+    public Date getDateOfEstablishment() 
+    {
+        return dateOfEstablishment;
+    }
+    public void setCompanyType(String companyType) 
+    {
+        this.companyType = companyType;
+    }
+
+    public String getCompanyType() 
+    {
+        return companyType;
+    }
+    public void setBusinessDeadline(Date businessDeadline) 
+    {
+        this.businessDeadline = businessDeadline;
+    }
+
+    public Date getBusinessDeadline() 
+    {
+        return businessDeadline;
+    }
+    public void setBusinessArea(String businessArea) 
+    {
+        this.businessArea = businessArea;
+    }
+
+    public String getBusinessArea() 
+    {
+        return businessArea;
+    }
+    public void setAnnualDate(Date annualDate) 
+    {
+        this.annualDate = annualDate;
+    }
+
+    public Date getAnnualDate() 
+    {
+        return annualDate;
+    }
+    public void setRegisterdAddress(String registerdAddress) 
+    {
+        this.registerdAddress = registerdAddress;
+    }
+
+    public String getRegisterdAddress() 
+    {
+        return registerdAddress;
+    }
+    public void setManageScope(String manageScope) 
+    {
+        this.manageScope = manageScope;
+    }
+
+    public String getManageScope() 
+    {
+        return manageScope;
+    }
+    public void setCreatTime(Date creatTime) 
+    {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime() 
+    {
+        return creatTime;
+    }
+    public void setModificationTime(Date modificationTime) 
+    {
+        this.modificationTime = modificationTime;
+    }
+
+    public Date getModificationTime() 
+    {
+        return modificationTime;
+    }
+
+    public Long getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(Long billStatus) {
+        this.billStatus = billStatus;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    @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;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyName", getCompanyName())
+            .append("loginAccount", getLoginAccount())
+            .append("companyAddress", getCompanyAddress())
+            .append("openingBank", getOpeningBank())
+            .append("bankAccount", getBankAccount())
+            .append("creditLv", getCreditLv())
+            .append("paymentDays", getPaymentDays())
+            .append("carNum", getCarNum())
+            .append("linkMan", getLinkMan())
+            .append("linkPhone", getLinkPhone())
+            .append("fax", getFax())
+            .append("email", getEmail())
+            .append("headOffice", getHeadOffice())
+            .append("registerdCapital", getRegisterdCapital())
+            .append("legalPerson", getLegalPerson())
+            .append("insdustry", getInsdustry())
+            .append("creditNum", getCreditNum())
+            .append("taxpayerNum", getTaxpayerNum())
+            .append("industryCommerceNum", getIndustryCommerceNum())
+            .append("organizationNum", getOrganizationNum())
+            .append("registerOrganization", getRegisterOrganization())
+            .append("dateOfEstablishment", getDateOfEstablishment())
+            .append("companyType", getCompanyType())
+            .append("businessDeadline", getBusinessDeadline())
+            .append("businessArea", getBusinessArea())
+            .append("annualDate", getAnnualDate())
+            .append("registerdAddress", getRegisterdAddress())
+            .append("manageScope", getManageScope())
+            .append("creatTime", getCreatTime())
+            .append("modificationTime", getModificationTime())
+            .toString();
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/FleetDriverMsg.java

@@ -0,0 +1,269 @@
+package com.ruoyi.orderManagement.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 【司机】对象 fleet_driver_msg
+ * 
+ * @author ruoyi
+ * @date 2021-03-04
+ */
+public class FleetDriverMsg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 驾驶员所属公司id */
+    @Excel(name = "驾驶员所属公司id")
+    private Long fleetCompanyId;
+
+    /** 驾驶员姓名 */
+    @Excel(name = "驾驶员姓名")
+    private String name;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private Integer sex;
+
+    /** 出生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    /** 准驾车型 */
+    @Excel(name = "准驾车型")
+    private String allowDriverCar;
+
+    /** 初次领证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "初次领证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date firstCertificateDate;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idcarNum;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String tel;
+
+    /** 家庭住址 */
+    @Excel(name = "家庭住址")
+    private String address;
+
+    /** 个人照片 */
+    @Excel(name = "个人照片")
+    private String resumePic;
+
+    /** 驾驶证照片 */
+    @Excel(name = "驾驶证照片")
+    private String drivingPic;
+
+    /** 创建时间 */
+    @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;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFleetCompanyId(Long fleetCompanyId) 
+    {
+        this.fleetCompanyId = fleetCompanyId;
+    }
+
+    public Long getFleetCompanyId() 
+    {
+        return fleetCompanyId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSex(Integer sex) 
+    {
+        this.sex = sex;
+    }
+
+    public Integer getSex() 
+    {
+        return sex;
+    }
+    public void setBirthday(Date birthday) 
+    {
+        this.birthday = birthday;
+    }
+
+    public Date getBirthday() 
+    {
+        return birthday;
+    }
+    public void setAllowDriverCar(String allowDriverCar) 
+    {
+        this.allowDriverCar = allowDriverCar;
+    }
+
+    public String getAllowDriverCar() 
+    {
+        return allowDriverCar;
+    }
+    public void setFirstCertificateDate(Date firstCertificateDate) 
+    {
+        this.firstCertificateDate = firstCertificateDate;
+    }
+
+    public Date getFirstCertificateDate() 
+    {
+        return firstCertificateDate;
+    }
+    public void setIdcarNum(String idcarNum) 
+    {
+        this.idcarNum = idcarNum;
+    }
+
+    public String getIdcarNum() 
+    {
+        return idcarNum;
+    }
+    public void setTel(String tel) 
+    {
+        this.tel = tel;
+    }
+
+    public String getTel() 
+    {
+        return tel;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setResumePic(String resumePic) 
+    {
+        this.resumePic = resumePic;
+    }
+
+    public String getResumePic() 
+    {
+        return resumePic;
+    }
+    public void setDrivingPic(String drivingPic) 
+    {
+        this.drivingPic = drivingPic;
+    }
+
+    public String getDrivingPic() 
+    {
+        return drivingPic;
+    }
+    public void setCreatTime(Date creatTime) 
+    {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime() 
+    {
+        return creatTime;
+    }
+    public void setModificationTime(Date modificationTime) 
+    {
+        this.modificationTime = modificationTime;
+    }
+
+    public Date getModificationTime() 
+    {
+        return modificationTime;
+    }
+    public void setBillStatus(Long billStatus) 
+    {
+        this.billStatus = billStatus;
+    }
+
+    public Long getBillStatus() 
+    {
+        return billStatus;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fleetCompanyId", getFleetCompanyId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("birthday", getBirthday())
+            .append("allowDriverCar", getAllowDriverCar())
+            .append("firstCertificateDate", getFirstCertificateDate())
+            .append("idcarNum", getIdcarNum())
+            .append("tel", getTel())
+            .append("address", getAddress())
+            .append("resumePic", getResumePic())
+            .append("drivingPic", getDrivingPic())
+            .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/orderManagement/mapper/FleetCarManageMapper.java

@@ -2,8 +2,10 @@ package com.ruoyi.orderManagement.mapper;
 
 
 import com.ruoyi.orderManagement.domain.FleetCarManage;
+import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【车辆】Mapper接口
@@ -29,6 +31,8 @@ public interface FleetCarManageMapper
      */
     public List<FleetCarManage> selectFleetCarManageList(FleetCarManage fleetCarManage);
 
+    public List<Map<String, Object>> selectFleetCarManageListMap(FleetCarManage fleetCarManage);
+
     /**
      * 新增【车辆】
      * 

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

@@ -1,8 +1,10 @@
 package com.ruoyi.orderManagement.mapper;
 
 
+import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【车队】Mapper接口
@@ -28,6 +30,8 @@ public interface FleetCompanyMsgMapper
      */
     public List<FleetCompanyMsg> selectFleetCompanyMsgList(FleetCompanyMsg fleetCompanyMsg);
 
+    public List<Map<String, Object>> selectFleetCompanyMsgListMap(FleetCompanyMsg fleetCompanyMsg);
+
     /**
      * 新增【车队】
      * 
@@ -59,4 +63,11 @@ public interface FleetCompanyMsgMapper
      * @return 结果
      */
     public int deleteFleetCompanyMsgByIds(Long[] ids);
+
+    /**
+     *  检验编号唯一
+     * @param companyName
+     * @return
+     */
+    public FleetCompanyMsg checkFNoUnique(String companyName);
 }

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

@@ -1,8 +1,11 @@
 package com.ruoyi.orderManagement.service;
 
 import java.util.List;
+import java.util.Map;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.orderManagement.domain.FleetCarManage;
+import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
 
 /**
  * 【车辆】Service接口
@@ -20,6 +23,8 @@ public interface IFleetCarManageService
      */
     public FleetCarManage selectFleetCarManageById(Long id);
 
+    public Map<String, Object> selectFleetCarManageByIdMap(Long id);
+
     /**
      * 查询【车辆】列表
      * 
@@ -28,14 +33,16 @@ public interface IFleetCarManageService
      */
     public List<FleetCarManage> selectFleetCarManageList(FleetCarManage fleetCarManage);
 
+    public List<Map<String, Object>> selectFleetCarManageListMap(FleetCarManage fleetCarManage);
+
     /**
      * 新增【车辆】
      * 
      * @param fleetCarManage 【车辆】
      * @return 结果
      */
-    public int insertFleetCarManage(FleetCarManage fleetCarManage);
-
+    public AjaxResult insertFleetCarManage(FleetCarManage fleetCarManage);
+    public AjaxResult insertFleetCarManageAdd(String fleetCarManage,String fTmsorderbillsattachs);
     /**
      * 修改【车辆】
      * 

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

@@ -1,9 +1,12 @@
 package com.ruoyi.orderManagement.service;
 
 
+import com.ruoyi.basicData.domain.TGoods;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【车队】Service接口
@@ -29,13 +32,15 @@ public interface IFleetCompanyMsgService
      */
     public List<FleetCompanyMsg> selectFleetCompanyMsgList(FleetCompanyMsg fleetCompanyMsg);
 
+    public List<Map<String, Object>> selectFleetCompanyMsgListMap(FleetCompanyMsg fleetCompanyMsg);
+
     /**
      * 新增【车队】
      * 
      * @param fleetCompanyMsg 【车队】
      * @return 结果
      */
-    public int insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg);
+    public AjaxResult insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg);
 
     /**
      * 修改【车队】
@@ -60,4 +65,12 @@ public interface IFleetCompanyMsgService
      * @return 结果
      */
     public int deleteFleetCompanyMsgById(Long id);
+
+    /**
+     *  检验编号唯一
+     * @return
+     */
+    public String checkUFNoUnique(FleetCompanyMsg fleetCompanyMsg);
+
+
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.orderManagement.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.orderManagement.domain.FleetDriverMsg;
 
 /**
@@ -34,7 +35,7 @@ public interface IFleetDriverMsgService
      * @param fleetDriverMsg 【司机】
      * @return 结果
      */
-    public int insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg);
+    public AjaxResult insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg);
 
     /**
      * 修改【司机】

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

@@ -1,14 +1,28 @@
 package com.ruoyi.orderManagement.service.impl;
 
+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.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.orderManagement.domain.FleetCarManage;
+import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
 import com.ruoyi.orderManagement.mapper.FleetCarManageMapper;
+import com.ruoyi.orderManagement.mapper.FleetCompanyMsgMapper;
+import com.ruoyi.orderManagement.mapper.FtmsorderbillsattachsMapper;
 import com.ruoyi.orderManagement.service.IFleetCarManageService;
+import com.ruoyi.warehouseBusiness.domain.TEnclosure;
+import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper;
 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 java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 【车辆】Service业务层处理
@@ -22,6 +36,15 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
     @Autowired
     private FleetCarManageMapper fleetCarManageMapper;
 
+    @Autowired
+    private TEnclosureMapper tEnclosureMapper;
+
+    @Autowired
+    private FtmsorderbillsattachsMapper ftmsorderbillsattachsMapper;
+
+    @Autowired
+    private FleetCompanyMsgMapper fleetCompanyMsgMapper;
+
     /**
      * 查询【车辆】
      * 
@@ -34,6 +57,37 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
         return fleetCarManageMapper.selectFleetCarManageById(id);
     }
 
+    @Override
+    public Map<String, Object> selectFleetCarManageByIdMap(Long id) {
+        Map<String, Object> map = new HashMap<>();
+        FleetCarManage fleetCarManage = fleetCarManageMapper.selectFleetCarManageById(id);
+        // 车队
+        List<Long> companyId = new ArrayList<>();
+        if (!StringUtils.isNull(fleetCarManage)) {
+            if (StringUtils.isNotNull(fleetCarManage.getFleetCompanyId())) {
+                companyId.add(fleetCarManage.getFleetCompanyId());
+            }
+        }
+        List<FleetCompanyMsg> fleetCompanyMsgList= new ArrayList<>();
+        List<Long> fleetCompanyMsgIdList = StringUtils.integerDeduplication(companyId);
+        for (Long fleetCompanyMsgId : fleetCompanyMsgIdList) {
+            FleetCompanyMsg fleetCompanyMsg = fleetCompanyMsgMapper.selectFleetCompanyMsgById(fleetCompanyMsgId);
+            if (StringUtils.isNotNull(fleetCompanyMsg)) {
+                fleetCompanyMsgList.add(fleetCompanyMsg);
+            }
+        }
+        // 查询附件表数据
+        Ftmsorderbillsattachs ftmsorderbillsattachs = new Ftmsorderbillsattachs();
+        ftmsorderbillsattachs.setPId(fleetCarManage.getId());
+        List<Ftmsorderbillsattachs> ftmsorderbillsattachsList = ftmsorderbillsattachsMapper.selectftmsorderbillsattachsList(ftmsorderbillsattachs);
+        if (StringUtils.isNotEmpty(ftmsorderbillsattachsList)) {
+            map.put("fTmsorderbillsattachs", ftmsorderbillsattachsList);
+        }
+        map.put("fleetCompanyMsg", fleetCompanyMsgList);
+        map.put("fleetCarManage", fleetCarManage);
+        return map;
+    }
+
     /**
      * 查询【车辆】列表
      * 
@@ -46,6 +100,11 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
         return fleetCarManageMapper.selectFleetCarManageList(fleetCarManage);
     }
 
+    @Override
+    public List<Map<String, Object>> selectFleetCarManageListMap(FleetCarManage fleetCarManage) {
+        return fleetCarManageMapper.selectFleetCarManageListMap(fleetCarManage);
+    }
+
     /**
      * 新增【车辆】
      * 
@@ -53,10 +112,64 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
      * @return 结果
      */
     @Override
-    public int insertFleetCarManage(FleetCarManage fleetCarManage)
+    @Transactional
+    public AjaxResult insertFleetCarManage(FleetCarManage fleetCarManage)
     {
-        fleetCarManage.setCreatTime(new Date());
-        return fleetCarManageMapper.insertFleetCarManage(fleetCarManage);
+        // 检验必填
+        if(StringUtils.isNull(fleetCarManage.getFleetCompanyId()) ||
+                StringUtils.isNull(fleetCarManage.getCarNum()) ){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("请填写必输项");
+        }
+        if(null!=fleetCarManage.getId() && !fleetCarManage.getId().equals("")){
+            fleetCarManage.setUpdateBy(SecurityUtils.getUsername());
+            fleetCarManage.setUpdateTime(new Date());
+            fleetCarManageMapper.updateFleetCarManage(fleetCarManage);
+            return AjaxResult.success();
+        }else {
+            fleetCarManage.setCreateBy(SecurityUtils.getUsername());
+            fleetCarManage.setCreatTime(new Date());
+            fleetCarManageMapper.insertFleetCarManage(fleetCarManage);
+            return AjaxResult.success();
+        }
+    }
+
+    @Override
+    public AjaxResult insertFleetCarManageAdd(String fleetCarManage, String fTmsorderbillsattachs) {
+        Long fPid = null;
+        Map<String, Object> map = new HashMap<>();
+        FleetCarManage fleetCarManage1 = JSONArray.parseObject(fleetCarManage, FleetCarManage.class);
+        // 检验必填
+        if(StringUtils.isNull(fleetCarManage1.getFleetCompanyId()) ||
+                StringUtils.isNull(fleetCarManage1.getCarNum()) ){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("请填写必输项");
+        }
+        if(null!=fleetCarManage1.getId() && !fleetCarManage1.getId().equals("")){
+            fPid = fleetCarManage1.getId();
+            fleetCarManage1.setUpdateBy(SecurityUtils.getUsername());
+            fleetCarManage1.setUpdateTime(new Date());
+            fleetCarManageMapper.updateFleetCarManage(fleetCarManage1);
+            tEnclosureMapper.deleteByFPid(fPid);
+        }else {
+            fleetCarManage1.setCreateBy(SecurityUtils.getUsername());
+            fleetCarManage1.setCreatTime(new Date());
+            fleetCarManageMapper.insertFleetCarManage(fleetCarManage1);
+        }
+        //  附件添加
+        if (StringUtils.isNotNull(fTmsorderbillsattachs) && !"[]".equals(fTmsorderbillsattachs)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(fTmsorderbillsattachs);
+            List<Ftmsorderbillsattachs> ftmsorderbillsattachsList = JSONObject.parseArray(jsonDrArray.toJSONString(), Ftmsorderbillsattachs.class);
+            for (Ftmsorderbillsattachs ftmsorderbillsattachs : ftmsorderbillsattachsList) {
+                ftmsorderbillsattachs.setPId(fPid);
+                ftmsorderbillsattachs.setOrgId(fPid);
+                ftmsorderbillsattachs.setCreateBy(SecurityUtils.getUsername());
+                ftmsorderbillsattachs.setCreateTime(new Date());
+                ftmsorderbillsattachsMapper.insertftmsorderbillsattachs(ftmsorderbillsattachs);
+            }
+        }
+        map.put("fleetCarManage", fleetCarManage1);
+        return AjaxResult.success("成功", map);
     }
 
     /**

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

@@ -1,14 +1,22 @@
 package com.ruoyi.orderManagement.service.impl;
 
 
+import com.ruoyi.basicData.domain.TGoods;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
 import com.ruoyi.orderManagement.mapper.FleetCompanyMsgMapper;
 import com.ruoyi.orderManagement.service.IFleetCompanyMsgService;
 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 java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【车队】Service业务层处理
@@ -46,6 +54,11 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService
         return fleetCompanyMsgMapper.selectFleetCompanyMsgList(fleetCompanyMsg);
     }
 
+    @Override
+    public List<Map<String, Object>> selectFleetCompanyMsgListMap(FleetCompanyMsg fleetCompanyMsg) {
+        return fleetCompanyMsgMapper.selectFleetCompanyMsgListMap(fleetCompanyMsg);
+    }
+
     /**
      * 新增【车队】
      * 
@@ -53,10 +66,31 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService
      * @return 结果
      */
     @Override
-    public int insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg)
+    @Transactional
+    public AjaxResult insertFleetCompanyMsg(FleetCompanyMsg fleetCompanyMsg)
     {
-        fleetCompanyMsg.setCreatTime(new Date());
-        return fleetCompanyMsgMapper.insertFleetCompanyMsg(fleetCompanyMsg);
+        // 检验必填
+        if(StringUtils.isNull(fleetCompanyMsg.getCompanyName()) ||
+                StringUtils.isNull(fleetCompanyMsg.getCompanyAddress()) ||
+                StringUtils.isNull(fleetCompanyMsg.getCompanyName()) ||
+                StringUtils.isNull(fleetCompanyMsg.getOpeningBank()) ||
+                StringUtils.isNull(fleetCompanyMsg.getBankAccount()) ||
+                StringUtils.isNull(fleetCompanyMsg.getLoginAccount()) ||
+                StringUtils.isNull(fleetCompanyMsg.getLinkPhone()) ){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("请填写必输项");
+        }
+        if(null!=fleetCompanyMsg.getId() && !fleetCompanyMsg.getId().equals("")){
+            fleetCompanyMsg.setUpdateBy(SecurityUtils.getUsername());
+            fleetCompanyMsg.setUpdateTime(new Date());
+            fleetCompanyMsgMapper.updateFleetCompanyMsg(fleetCompanyMsg);
+            return AjaxResult.success();
+        }else {
+            fleetCompanyMsg.setCreateBy(SecurityUtils.getUsername());
+            fleetCompanyMsg.setCreatTime(new Date());
+            fleetCompanyMsgMapper.insertFleetCompanyMsg(fleetCompanyMsg);
+            return AjaxResult.success();
+        }
     }
 
     /**
@@ -95,4 +129,13 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService
     {
         return fleetCompanyMsgMapper.deleteFleetCompanyMsgById(id);
     }
+
+    @Override
+    public String checkUFNoUnique(FleetCompanyMsg fleetCompanyMsg) {
+        FleetCompanyMsg fleetCompanyMsg1 = fleetCompanyMsgMapper.checkFNoUnique(fleetCompanyMsg.getCompanyName());
+        if (StringUtils.isNotNull(fleetCompanyMsg1) && fleetCompanyMsg1.getId()!=fleetCompanyMsg.getId()) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
 }

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

@@ -1,13 +1,26 @@
 package com.ruoyi.orderManagement.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+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.orderManagement.domain.FleetDriverMsg;
 import com.ruoyi.orderManagement.mapper.FleetDriverMsgMapper;
 import com.ruoyi.orderManagement.service.IFleetDriverMsgService;
+import com.ruoyi.system.domain.SysUserPost;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 
 /**
@@ -22,6 +35,15 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService
     @Autowired
     private FleetDriverMsgMapper fleetDriverMsgMapper;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysUserPostMapper userPostMapper;
+
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+
     /**
      * 查询【司机】
      * 
@@ -53,10 +75,50 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService
      * @return 结果
      */
     @Override
-    public int insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg)
+    @Transactional
+    public AjaxResult insertFleetDriverMsg(FleetDriverMsg fleetDriverMsg)
     {
-        fleetDriverMsg.setCreatTime(new Date());
-        return fleetDriverMsgMapper.insertFleetDriverMsg(fleetDriverMsg);
+        // 检验必填
+        if(StringUtils.isNull(fleetDriverMsg.getFleetCompanyId()) ||
+                StringUtils.isNull(fleetDriverMsg.getName()) ||
+                StringUtils.isNull(fleetDriverMsg.getIdcarNum()) ||
+                StringUtils.isNull(fleetDriverMsg.getTel()) ){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("请填写必输项");
+        }
+        if(null!=fleetDriverMsg.getId() && !fleetDriverMsg.getId().equals("")){
+            fleetDriverMsg.setUpdateBy(SecurityUtils.getUsername());
+            fleetDriverMsg.setUpdateTime(new Date());
+            fleetDriverMsgMapper.updateFleetDriverMsg(fleetDriverMsg);
+            return AjaxResult.success();
+        }else {
+            // 添加用户表
+            SysUser sysUser = new SysUser();
+            sysUser.setUserName(fleetDriverMsg.getTel());
+            sysUser.setNickName(fleetDriverMsg.getName());
+            sysUser.setPhonenumber(fleetDriverMsg.getTel());
+            //sysUser.setEmail(fleetDriverMsg.get);
+            sysUser.setPassword(fleetDriverMsg.getTel());
+            sysUser.setDeptId(120L); // 当前给定、后期修改
+            Long [] rolr = {110L}; // 当前给定、后期修改
+            sysUser.setRoleIds(rolr);
+
+            // 新增用户信息
+            int rows = userMapper.insertUser(sysUser);
+            if(rows <= 0 ){
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("请填写必输项");
+            }
+            // 新增用户岗位关联
+            insertUserPost(sysUser);
+            // 新增用户与角色管理
+            insertUserRole(sysUser);
+
+            fleetDriverMsg.setCreateBy(SecurityUtils.getUsername());
+            fleetDriverMsg.setCreatTime(new Date());
+            fleetDriverMsgMapper.insertFleetDriverMsg(fleetDriverMsg);
+            return AjaxResult.success();
+        }
     }
 
     /**
@@ -95,4 +157,51 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService
     {
         return fleetDriverMsgMapper.deleteFleetDriverMsgById(id);
     }
+
+    /**
+     * 新增用户岗位信息
+     *
+     * @param user 用户对象
+     */
+    public void insertUserPost(SysUser user) {
+        Long[] posts = user.getPostIds();
+        if (StringUtils.isNotNull(posts)) {
+            // 新增用户与岗位管理
+            List<SysUserPost> list = new ArrayList<SysUserPost>();
+            for (Long postId : posts) {
+                SysUserPost up = new SysUserPost();
+                up.setUserId(user.getUserId());
+                up.setPostId(postId);
+                list.add(up);
+            }
+            if (list.size() > 0) {
+                userPostMapper.batchUserPost(list);
+            }
+        }
+    }
+
+    /**
+     * 新增用户角色信息
+     *
+     * @param user 用户对象
+     */
+    public void insertUserRole(SysUser user) {
+        Long[] roles = user.getRoleIds();
+        if (StringUtils.isNotNull(roles)) {
+            // 新增用户与角色管理
+            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            for (Long roleId : roles) {
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(user.getUserId());
+                ur.setRoleId(roleId);
+                list.add(ur);
+            }
+            if (list.size() > 0) {
+                userRoleMapper.batchUserRole(list);
+            }
+        }
+    }
+
+
+
 }

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

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFleetCarManageVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertFleetCarManage" parameterType="FleetCarManage" useGeneratedKeys="true" keyProperty="id">
         insert into fleet_car_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -239,5 +239,91 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    
+    <select id="selectFleetCarManageListMap" parameterType="FleetCarManage" resultType="Map">
+        SELECT
+            car.id AS Id,
+            com.company_name AS fleetCompanyName,
+            car.car_num AS carNum,
+            car.hang_num AS hangNum,
+            car.fuel_type AS fuelType,
+            car.car_type AS carType,
+            car.car_name AS carName,
+            car.manufacture_unit AS carBrand,
+            car.car_brand AS manufactureUnit,
+            car.office_of_certificate AS officeOfCertificate,
+            car.pull_car_type AS pullCarType,
+            car.pull_car_shelf_num AS pullCarShelfNum,
+            car.mount_car_type AS mountCarType,
+            car.mount_car_num AS mountCarNum,
+            car.`engine` AS `engine`,
+            car.car_load_persion AS carLoadPersion,
+            car.buy_car_date AS buyCarDate,
+            car.regiest_date AS regiestDate,
+            car.abandon_date AS abandonDate,
+            car.outer_size AS outerSize,
+            car.sum_weight AS sumWeight,
+            car.vouch_weight AS vouchWeight,
+            car.equip_weight AS equipWeight,
+            car.driving_license_src AS drivingLicenseSrc,
+            car.driving_pendant_src AS drivingPendantSrc,
+            car.operation_license_src AS operationLicenseSrc,
+            car.technology_src AS technologySrc,
+            car.driving_load_src AS drivingLoadSrc,
+            car.second_lv_maintain_src AS secondLvMaintainSrc,
+            car.taffic_constranint_insurance_src AS tafficConstranintInsuranceSrc,
+            car.business_insurance_src AS businessInsuranceSrc,
+            car.accpet_carrage_insurance_src AS accpetCarrageInsuranceSrc,
+            car.creat_time AS creatTime,
+            car.modification_time AS modificationTime,
+            car.bill_status AS billStatus,
+            car.del_flag AS delFlag,
+            car.create_by AS createBy,
+            car.update_by AS updateBy,
+            car.update_time AS updateTime,
+            car.remarks AS remarks
+        FROM
+            fleet_car_manage AS car
+            LEFT JOIN
+                fleet_company_msg AS com
+            ON
+                car.fleet_company_id = com.id
+        <where>
+            <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
+            <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</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>
 </mapper>

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

@@ -226,5 +226,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    
+
+    <select id="checkFNoUnique" parameterType="String" resultMap="FleetCompanyMsgResult">
+        select id,company_name from fleet_company_msg where company_name = #{companyName} limit 1
+    </select>
+    <select id="selectFleetCompanyMsgListMap" parameterType="FleetCompanyMsg" resultType="Map">
+        select
+
+        <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>
+
 </mapper>

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -41,8 +41,8 @@ public class TokenService {
     private int expireTime;
 
     // 微信令牌有效期（默认100天）
-    @Value("${token.wechatExpireTime}")
-    private int wechatExpireTime;
+    /*@Value("${token.wechatExpireTime}")
+    private int wechatExpireTime;*/
 
     protected static final long DAY = 86400000;
 
@@ -158,13 +158,13 @@ public class TokenService {
      *
      * @param loginUser 登录信息
      */
-    public void wechatRefreshToken(LoginUser loginUser) {
+   /* public void wechatRefreshToken(LoginUser loginUser) {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + wechatExpireTime * DAY);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         redisCache.setCacheObject(userKey, loginUser, wechatExpireTime, TimeUnit.MINUTES);
-    }
+    }*/
 
     /**
      * 设置用户代理信息

ruoyi-wechatProgram/src/main/java/com/ruoyi/officialAccount/service/IWechatUserService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.officialAccount.service;
-
-
-import com.ruoyi.common.core.domain.entity.WechatUser;
-
-import java.util.List;
-
-/**
- * 微信用户Service接口
- *
- * @author ruoyi
- * @date 2021-02-24
- */
-public interface IWechatUserService {
-    /**
-     * 查询微信用户
-     *
-     * @param id 微信用户ID
-     * @return 微信用户
-     */
-    public WechatUser selectWechatUserById(Long id);
-
-    /**
-     * 查询微信用户列表
-     *
-     * @param wechatUser 微信用户
-     * @return 微信用户集合
-     */
-    public List<WechatUser> selectWechatUserList(WechatUser wechatUser);
-
-    /**
-     * 新增微信用户
-     *
-     * @param wechatUser 微信用户
-     * @return 结果
-     */
-    public int insertWechatUser(WechatUser wechatUser);
-
-    /**
-     * 修改微信用户
-     *
-     * @param wechatUser 微信用户
-     * @return 结果
-     */
-    public int updateWechatUser(WechatUser wechatUser);
-
-    /**
-     * 批量删除微信用户
-     *
-     * @param ids 需要删除的微信用户ID
-     * @return 结果
-     */
-    public int deleteWechatUserByIds(Long[] ids);
-
-    /**
-     * 删除微信用户信息
-     *
-     * @param id 微信用户ID
-     * @return 结果
-     */
-    public int deleteWechatUserById(Long id);
-}