ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java

@@ -1,31 +1,33 @@
 package com.ruoyi.web.controller.tyre;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.*;
+import com.sun.jna.platform.win32.OaIdl;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import static com.ruoyi.common.utils.file.FileUploadUtils.extractFilename;
 
 /**
@@ -36,7 +38,8 @@ import static com.ruoyi.common.utils.file.FileUploadUtils.extractFilename;
  */
 @Controller
 @RequestMapping("/tyre/order")
-public class BizMaintenanceOrderController extends BaseController {
+public class BizMaintenanceOrderController extends BaseController
+{
     private String prefix = "tyre/order";
 
     @Autowired
@@ -53,12 +56,11 @@ public class BizMaintenanceOrderController extends BaseController {
 
     @Autowired
     private ISysAttachmentService iSysAttachmentService;
-    @Autowired
-    private IRecordTyreMileageService recordTyreMileageService;
 
     @RequiresPermissions("system:order:view")
     @GetMapping()
-    public String order() {
+    public String order()
+    {
         return prefix + "/order";
     }
 
@@ -68,7 +70,8 @@ public class BizMaintenanceOrderController extends BaseController {
     @RequiresPermissions("system:order:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(BizMaintenanceOrder bizMaintenanceOrder) {
+    public TableDataInfo list(BizMaintenanceOrder bizMaintenanceOrder)
+    {
         startPage();
         List<BizMaintenanceOrder> list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder);
         return getDataTable(list);
@@ -80,16 +83,13 @@ public class BizMaintenanceOrderController extends BaseController {
     @RequiresPermissions("system:order:list")
     @PostMapping("/listMaintenanceOrder")
     @ResponseBody
-    public TableDataInfo listMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder) {
+    public TableDataInfo listMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder)
+    {
         startPage();
         List<BizMaintenanceOrder> list = bizMaintenanceOrderService.selectBizMaintenanceOrderListTwo(bizMaintenanceOrder);
         return getDataTable(list);
     }
 
-    /**
-     * 新增维保工单
-     */
-
     /**
      * 导出维保工单列表
      */
@@ -97,12 +97,16 @@ public class BizMaintenanceOrderController extends BaseController {
     @Log(title = "维保工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(BizMaintenanceOrder bizMaintenanceOrder) {
+    public AjaxResult export(BizMaintenanceOrder bizMaintenanceOrder)
+    {
         List<BizMaintenanceOrder> list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder);
         ExcelUtil<BizMaintenanceOrder> util = new ExcelUtil<BizMaintenanceOrder>(BizMaintenanceOrder.class);
         return util.exportExcel(list, "维保工单数据");
     }
 
+    /**
+     * 新增维保工单
+     */
     /**
      * 新增维保工单
      */
@@ -123,7 +127,8 @@ public class BizMaintenanceOrderController extends BaseController {
     @Log(title = "维保工单", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(BizMaintenanceOrder bizMaintenanceOrder) {
+    public AjaxResult addSave(BizMaintenanceOrder bizMaintenanceOrder)
+    {
         return toAjax(bizMaintenanceOrderService.insertBizMaintenanceOrder(bizMaintenanceOrder));
     }
 
@@ -132,7 +137,8 @@ public class BizMaintenanceOrderController extends BaseController {
      */
     @RequiresPermissions("system:order:edit")
     @GetMapping("/edit/{orderId}")
-    public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap) {
+    public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap)
+    {
         BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderService.selectBizMaintenanceOrderByOrderId(orderId);
         mmap.put("bizMaintenanceOrder", bizMaintenanceOrder);
         // 查询同车牌上一张已完成维保工单；“维保前”按业务口径取上一单的维保后结果，不能再混入当前车辆实时装胎状态。
@@ -158,7 +164,8 @@ public class BizMaintenanceOrderController extends BaseController {
     @Log(title = "维保工单", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(BizMaintenanceOrder bizMaintenanceOrder) {
+    public AjaxResult editSave(BizMaintenanceOrder bizMaintenanceOrder)
+    {
         return toAjax(bizMaintenanceOrderService.updateBizMaintenanceOrder(bizMaintenanceOrder));
     }
 
@@ -169,34 +176,35 @@ public class BizMaintenanceOrderController extends BaseController {
     @Log(title = "维保工单", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-    public AjaxResult remove(String ids) {
+    public AjaxResult remove(String ids)
+    {
         return toAjax(bizMaintenanceOrderService.deleteBizMaintenanceOrderByOrderIds(ids));
     }
-
     @PostMapping("/PDAGetMaintenanceOrder")
     @ResponseBody
-    public AjaxResult PDAGetMaintenanceOrder(@RequestBody BizMaintenanceOrder bizMaintenanceOrder) {
+    public AjaxResult PDAGetMaintenanceOrder(@RequestBody BizMaintenanceOrder bizMaintenanceOrder)
+    {
         List<BizMaintenanceOrder> list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder);
         return AjaxResult.success(list);
     }
 
     /**
      * PDA添加保存工单
-     *
      * @param bizMaintenanceOrder
      * @return
      */
     @PostMapping("/PDAAddMaintenanceOrder")
     @ResponseBody
-    public AjaxResult PDAAddMaintenanceOrder(@RequestBody BizMaintenanceOrder bizMaintenanceOrder) {
+    public AjaxResult PDAAddMaintenanceOrder(@RequestBody BizMaintenanceOrder bizMaintenanceOrder)
+    {
         String orderNo=orderNoCreate();
         bizMaintenanceOrder.setOrderNo(orderNo);
         return toAjax(bizMaintenanceOrderService.insertBizMaintenanceOrder(bizMaintenanceOrder));
     }
-
+    @Autowired
+    private IRecordTyreMileageService recordTyreMileageService;
     /**
      *  PDA保存执行工单的方法
-     *
      * @param json
      * @param files
      * @return
@@ -204,7 +212,8 @@ public class BizMaintenanceOrderController extends BaseController {
     @PostMapping("/PDASaveMaintenanceOrder")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult PDASaveMaintenanceOrder(String json, List<MultipartFile> files) {
+    public AjaxResult PDASaveMaintenanceOrder(String json, List<MultipartFile> files)
+    {
         MaintenanceOrderDTO bizMaintenanceOrder= JSONObject.parseObject(json, MaintenanceOrderDTO.class);
         // 2. 校验参数
         if (bizMaintenanceOrder == null || bizMaintenanceOrder.getOrder() == null) {
@@ -212,12 +221,6 @@ public class BizMaintenanceOrderController extends BaseController {
         }
 
         BizMaintenanceOrder order = bizMaintenanceOrder.getOrder();
-
-        BigDecimal inputMileage = order.getInputMileage();
-        if (inputMileage == null|| inputMileage.compareTo(BigDecimal.ZERO) == 0) {
-            return error("请输入里程");
-        }
-
         Long orderId = order.getOrderId();
 
         // 3. 执行更新操作