运单分页列表及详情

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

@@ -3,6 +3,7 @@ package com.aoyang.tms.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.WorkSpot;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -98,4 +99,24 @@ public class ShipperController {
 
         return new Result<>(shipperService.save(param));
     }
+
+    @ApiOperation(value = "删除托运方", notes = "根据id删除,参数：id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Shipper param) {
+        log.info("删除托运方,调用/tms/shipper/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(shipperService.removeById(param));
+    }
+
+    @ApiOperation(value = "根据id获取托运方详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody Shipper param) {
+        log.info("根据id获取托运方详情,调用/tms/shipper/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(shipperService.getById(param));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.aoyang.tms.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.service.CommonService;
 import org.springframework.web.bind.annotation.*;
 
@@ -113,4 +114,14 @@ public class TruckDeptController {
         }
         return new Result<>(truckDeptService.removeById(param));
     }
+
+    @ApiOperation(value = "根据id获取运力部门详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TruckDept param) {
+        log.info("根据id获取运单详情,调用/tms/truck_dept/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<>(truckDeptService.getById(param));
+    }
 }

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

@@ -110,4 +110,14 @@ public class WorkSpotController {
         }
         return new Result<>(workSpotService.removeById(param));
     }
+
+    @ApiOperation(value = "根据id获取作业点详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody WorkSpot param) {
+        log.info("根据id获取作业点详情,调用/tms/work_spot/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workSpotService.getById(param));
+    }
 }

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

@@ -123,6 +123,14 @@ public class WorkOrder implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
+    @ApiModelProperty(value = "所属部门id")
+    @TableField("dept_id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "所属部门名称")
+    @TableField("dept_name")
+    private String deptName;
+
     @ApiModelProperty(value = "计划到达时间")
     @TableField("plan_reach_time")
     private LocalDateTime planReachTime;

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

@@ -56,8 +56,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         if (workOrderParam.getShipperName() != null) {
             queryWrapper.like("shipper_name", workOrderParam.getShipperName());
         }
-        //TODO运力部门筛选
-
+        if (workOrderParam.getDeptName() != null) {
+            queryWrapper.like("dept_name", workOrderParam.getDeptName());
+        }
 
         IPage<WorkOrder> records = page(page, queryWrapper.orderByDesc("update_date"));
         List<WorkOrder> list = records.getRecords();
@@ -76,9 +77,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             //TODO运单作业状态
             workOrderPageListVO.setWorkOrderType(null);
             //TODO执行运力(车牌号-挂车车牌号)
-            workOrderPageListVO.setCarAndTrailerNumber(null);
-            //TODO运力部门
-            workOrderPageListVO.setTruckDeptName(null);
+            workOrderPageListVO.setCarAndTrailerNumber("[" + workOrder.getCarNumber() + "]");
+            if (workOrder.getTrailerNumber() != null) {
+                workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");
+            }
+            workOrderPageListVO.setTruckDeptName(workOrder.getDeptName());
 
             listVo.add(workOrderPageListVO);
         }