Pārlūkot izejas kodu

获取行车日志导出类

chengang 4 gadi atpakaļ
vecāks
revīzija
69e1d6c3cf

+ 6 - 1
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;

+ 13 - 1
src/main/java/com/aoyang/tms/controller/JxlsExportTestController.java

@@ -3,9 +3,11 @@ 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;
@@ -34,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) {
@@ -57,6 +65,10 @@ public class JxlsExportTestController {
         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));
     }