[CODE]: 车辆管理添加司机名称

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

@@ -74,7 +74,7 @@ public class FleetCarManageController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(fleetCarManageService.selectFleetCarManageById(id));
+        return AjaxResult.success(fleetCarManageService.selectFleetCarManageByIdMap(id));
     }
 
     /**

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

@@ -29,6 +29,10 @@ public class FleetCarManage extends BaseEntity
     private String carNum;
 
     /** 挂号 */
+    @Excel(name = "驾驶员")
+    private String driverName;
+
+    /** 挂号 */
     @Excel(name = "挂号")
     private String hangNum;
 
@@ -550,6 +554,14 @@ public class FleetCarManage extends BaseEntity
         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)

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

@@ -2,12 +2,10 @@ 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;
@@ -15,7 +13,6 @@ 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;
@@ -150,22 +147,25 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
             fleetCarManage1.setUpdateBy(SecurityUtils.getUsername());
             fleetCarManage1.setUpdateTime(new Date());
             fleetCarManageMapper.updateFleetCarManage(fleetCarManage1);
-            tEnclosureMapper.deleteByFPid(fPid);
+            ftmsorderbillsattachsMapper.deleteftmsorderbillsattachsByPId(fPid);
         }else {
             fleetCarManage1.setCreateBy(SecurityUtils.getUsername());
             fleetCarManage1.setCreatTime(new Date());
             fleetCarManageMapper.insertFleetCarManage(fleetCarManage1);
+            fPid = fleetCarManage1.getId();
         }
         //  附件添加
         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);
+                if(null!=ftmsorderbillsattachs.getActId() && !ftmsorderbillsattachs.getActId().equals("")){
+                    ftmsorderbillsattachs.setPId(fPid);
+                    ftmsorderbillsattachs.setOrgId(fPid);
+                    ftmsorderbillsattachs.setCreateBy(SecurityUtils.getUsername());
+                    ftmsorderbillsattachs.setCreateTime(new Date());
+                    ftmsorderbillsattachsMapper.insertftmsorderbillsattachs(ftmsorderbillsattachs);
+                }
             }
         }
         map.put("fleetCarManage", fleetCarManage1);

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="fleetCompanyId"    column="fleet_company_id"    />
         <result property="carNum"    column="car_num"    />
+        <result property="driverName"    column="driver_name"    />
         <result property="hangNum"    column="hang_num"    />
         <result property="fuelType"    column="fuel_type"    />
         <result property="carType"    column="car_type"    />
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFleetCarManageVo">
-        select id, fleet_company_id, car_num, 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_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">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="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>
@@ -102,6 +104,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="driverName != null">driver_name,</if>
             <if test="hangNum != null">hang_num,</if>
             <if test="fuelType != null">fuel_type,</if>
             <if test="carType != null">car_type,</if>
@@ -143,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fleetCompanyId != null">#{fleetCompanyId},</if>
             <if test="carNum != null">#{carNum},</if>
+            <if test="driverName != null">#{driverName},</if>
             <if test="hangNum != null">#{hangNum},</if>
             <if test="fuelType != null">#{fuelType},</if>
             <if test="carType != null">#{carType},</if>
@@ -188,6 +192,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="driverName != null">driver_name = #{driverName},</if>
             <if test="hangNum != null">hang_num = #{hangNum},</if>
             <if test="fuelType != null">fuel_type = #{fuelType},</if>
             <if test="carType != null">car_type = #{carType},</if>
@@ -244,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             car.id AS Id,
             com.company_name AS fleetCompanyName,
             car.car_num AS carNum,
+            car.driver_name AS driverName,
             car.hang_num AS hangNum,
             car.fuel_type AS fuelType,
             car.car_type AS carType,
@@ -290,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="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>