Merge remote-tracking branch 'origin/master'

lyh

5 天以前 ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +11,7 @@
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.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceSpare;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceSpareService;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: 三保备件明细
@@ -55,6 +58,22 @@
      Page<EamThirdMaintenanceSpare> page = new Page<EamThirdMaintenanceSpare>(pageNo, pageSize);
      IPage<EamThirdMaintenanceSpare> pageList = eamThirdMaintenanceSpareService.page(page, queryWrapper);
      return Result.OK(pageList);
   }

   /**
    * 一次加载
    *
    * @param orderId
    * @return
    */
   @ApiOperation(value = "周保工单明细-不分页列表查询", notes = "周保工单明细-不分页列表查询")
   @GetMapping(value = "/queryList")
   public Result<?> queryList(@RequestParam("orderId") String orderId) {
      LambdaQueryWrapper<EamThirdMaintenanceSpare> queryWrapper = new LambdaQueryWrapper<>();
      queryWrapper.eq(EamThirdMaintenanceSpare::getOrderId, orderId);
      queryWrapper.orderByAsc(EamThirdMaintenanceSpare::getSpareCode);
      List<EamThirdMaintenanceSpare> list = eamThirdMaintenanceSpareService.list(queryWrapper);
      return Result.OK(list);
   }
   
   /**
@@ -126,28 +145,5 @@
      EamThirdMaintenanceSpare eamThirdMaintenanceSpare = eamThirdMaintenanceSpareService.getById(id);
      return Result.OK(eamThirdMaintenanceSpare);
   }

  /**
   * 导出excel
   *
   * @param request
   * @param eamThirdMaintenanceSpare
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceSpare eamThirdMaintenanceSpare) {
      return super.exportXls(request, eamThirdMaintenanceSpare, EamThirdMaintenanceSpare.class, "三保备件明细");
  }

  /**
   * 通过excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamThirdMaintenanceSpare.class);
  }

}