Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/TmsGasFeeController.java

@@ -0,0 +1,127 @@
+package com.aoyang.tms.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.TmsGasFee;
+import com.aoyang.tms.service.TmsGasFeeService;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
+import javax.annotation.Resource;
+
+import com.aoyang.common.result.Result;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.aoyang.common.param.PageParam;
+
+
+/**
+ * <p>
+ * 燃气费用表 控制器
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+@RestController
+@Slf4j
+@Api(value = "tms_gas_feeCRUD接口")
+@RequestMapping("/tms/tms_gas_fee")
+public class TmsGasFeeController {
+
+    @Resource
+    private TmsGasFeeService tmsGasFeeService;
+
+    @ApiOperation(value = "获取tms_gas_fee分页列表", notes = "")
+    @PostMapping("/page_list")
+    public Result list(@RequestBody PageParam<TmsGasFee> pageParam) {
+        Page<TmsGasFee> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TmsGasFee> records = tmsGasFeeService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "获取燃气费用列表", notes = "必传参数:CycleId,TruckId")
+    @PostMapping("/list")
+    public Result list(@RequestBody TmsGasFee param) {
+        log.info("获取燃气费用列表,调用/tms/tms_gas_fee/list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.list(param));
+    }
+
+    @ApiOperation(value = "根据id获取燃气费用详情", notes = "必传参数:Id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TmsGasFee param) {
+        log.info("根据id获取燃气费用详情,调用/tms/tms_gas_fee/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.getById(param));
+    }
+
+    @ApiOperation(value = "添加燃气费用", notes = "必传参数:GasQtyDate,GasQty,UnitPrice,GasQtyFee,Type,Kilometre,CycleId,TruckId")
+    @PostMapping("/add")
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody TmsGasFee param) {
+        log.info("添加燃气费用,调用/tms/tms_gas_fee/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getGasQtyDate() == null || param.getGasQty() == null || param.getUnitPrice() == null
+                || param.getGasQtyFee() == null || param.getType() == null || param.getKilometre() == null
+                || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setCreater(userId);
+        param.setCreaterName(utf8Name);
+        param.setCreateDate(LocalDateTime.now());
+
+        return new Result<>(tmsGasFeeService.save(param));
+    }
+
+    @ApiOperation(value = "修改燃气费用", notes = "必传参数:id,tmsLineCostOther.id")
+    @PostMapping("/update")
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody TmsGasFee param) {
+        log.info("修改燃气费用,调用/tms/tms_gas_fee/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(tmsGasFeeService.updateById(param));
+    }
+
+    @ApiOperation(value = "删除燃气费用", notes = "必传参数:id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TmsGasFee param) {
+        log.info("删除燃气费用,调用/tms/tms_gas_fee/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsGasFeeService.removeById(param));
+    }
+}

src/main/java/com/aoyang/tms/controller/TmsLineCostController.java

@@ -0,0 +1,142 @@
+package com.aoyang.tms.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.controller.param.TmsLineCostAddParam;
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.aoyang.tms.service.TmsLineCostService;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
+import javax.annotation.Resource;
+
+import com.aoyang.common.result.Result;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.aoyang.common.param.PageParam;
+
+
+/**
+ * <p>
+ * 线路费用表 控制器
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+@RestController
+@Slf4j
+@Api(value = "tms_line_costCRUD接口")
+@RequestMapping("/tms/tms_line_cost")
+public class TmsLineCostController {
+
+    @Resource
+    private TmsLineCostService tmsLineCostService;
+
+    @ApiOperation(value = "获取tms_line_cost分页列表", notes = "")
+    @PostMapping("/page_list")
+    public Result pageList(@RequestBody PageParam<TmsLineCost> pageParam) {
+        Page<TmsLineCost> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TmsLineCost> records = tmsLineCostService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "获取线路费用列表", notes = "必传参数:CycleId,TruckId")
+    @PostMapping("/list")
+    public Result list(@RequestBody TmsLineCost param) {
+        log.info("获取线路费用列表,调用/tms/tms_line_cost/list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsLineCostService.list(param));
+    }
+
+    @ApiOperation(value = "根据id获取线路费用详情", notes = "必传参数:Id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TmsLineCost param) {
+        log.info("根据id获取线路费用详情,调用/tms/tms_line_cost/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsLineCostService.getOne(param));
+    }
+
+    @ApiOperation(value = "添加线路费用", notes = "必传参数:LineStart,LineEnd,Kilometre,CycleId,TruckId")
+    @PostMapping("/add")
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody TmsLineCostAddParam param) {
+        log.info("添加线路费用,调用/tms/tms_line_cost/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getLineStart() == null || param.getLineEnd() == null || param.getKilometre() == null
+                || param.getCycleId() == null || param.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        if (param.getList() != null && param.getList().size() > 0) {
+            for (TmsLineCostOther tmsLineCostOther : param.getList()) {
+                if (tmsLineCostOther.getCostName() == null || tmsLineCostOther.getCostName() == null) {
+                    return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+                }
+            }
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setCreater(userId);
+        param.setCreaterName(utf8Name);
+        param.setCreateDate(LocalDateTime.now());
+
+        return new Result<>(tmsLineCostService.add(param));
+    }
+
+    @ApiOperation(value = "修改线路费用", notes = "必传参数:id,tmsLineCostOther.id")
+    @PostMapping("/update")
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody TmsLineCostAddParam param) {
+        log.info("修改线路费用,调用/tms/tms_line_cost/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        if (param.getList() != null && param.getList().size() > 0) {
+            for (TmsLineCostOther tmsLineCostOther : param.getList()) {
+                if (tmsLineCostOther.getId() == null) {
+                    return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+                }
+            }
+        }
+
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(tmsLineCostService.update(param));
+    }
+
+    @ApiOperation(value = "删除线路费用", notes = "必传参数:id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TmsLineCostAddParam param) {
+        log.info("删除线路费用,调用/tms/tms_line_cost/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(tmsLineCostService.delete(param));
+    }
+}

src/main/java/com/aoyang/tms/controller/TmsLineCostOtherController.java

@@ -0,0 +1,60 @@
+package com.aoyang.tms.controller;
+
+
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.aoyang.tms.service.TmsLineCostOtherService;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import javax.annotation.Resource;
+
+import com.aoyang.common.result.Result;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.aoyang.common.param.PageParam;
+
+
+/**
+ * <p>
+    *  控制器
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@RestController
+@Slf4j
+@Api(value = "tms_line_cost_otherCRUD接口")
+@RequestMapping("/tms/tms_line_cost_other")
+public class TmsLineCostOtherController {
+
+    @Resource
+    private TmsLineCostOtherService tmsLineCostOtherService;
+
+    @ApiOperation(value = "获取tms_line_cost_other列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TmsLineCostOther> pageParam) {
+        Page<TmsLineCostOther> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TmsLineCostOther> records = tmsLineCostOtherService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改tms_line_cost_other",notes="根据id修改tms_line_cost_other")
+    @PostMapping("/update")
+    public Result update(@RequestBody TmsLineCostOther tmsLineCostOther) {
+        Boolean flag = tmsLineCostOtherService.updateById(tmsLineCostOther);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加tms_line_cost_other",notes="新增一条tms_line_cost_other")
+    @PostMapping("/add")
+    public Result add(@RequestBody TmsLineCostOther tmsLineCostOther) {
+        Boolean flag = tmsLineCostOtherService.save(tmsLineCostOther);
+        return new Result<>(flag);
+    }
+}

src/main/java/com/aoyang/tms/controller/TmsOtherFeeController.java

@@ -0,0 +1,60 @@
+package com.aoyang.tms.controller;
+
+
+import com.aoyang.tms.entity.TmsOtherFee;
+import com.aoyang.tms.service.TmsOtherFeeService;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import javax.annotation.Resource;
+
+import com.aoyang.common.result.Result;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.aoyang.common.param.PageParam;
+
+
+/**
+ * <p>
+    * 其他费用表 控制器
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@RestController
+@Slf4j
+@Api(value = "tms_other_feeCRUD接口")
+@RequestMapping("/tms/tms_other_fee")
+public class TmsOtherFeeController {
+
+    @Resource
+    private TmsOtherFeeService tmsOtherFeeService;
+
+    @ApiOperation(value = "获取tms_other_fee列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TmsOtherFee> pageParam) {
+        Page<TmsOtherFee> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TmsOtherFee> records = tmsOtherFeeService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改tms_other_fee",notes="根据id修改tms_other_fee")
+    @PostMapping("/update")
+    public Result update(@RequestBody TmsOtherFee tmsOtherFee) {
+        Boolean flag = tmsOtherFeeService.updateById(tmsOtherFee);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加tms_other_fee",notes="新增一条tms_other_fee")
+    @PostMapping("/add")
+    public Result add(@RequestBody TmsOtherFee tmsOtherFee) {
+        Boolean flag = tmsOtherFeeService.save(tmsOtherFee);
+        return new Result<>(flag);
+    }
+}

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -37,7 +37,7 @@ public class WorkerController {
     @Resource
     private RestInfoService restInfoService;
     @Resource
-    private WorkCycleService workCycleService;
+    private WorkSpotService workSpotService;
     @Resource
     private CommonService commonService;
     @Resource
@@ -47,6 +47,9 @@ public class WorkerController {
     @Resource
     private WorkOrderReadinfoService workOrderReadinfoService;
 
+    @Resource
+    private WorkerService workerService;
+
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -165,6 +168,17 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
+    @ApiOperation(value = "查询作业点位置信息", notes = "spot_id必传")
+    @PostMapping("/find_work_spot_info")
+    public Result find_work_spot_info(@RequestBody WorkSpot workSpot) {
+        log.info("查询作业点位置信息,/tms/worker/find_work_spot_info，参数:{}", JSON.toJSONString(workSpot));
+        if (workSpot == null || workSpot.getSpotId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkSpot flag = workSpotService.getById(workSpot.getSpotId());
+        return new Result<>(flag);
+    }
+
     @ApiOperation(value = "获取行车日志列表", notes = "卡车id必传")
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
@@ -177,131 +191,109 @@ public class WorkerController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "装车等待上报", notes = "")
-    @PostMapping("/add_zhuangche_wait")
+    @ApiOperation(value = "装些车等待上报", notes = "装车 · 装车等待页面上报")
+    @PostMapping("/add_wait")
     public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
         log.info("装车等待上报,/tms/worker/add_zhuangche_wait，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
-            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "卸车等待上报", notes = "")
-    @PostMapping("/add_xieche_wait")
-    public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
-        log.info("卸车等待上报,/tms/worker/add_xieche_wait，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "装车成果上报", notes = "")
-    @PostMapping("/add_zhuangche_result")
+    @ApiOperation(value = "装卸车成果上报", notes = "上报装卸车磅单等信息")
+    @PostMapping("/add_result")
     public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
         log.info("装车成果上报,/tms/worker/add_zhuangche_result，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
-            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "卸车成果上报", notes = "")
-    @PostMapping("/add_xieche_result")
-    public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
-        log.info("卸车成果上报,/tms/worker/add_xieche_result，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getTruckId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "1.开始执行运单", notes = "点击开始执行运单按钮")
     @PostMapping("/start_order")
-    public Result start_order(@RequestBody WorkOrder workOrder) {
+    public Result startOrder(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.startOrder(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
     @PostMapping("/start_work")
-    public Result start_work(@RequestBody WorkOrder workOrder) {
+    public Result starWork(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.starWork(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "3.上报已到达装卸车点", notes = "点击上报已到达装卸车点")
     @PostMapping("/start_wait")
-    public Result start_wait(@RequestBody WorkOrder workOrder) {
+    public Result startWait(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("上报已到达装卸车点，/tms/worker/start_wait，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.startWait(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.上报成果", notes = "点击上报成果")
     @PostMapping("/submit_result")
-    public Result submit_result(@RequestBody WorkOrder workOrder) {
+    public Result submitResult(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.submitResult(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "4.确认完成运单", notes = "点击确认完成运单")
     @PostMapping("/finish_order")
-    public Result finish_order(@RequestBody WorkOrder workOrder) {
+    public Result finishOrder(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("确认完成运单，/tms/worker/finish_order，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.finishOrder(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "6.上报已到达收车点", notes = "点击上报已到达收车点")
     @PostMapping("/arrive_terminal")
-    public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
+    public Result arriveTerminal(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入收车后检查状态，2.订单完成状态，3.并记行车日志
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.arriveTerminal(userId,userName, workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
     @PostMapping("/finish_work")
-    public Result finish_work(@RequestBody WorkOrder workOrder) {
+    public Result finishWork(@RequestHeader(value = "userId") Long userId,@RequestHeader(value = "userName") String userName,  @RequestBody WorkOrder workOrder) {
         log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null ||  workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         //TODO 1.车辆进入已经收车状态，2.订单完成状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
-        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        Boolean flag = workerService.finishWork(userId,userName, workOrder);
         return new Result<>(flag);
     }
 }

src/main/java/com/aoyang/tms/controller/param/TmsLineCostAddParam.java

@@ -0,0 +1,15 @@
+package com.aoyang.tms.controller.param;
+
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TmsLineCostAddParam extends TmsLineCost implements Serializable {
+
+    private List<TmsLineCostOther> list;
+
+}

src/main/java/com/aoyang/tms/controller/vo/TmsLineCostDetail.java

@@ -0,0 +1,14 @@
+package com.aoyang.tms.controller.vo;
+
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TmsLineCostDetail  extends TmsLineCost implements Serializable {
+
+    private List<TmsLineCostOther> list;
+}

src/main/java/com/aoyang/tms/controller/vo/TmsLineCostListVO.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.controller.vo;
+
+import com.aoyang.tms.entity.TmsLineCost;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class TmsLineCostListVO extends TmsLineCost implements Serializable {
+
+    @ApiModelProperty(value = "线路费用总数")
+    private BigDecimal lineCostSum;
+
+}

src/main/java/com/aoyang/tms/entity/TmsGasFee.java

@@ -0,0 +1,108 @@
+package com.aoyang.tms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 燃气费用表
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tms_gas_fee")
+@ApiModel(value="TmsGasFee对象", description="燃气费用表")
+public class TmsGasFee implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_number")
+    private String trailerNumber;
+
+    @ApiModelProperty(value = "加气时间")
+    @TableField("gas_qty_date")
+    private LocalDateTime gasQtyDate;
+
+    @ApiModelProperty(value = "加气量")
+    @TableField("gas_qty")
+    private BigDecimal gasQty;
+
+    @ApiModelProperty(value = "单价")
+    @TableField("unit_price")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "加气金额")
+    @TableField("gas_qty_fee")
+    private BigDecimal gasQtyFee;
+
+    @ApiModelProperty(value = "加气方式（1现金2大象加气）")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(value = "公里数")
+    @TableField("kilometre")
+    private Integer kilometre;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField("creater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    @TableField("creater_name")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

src/main/java/com/aoyang/tms/entity/TmsLineCost.java

@@ -0,0 +1,108 @@
+package com.aoyang.tms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 线路费用表
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tms_line_cost")
+@ApiModel(value="TmsLineCost对象", description="线路费用表")
+public class TmsLineCost implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_number")
+    private String trailerNumber;
+
+    @ApiModelProperty(value = "线路起始点")
+    @TableField("line_start")
+    private String lineStart;
+
+    @ApiModelProperty(value = "线路截至点")
+    @TableField("line_end")
+    private String lineEnd;
+
+    @ApiModelProperty(value = "公里数")
+    @TableField("kilometre")
+    private Integer kilometre;
+
+    @ApiModelProperty(value = "ETC路费")
+    @TableField("etc_fee")
+    private BigDecimal etcFee;
+
+    @ApiModelProperty(value = "现金路费")
+    @TableField("cash")
+    private BigDecimal cash;
+
+    @ApiModelProperty(value = "停车费")
+    @TableField("parking_fee")
+    private BigDecimal parkingFee;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField("creater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    @TableField("creater_name")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

src/main/java/com/aoyang/tms/entity/TmsLineCostOther.java

@@ -0,0 +1,79 @@
+package com.aoyang.tms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tms_line_cost_other")
+@ApiModel(value="TmsLineCostOther对象", description="")
+public class TmsLineCostOther implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "线路费用id")
+    @TableField("line_cost_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long lineCostId;
+
+    @ApiModelProperty(value = "其他费用名称")
+    @TableField("cost_name")
+    private String costName;
+
+    @ApiModelProperty(value = "其他费用金额")
+    @TableField("cost_fee")
+    private BigDecimal costFee;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField("creater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    @TableField("creater_name")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

src/main/java/com/aoyang/tms/entity/TmsOtherFee.java

@@ -0,0 +1,112 @@
+package com.aoyang.tms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 其他费用表
+    * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tms_other_fee")
+@ApiModel(value="TmsOtherFee对象", description="其他费用表")
+public class TmsOtherFee implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_number")
+    private String trailerNumber;
+
+    @ApiModelProperty(value = "维修费")
+    @TableField("maintenance_fee")
+    private BigDecimal maintenanceFee;
+
+    @ApiModelProperty(value = "打黄油")
+    @TableField("butter_fee")
+    private BigDecimal butterFee;
+
+    @ApiModelProperty(value = "补胎.倒胎")
+    @TableField("tire_fee")
+    private BigDecimal tireFee;
+
+    @ApiModelProperty(value = "过磅.通行.其他")
+    @TableField("weighing_passing_other_fee")
+    private BigDecimal weighingPassingOtherFee;
+
+    @ApiModelProperty(value = "换机油")
+    @TableField("oil_change_fee")
+    private BigDecimal oilChangeFee;
+
+    @ApiModelProperty(value = "审车审证")
+    @TableField("car_review_fee")
+    private BigDecimal carReviewFee;
+
+    @ApiModelProperty(value = "大修理(>3K)")
+    @TableField("repair_fee")
+    private BigDecimal repairFee;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField("creater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    @TableField("creater_name")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -61,6 +61,19 @@ public class WorkOrder implements Serializable {
     @TableField("org_short_name")
     private String orgShortName;
 
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_number")
+    private String trailerNumber;
+
     @ApiModelProperty(value = "司机1id")
     @TableField("driver_id_one")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -88,19 +101,6 @@ public class WorkOrder implements Serializable {
     @TableField("escort_name")
     private String escortName;
 
-    @ApiModelProperty(value = "分配卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_number")
-    private String trailerNumber;
-
     @ApiModelProperty(value = "托运方id")
     @TableField("shipper_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -123,11 +123,12 @@ public class WorkOrder implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
-    @ApiModelProperty(value = "所属部门id")
+    @ApiModelProperty(value = "运力部门id（tms.truck_dept.id）")
     @TableField("dept_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long deptId;
 
-    @ApiModelProperty(value = "所属部门名称")
+    @ApiModelProperty(value = "运力部门名称")
     @TableField("dept_name")
     private String deptName;
 

src/main/java/com/aoyang/tms/mapper/TmsGasFeeMapper.java

@@ -0,0 +1,17 @@
+package com.aoyang.tms.mapper;
+
+
+import com.aoyang.tms.entity.TmsGasFee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 燃气费用表 Mapper 接口
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsGasFeeMapper extends BaseMapper<TmsGasFee> {
+
+}

src/main/java/com/aoyang/tms/mapper/TmsLineCostMapper.java

@@ -0,0 +1,17 @@
+package com.aoyang.tms.mapper;
+
+
+import com.aoyang.tms.entity.TmsLineCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线路费用表 Mapper 接口
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsLineCostMapper extends BaseMapper<TmsLineCost> {
+
+}

src/main/java/com/aoyang/tms/mapper/TmsLineCostOtherMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsLineCostOtherMapper extends BaseMapper<TmsLineCostOther> {
+
+}

src/main/java/com/aoyang/tms/mapper/TmsOtherFeeMapper.java

@@ -0,0 +1,17 @@
+package com.aoyang.tms.mapper;
+
+
+import com.aoyang.tms.entity.TmsOtherFee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 其他费用表 Mapper 接口
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsOtherFeeMapper extends BaseMapper<TmsOtherFee> {
+
+}

src/main/java/com/aoyang/tms/service/TmsGasFeeService.java

@@ -0,0 +1,28 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TmsGasFee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 燃气费用表 服务类
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+public interface TmsGasFeeService extends IService<TmsGasFee> {
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取燃气费用列表
+     * @Date 2022/4/23
+     * @Param
+     **/
+    List<TmsGasFee> list(TmsGasFee param);
+
+
+}

src/main/java/com/aoyang/tms/service/TmsLineCostOtherService.java

@@ -0,0 +1,28 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.controller.vo.TmsLineCostListVO;
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsLineCostOtherService extends IService<TmsLineCostOther> {
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 根据线路费用id获取线路费用其他费用列表
+     * @Date 2022/4/23
+     * @Param
+     **/
+    List<TmsLineCostOther> list(TmsLineCost param);
+}

src/main/java/com/aoyang/tms/service/TmsLineCostService.java

@@ -0,0 +1,76 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.controller.param.TmsLineCostAddParam;
+import com.aoyang.tms.controller.vo.TmsLineCostDetail;
+import com.aoyang.tms.controller.vo.TmsLineCostListVO;
+import com.aoyang.tms.entity.TmsLineCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 线路费用表 服务类
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+public interface TmsLineCostService extends IService<TmsLineCost> {
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取线路费用列表
+     * @Date 2022/4/23
+     * @Param
+     **/
+    List<TmsLineCostListVO> list(TmsLineCost param);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取线路费用总数
+     * @Date 2022/4/23
+     * @Param
+     **/
+    BigDecimal feeSum(TmsLineCost param);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取单个线路费用
+     * @Date 2022/4/23
+     * @Param
+     **/
+    TmsLineCostDetail getOne(TmsLineCost param);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 新增线路费用
+     * @Date 2022/4/23
+     * @Param
+     **/
+    boolean add(TmsLineCostAddParam param);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 修改线路费用
+     * @Date 2022/4/23
+     * @Param
+     **/
+    boolean update(TmsLineCostAddParam param);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 删除线路费用
+     * @Date 2022/4/23
+     * @Param
+     **/
+    boolean delete(TmsLineCostAddParam param);
+
+}

src/main/java/com/aoyang/tms/service/TmsOtherFeeService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TmsOtherFee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 其他费用表 服务类
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+public interface TmsOtherFeeService extends IService<TmsOtherFee> {
+
+}

src/main/java/com/aoyang/tms/service/WorkerService.java

@@ -0,0 +1,82 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.User;
+import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.feign.result.Org;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description: 作业端相关接口
+ * @Author guoyong
+ * @Date 2022/4/23 15:16
+ * @Version 1.0
+ */
+public interface WorkerService {
+
+    /**
+     * @Author guoyong
+     * @Description 开始执行运单
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean startOrder(Long userId, String userName,WorkOrder workOrder);
+    /**
+     * @Author guoyong
+     * @Description 完成出车前检查，开始装卸车作业
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean starWork(Long userId,String userName, WorkOrder workOrder);
+    /**
+     * @Author guoyong
+     * @Description 上报已到达装卸车点
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean startWait(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 上报成果
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean submitResult(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 确认完成运单
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean finishOrder(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 上报已到达收车点
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean arriveTerminal(Long userId, String userName,WorkOrder workOrder);
+
+    /**
+     * @Author guoyong
+     * @Description 完成检查，结束此次行程
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    Boolean finishWork(Long userId, String userName,WorkOrder workOrder);
+
+}

src/main/java/com/aoyang/tms/service/impl/TmsGasFeeServiceImpl.java

@@ -0,0 +1,38 @@
+package com.aoyang.tms.service.impl;
+
+
+import com.aoyang.tms.entity.TmsGasFee;
+import com.aoyang.tms.mapper.TmsGasFeeMapper;
+import com.aoyang.tms.service.TmsGasFeeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 燃气费用表 服务实现类
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+@Service
+public class TmsGasFeeServiceImpl extends ServiceImpl<TmsGasFeeMapper, TmsGasFee> implements TmsGasFeeService {
+
+    @Override
+    public List<TmsGasFee> list(TmsGasFee param) {
+        QueryWrapper<TmsGasFee> queryWrapper = new QueryWrapper<>();
+        if (param.getCycleId() != null) {
+            queryWrapper.eq("cycle_id", param.getCycleId());
+        }
+        if (param.getTruckId() != null) {
+            queryWrapper.eq("truck_id", param.getTruckId());
+        }
+        List<TmsGasFee> list = list(queryWrapper.orderByAsc("create_date"));
+
+        return list;
+    }
+
+}

src/main/java/com/aoyang/tms/service/impl/TmsLineCostOtherServiceImpl.java

@@ -0,0 +1,34 @@
+package com.aoyang.tms.service.impl;
+
+
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.aoyang.tms.mapper.TmsLineCostOtherMapper;
+import com.aoyang.tms.service.TmsLineCostOtherService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Service
+public class TmsLineCostOtherServiceImpl extends ServiceImpl<TmsLineCostOtherMapper, TmsLineCostOther> implements TmsLineCostOtherService {
+
+    @Override
+    public List<TmsLineCostOther> list(TmsLineCost param) {
+        QueryWrapper<TmsLineCostOther> queryWrapper = new QueryWrapper<>();
+        if (param.getId() != null) {
+            queryWrapper.eq("line_cost_id", param.getId());
+        }
+        List<TmsLineCostOther> list = list(queryWrapper.orderByAsc("create_date"));
+        return list;
+    }
+}

src/main/java/com/aoyang/tms/service/impl/TmsLineCostServiceImpl.java

@@ -0,0 +1,163 @@
+package com.aoyang.tms.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.controller.param.TmsLineCostAddParam;
+import com.aoyang.tms.controller.vo.TmsLineCostDetail;
+import com.aoyang.tms.controller.vo.TmsLineCostListVO;
+import com.aoyang.tms.entity.TmsLineCost;
+import com.aoyang.tms.entity.TmsLineCostOther;
+import com.aoyang.tms.mapper.TmsLineCostMapper;
+import com.aoyang.tms.service.TmsLineCostOtherService;
+import com.aoyang.tms.service.TmsLineCostService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 线路费用表 服务实现类
+ * </p>
+ *
+ * @author chengang
+ * @since 2022-04-23
+ */
+@Service
+@Slf4j
+public class TmsLineCostServiceImpl extends ServiceImpl<TmsLineCostMapper, TmsLineCost> implements TmsLineCostService {
+
+    @Resource
+    private TmsLineCostOtherService tmsLineCostOtherService;
+
+    @Override
+    public List<TmsLineCostListVO> list(TmsLineCost param) {
+        QueryWrapper<TmsLineCost> queryWrapper = new QueryWrapper<>();
+        if (param.getCycleId() != null) {
+            queryWrapper.eq("cycle_id", param.getCycleId());
+        }
+        if (param.getTruckId() != null) {
+            queryWrapper.eq("truck_id", param.getTruckId());
+        }
+        List<TmsLineCost> list = list(queryWrapper.orderByAsc("create_date"));
+        List<TmsLineCostListVO> listVOS = new ArrayList<>();
+        for (TmsLineCost tmsLineCost : list) {
+            TmsLineCostListVO tmsLineCostListVO = new TmsLineCostListVO();
+            BeanUtils.copyProperties(tmsLineCost, tmsLineCostListVO);
+            tmsLineCostListVO.setLineCostSum(feeSum(tmsLineCost));
+
+            listVOS.add(tmsLineCostListVO);
+        }
+        return listVOS;
+    }
+
+    @Override
+    public BigDecimal feeSum(TmsLineCost param) {
+        BigDecimal feeSum = BigDecimal.ZERO;
+        if (param.getEtcFee() != null) {
+            feeSum = feeSum.add(param.getEtcFee());
+        }
+        if (param.getCash() != null) {
+            feeSum = feeSum.add(param.getCash());
+        }
+        if (param.getParkingFee() != null) {
+            feeSum = feeSum.add(param.getParkingFee());
+        }
+        List<TmsLineCostOther> list = tmsLineCostOtherService.list(param);
+        if (list != null && list.size() > 0) {
+            for (TmsLineCostOther tmsLineCostOther : list) {
+                if (tmsLineCostOther.getCostFee() != null) {
+                    feeSum = feeSum.add(tmsLineCostOther.getCostFee());
+                }
+            }
+        }
+        return feeSum;
+    }
+
+    @Override
+    public TmsLineCostDetail getOne(TmsLineCost param) {
+        TmsLineCostDetail tmsLineCostDetail = new TmsLineCostDetail();
+        TmsLineCost tmsLineCost = getById(param);
+        BeanUtils.copyProperties(tmsLineCost, tmsLineCostDetail);
+        List<TmsLineCostOther> list = tmsLineCostOtherService.list(param);
+        if (list != null && list.size() > 0) {
+            tmsLineCostDetail.setList(list);
+        }
+        return tmsLineCostDetail;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean add(TmsLineCostAddParam param) {
+        try {
+            TmsLineCost tmsLineCost = new TmsLineCost();
+            BeanUtils.copyProperties(param, tmsLineCost);
+            boolean flag = save(tmsLineCost);
+            if (param.getList() != null && param.getList().size() > 0) {
+                for (TmsLineCostOther tmsLineCostOther : param.getList()) {
+                    tmsLineCostOther.setLineCostId(tmsLineCost.getId());
+                    tmsLineCostOther.setCreater(tmsLineCost.getCreater());
+                    tmsLineCostOther.setCreaterName(tmsLineCost.getCreaterName());
+                    tmsLineCostOther.setCreateDate(tmsLineCost.getCreateDate());
+                    tmsLineCostOtherService.save(tmsLineCostOther);
+                }
+            }
+            return flag;
+        } catch (Exception e) {
+            log.error("新增线路费用失败,参数:{},错误信息:{}", JSON.toJSONString(param), e);
+            return false;
+        }
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean update(TmsLineCostAddParam param) {
+        try {
+            TmsLineCost tmsLineCost = new TmsLineCost();
+            BeanUtils.copyProperties(param, tmsLineCost);
+            boolean flag = updateById(tmsLineCost);
+            if (param.getList() != null && param.getList().size() > 0) {
+                for (TmsLineCostOther tmsLineCostOther : param.getList()) {
+                    tmsLineCostOther.setUpdater(param.getUpdater());
+                    tmsLineCostOther.setUpdaterName(param.getUpdaterName());
+                    tmsLineCostOther.setUpdateDate(param.getUpdateDate());
+                    tmsLineCostOtherService.updateById(tmsLineCostOther);
+                }
+            }
+            return flag;
+        } catch (Exception e) {
+            log.error("修改线路费用失败,参数:{},错误信息:{}", JSON.toJSONString(param), e);
+            return false;
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delete(TmsLineCostAddParam param) {
+        try {
+            TmsLineCost tmsLineCost = new TmsLineCost();
+            BeanUtils.copyProperties(param, tmsLineCost);
+            boolean flag = removeById(tmsLineCost);
+
+            List<TmsLineCostOther> list = tmsLineCostOtherService.list(param);
+            if (list != null && list.size() > 0) {
+                for (TmsLineCostOther tmsLineCostOther : list) {
+                    tmsLineCostOtherService.removeById(tmsLineCostOther);
+                }
+            }
+            return flag;
+        } catch (Exception e) {
+            log.error("删除线路费用失败,参数:{},错误信息:{}", JSON.toJSONString(param), e);
+            return false;
+        }
+    }
+
+}

src/main/java/com/aoyang/tms/service/impl/TmsOtherFeeServiceImpl.java

@@ -0,0 +1,21 @@
+package com.aoyang.tms.service.impl;
+
+
+import com.aoyang.tms.entity.TmsOtherFee;
+import com.aoyang.tms.mapper.TmsOtherFeeMapper;
+import com.aoyang.tms.service.TmsOtherFeeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 其他费用表 服务实现类
+ * </p>
+ *
+ * @author liujiren
+ * @since 2022-04-23
+ */
+@Service
+public class TmsOtherFeeServiceImpl extends ServiceImpl<TmsOtherFeeMapper, TmsOtherFee> implements TmsOtherFeeService {
+
+}

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -0,0 +1,63 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.service.WorkCycleService;
+import com.aoyang.tms.service.WorkerService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 作业端相关接口
+ * @Author guoyong
+ * @Date 2022/4/23 15:37
+ * @Version 1.0
+ */
+@Service
+public class WorkerServiceImpl implements WorkerService {
+
+    @Resource
+    private WorkCycleService workCycleService;
+
+    @Override
+    public Boolean startOrder(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean starWork(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean startWait(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean submitResult(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean finishOrder(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean arriveTerminal(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+
+    @Override
+    public Boolean finishWork(Long userId,String userName, WorkOrder workOrder) {
+        Boolean flag = true;
+        return flag;
+    }
+}

src/main/resources/mapper/TmsGasFeeMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aoyang.tms.mapper.TmsGasFeeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TmsGasFee">
+        <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
+        <result column="truck_id" property="truckId" />
+        <result column="car_number" property="carNumber" />
+        <result column="trailer_number" property="trailerNumber" />
+        <result column="gas_qty_date" property="gasQtyDate" />
+        <result column="gas_qty" property="gasQty" />
+        <result column="unit_price" property="unitPrice" />
+        <result column="gas_qty_fee" property="gasQtyFee" />
+        <result column="type" property="type" />
+        <result column="kilometre" property="kilometre" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, cycle_id, truck_id, car_number, trailer_number, gas_qty_date, gas_qty, unit_price, gas_qty_fee, type, kilometre, creater, creater_name, create_date, updater, updater_name, update_date
+    </sql>
+
+</mapper>

src/main/resources/mapper/TmsLineCostMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aoyang.tms.mapper.TmsLineCostMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TmsLineCost">
+        <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
+        <result column="truck_id" property="truckId" />
+        <result column="car_number" property="carNumber" />
+        <result column="trailer_number" property="trailerNumber" />
+        <result column="line_start" property="lineStart" />
+        <result column="line_end" property="lineEnd" />
+        <result column="kilometre" property="kilometre" />
+        <result column="etc_fee" property="etcFee" />
+        <result column="cash" property="cash" />
+        <result column="parking_fee" property="parkingFee" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, cycle_id, truck_id, car_number, trailer_number, line_start, line_end, kilometre, etc_fee, cash, parking_fee, creater, creater_name, create_date, updater, updater_name, update_date
+    </sql>
+
+</mapper>

src/main/resources/mapper/TmsLineCostOtherMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aoyang.tms.mapper.TmsLineCostOtherMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TmsLineCostOther">
+        <id column="id" property="id" />
+        <result column="line_cost_id" property="lineCostId" />
+        <result column="cost_name" property="costName" />
+        <result column="cost_fee" property="costFee" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, line_cost_id, cost_name, cost_fee, creater, creater_name, create_date, updater, updater_name, update_date
+    </sql>
+
+</mapper>

src/main/resources/mapper/TmsOtherFeeMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aoyang.tms.mapper.TmsOtherFeeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TmsOtherFee">
+        <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
+        <result column="truck_id" property="truckId" />
+        <result column="car_number" property="carNumber" />
+        <result column="trailer_number" property="trailerNumber" />
+        <result column="maintenance_fee" property="maintenanceFee" />
+        <result column="butter_fee" property="butterFee" />
+        <result column="tire_fee" property="tireFee" />
+        <result column="weighing_passing_other_fee" property="weighingPassingOtherFee" />
+        <result column="oil_change_fee" property="oilChangeFee" />
+        <result column="car_review_fee" property="carReviewFee" />
+        <result column="repair_fee" property="repairFee" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, cycle_id, truck_id, car_number, trailer_number, maintenance_fee, butter_fee, tire_fee, weighing_passing_other_fee, oil_change_fee, car_review_fee, repair_fee, creater, creater_name, create_date, updater, updater_name, update_date
+    </sql>
+
+</mapper>