art: 设备管理-点检工单/周保工单-设备状态，设备履历变化修改

zhangherong

2025-04-21 ebc4996578cc06cacda5561a45a4dfc2c951d070

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java

@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,10 +8,10 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
@@ -43,7 +42,7 @@
   /**
    * 分页列表查询
    *
    * @param eamInspectionOrder
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
@@ -52,13 +51,13 @@
   //@AutoLog(value = "点检工单-分页列表查询")
   @ApiOperation(value="点检工单-分页列表查询", notes="点检工单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
   public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                             HttpServletRequest req) {
//      QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
      Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
      IPage<EamInspectionOrder> pageList = eamInspectionOrderService.page(page, queryWrapper);
      IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
      return Result.OK(pageList);
   }

@@ -87,7 +86,7 @@
   public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
      String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
      eamInspectionOrderRequest.setOrderNum(codeSeq);
      eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.AUTO));
      eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
      eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
      return Result.OK("添加成功！");
   }
@@ -155,7 +154,8 @@
    @ApiOperation(value="点检工单-点检流程", notes="点检工单-点检流程")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
       return eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
       eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
       return Result.OK("操作成功");
    }

   /**