zhangherong
2025-04-17 447a83ebbdceb8a015c02cfa982aa16587450380
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -13,6 +13,7 @@
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 +44,7 @@
   /**
    * 分页列表查询
    *
    * @param eamInspectionOrder
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
@@ -52,13 +53,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 +88,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("添加成功!");
   }