pc运单列表接口,线路费用新增数据列

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

@@ -78,7 +78,7 @@ public class TmsLineCostController {
                       @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) {
+                || param.getCycleId() == null || param.getTruckId() == null || param.getKilometreUrl() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         if (param.getList() != null && param.getList().size() > 0) {

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

@@ -13,6 +13,9 @@ 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 java.util.*;
 import javax.annotation.Resource;
 
@@ -80,11 +83,27 @@ public class WorkOrderController {
 
     @ApiOperation(value = "根据id中止运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=60")
     @PostMapping("/stop")
-    public Result stop(@RequestBody WorkOrder param) {
-        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/stop,参数:{}", JSON.toJSONString(param));
+    public Result stop(@RequestHeader(value = "userId") Long userId,
+                       @RequestHeader(value = "userName") String userName,
+                       @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 60) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == 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());
+
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/stop,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
         if (workOrder.getOrderStatus() != 0 && workOrder.getOrderStatus() != 10 && workOrder.getOrderStatus() != 20) {
             return new Result<>(ErrCodeEnum.NO_STOP.getCode(), ErrCodeEnum.NO_STOP.getMessage());
@@ -94,11 +113,27 @@ public class WorkOrderController {
 
     @ApiOperation(value = "根据id关闭运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=50")
     @PostMapping("/close")
-    public Result close(@RequestBody WorkOrder param) {
-        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/close,参数:{}", JSON.toJSONString(param));
+    public Result close(@RequestHeader(value = "userId") Long userId,
+                        @RequestHeader(value = "userName") String userName,
+                        @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == 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());
+
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/close,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
         if (workOrder.getOrderStatus() != 40) {
             return new Result<>(ErrCodeEnum.NO_CLOSE.getCode(), ErrCodeEnum.NO_CLOSE.getMessage());
@@ -106,15 +141,30 @@ public class WorkOrderController {
         return new Result<>(workOrderService.saveOrUpdate(param));
     }
 
-    @ApiOperation(value = "根据id修改运单(运单分页列表PC端，已完成40已关闭50运单可改)", notes = "必传参数:id,orderStatus=60")
+    @ApiOperation(value = "根据id修改运单(运单分页列表PC端，待执行0已完成40已关闭50运单可改)", notes = "必传参数:id,orderStatus=60")
     @PostMapping("/pc_update")
-    public Result pcUpdate(@RequestBody WorkOrder param) {
-        log.info("根据id修改运单(运单分页列表PC端，已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
+    public Result pcUpdate(@RequestHeader(value = "userId") Long userId,
+                           @RequestHeader(value = "userName") String userName,
+                           @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == 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());
+        log.info("根据id修改运单(运单分页列表PC端，已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
-        if (workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
+        if (workOrder.getOrderStatus() != 0 || workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.NO_UPDATE.getCode(), ErrCodeEnum.NO_UPDATE.getMessage());
         }
         return new Result<>(workOrderService.saveOrUpdate(param));

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

@@ -66,6 +66,10 @@ public class TmsLineCost implements Serializable {
     @TableField("kilometre")
     private Integer kilometre;
 
+    @ApiModelProperty(value = "公里数")
+    @TableField("kilometre_url")
+    private String kilometreUrl;
+
     @ApiModelProperty(value = "ETC路费")
     @TableField("etc_fee")
     private BigDecimal etcFee;

src/main/resources/mapper/TmsLineCostMapper.xml

@@ -12,6 +12,7 @@
         <result column="line_start" property="lineStart" />
         <result column="line_end" property="lineEnd" />
         <result column="kilometre" property="kilometre" />
+        <result column="kilometre_url" property="kilometreUrl" />
         <result column="etc_fee" property="etcFee" />
         <result column="cash" property="cash" />
         <result column="parking_fee" property="parkingFee" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <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
+        id, cycle_id, truck_id, car_number, trailer_number, line_start, line_end, kilometre, kilometre_url, etc_fee, cash, parking_fee, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>