中止运单判断

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

@@ -90,9 +90,6 @@ public class WorkOrderController {
             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");
@@ -120,9 +117,6 @@ public class WorkOrderController {
             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");
@@ -150,9 +144,6 @@ public class WorkOrderController {
             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");

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

@@ -70,7 +70,7 @@ public class TmsGasFee implements Serializable {
     @TableField("gas_qty_fee")
     private BigDecimal gasQtyFee;
 
-    @ApiModelProperty(value = "加气方式（1现金2大象加气）")
+    @ApiModelProperty(value = "加气方式（1现金2大象加气3固定加气站）")
     @TableField("type")
     private Integer type;
 

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

@@ -1,6 +1,7 @@
 package com.aoyang.tms.service.impl;
 
 
+import com.aoyang.tms.controller.vo.WorkLogTplVO;
 import com.aoyang.tms.entity.TmsGasFee;
 import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.JxlsExportTestService;
@@ -29,7 +30,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
     @Override
     public StreamingResponseBody download(TmsGasFee param, HttpServletResponse response) throws IOException {
 
-
+        WorkLogTplVO workLogTplVO = new WorkLogTplVO();
         TmsGasFee tmsGasFee = tmsGasFeeService.getById(param);
         byte imageBytes[] = getImageBytes("/cn/chendd/examples/images/splash.jpg");
 
@@ -44,7 +45,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         log.info("tplfileName :{}", tplfileName);
         if (os != null && inputStream != null) {
             Map<String, Object> model = new HashMap<String, Object>();
-            model.put("tmsGasFee", tmsGasFee);
+            model.put("workLogTplVO", workLogTplVO);
             JxlsUtils.exportExcel(inputStream, os, model);
             os.close();
         }