Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -344,7 +344,12 @@ public enum ErrCodeEnum {
     /**
      * 该运单状态下不修改
      */
-    NO_UPDATE(2312, "该运单状态下不修改")
+    NO_UPDATE(2312, "该运单状态下不修改"),
+
+    /**
+     * 已完成周期才可以导出行车日志
+     */
+    CAN_NOT_EXPORT(2313, "已完成周期才可以导出行车日志")
     ;
 
     private int code;

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

@@ -1,8 +1,13 @@
 package com.aoyang.tms.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.WorkCycle;
 import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.service.JxlsExportTestService;
+import com.aoyang.tms.service.WorkCycleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -31,14 +36,20 @@ public class JxlsExportTestController {
 
     @Resource
     private JxlsExportTestService jxlsExportTestService;
+    @Resource
+    private WorkCycleService workCycleService;
 
     @ApiOperation(value = "下载行车日志,导出专用")
     @PostMapping("/download_test")
     public StreamingResponseBody download(HttpServletResponse response, @RequestBody WorkOrder param) {
         log.info("下载行车日志,导出专用,调用/tms/jxls_export/download_test,参数:{}", JSON.toJSONString(param));
-        if (null == param) {
+        if (null == param || param.getCycleId() == null) {
             log.error("download_list param is null");
         }
+        WorkCycle workCycle = workCycleService.getById(param.getCycleId());
+        if (workCycle.getStatus() != 2) {
+            log.error("已完成周期才可以导出行车日志");
+        }
         try {
             return jxlsExportTestService.download(param, response);
         } catch (Exception e) {
@@ -46,4 +57,19 @@ public class JxlsExportTestController {
         }
         return null;
     }
+
+    @ApiOperation(value = "获取行车日志导出类", notes = "必传参数:cycleId")
+    @PostMapping("/get_get_work_log_tpl_vo")
+    public Result getWorkLogTplVO(@RequestBody WorkOrder param) {
+        log.info("获取行车日志导出类,调用/tms/jxls_export/get_get_work_log_tpl_vo,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getCycleId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkCycle workCycle = workCycleService.getById(param.getCycleId());
+        if (workCycle.getStatus() != 2) {
+            return new Result<>(ErrCodeEnum.CAN_NOT_EXPORT.getCode(), ErrCodeEnum.CAN_NOT_EXPORT.getMessage());
+        }
+        return new Result<>(jxlsExportTestService.getWorkLogTplVO(param));
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.aoyang.tms.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -50,6 +51,19 @@ public class WorkCycleController {
         return new Result<>(workCycle);
     }
 
+    @ApiOperation(value = "更新前行程周期天气", notes = "必传参数:id和天气信息")
+    @PostMapping("/update_weather")
+    public Result updateWeather(@RequestBody WorkCycle workCycleParam) {
+        log.info("前行程周期，/tms/work_cycle/update，参数:{}", JSON.toJSONString(workCycleParam));
+        if (workCycleParam == null || workCycleParam.getId() == null || StringUtils.isBlank(workCycleParam.getWeather())) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkCycle workCycle = workCycleService.getById(workCycleParam.getId());
+        workCycle.setWeather(workCycleParam.getWeather());
+        Boolean flag = workCycleService.updateById(workCycle);
+        return new Result<>(flag);
+    }
+
     @ApiOperation(value = "获取历史行车列表", notes = "")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkCycle> pageParam) {

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

@@ -101,6 +101,10 @@ public class WorkCycle implements Serializable {
     @TableField("shipper_name")
     private String shipperName;
 
+    @ApiModelProperty(value = "周期开始时天气")
+    @TableField("weather")
+    private String weather;
+
     @ApiModelProperty(value = "周期开始时间")
     @TableField("start_time")
     private LocalDateTime startTime;

src/main/resources/mapper/WorkCycleMapper.xml

@@ -20,6 +20,7 @@
         <result column="trailer_number" property="trailerNumber"/>
         <result column="shipper_id" property="shipperId"/>
         <result column="shipper_name" property="shipperName"/>
+        <result column="weather" property="weather"/>
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
         <result column="driver_one_sign_url" property="driverOneSignUrl"/>
@@ -51,6 +52,7 @@
         car_number,
         trailer_number,
         shipper_id,
+        weather,
         shipper_name,
         start_time,
         end_time,