Merge remote-tracking branch 'origin/master'

lyh

2025-07-10 736003d4534e1686b3e9ee27f7baa2afba7ad959

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.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,16 +8,11 @@
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.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;

 /**
 * @Description: 技术状态鉴定工单
@@ -37,21 +31,18 @@
   /**
    * 分页列表查询
    *
    * @param eamTechnicalStatusEvaluationOrder
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   @ApiOperation(value="技术状态鉴定工单-分页列表查询", notes="技术状态鉴定工单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<?> queryPageList(EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder,
   public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderQuery query,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrder, req.getParameterMap());
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
      Page<EamTechnicalStatusEvaluationOrder> page = new Page<EamTechnicalStatusEvaluationOrder>(pageNo, pageSize);
      IPage<EamTechnicalStatusEvaluationOrder> pageList = eamTechnicalStatusEvaluationOrderService.page(page, queryWrapper);
      IPage<EamTechnicalStatusEvaluationOrder> pageList = eamTechnicalStatusEvaluationOrderService.queryPageList(page, query);
      return Result.OK(pageList);
   }
   
@@ -82,34 +73,7 @@
      eamTechnicalStatusEvaluationOrderService.updateById(eamTechnicalStatusEvaluationOrder);
      return Result.OK("编辑成功!");
   }
	
   /**
    * 通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "技术状态鉴定工单-通过id删除")
   @ApiOperation(value="技术状态鉴定工单-通过id删除", notes="技术状态鉴定工单-通过id删除")
   @DeleteMapping(value = "/delete")
   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
      eamTechnicalStatusEvaluationOrderService.removeById(id);
      return Result.OK("删除成功!");
   }
	
   /**
    * 批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "技术状态鉴定工单-批量删除")
   @ApiOperation(value="技术状态鉴定工单-批量删除", notes="技术状态鉴定工单-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.eamTechnicalStatusEvaluationOrderService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功！");
   }

   
   /**
    * 通过id查询
@@ -117,35 +81,10 @@
    * @param id
    * @return
    */
   @AutoLog(value = "技术状态鉴定工单-通过id查询")
   @ApiOperation(value="技术状态鉴定工单-通过id查询", notes="技术状态鉴定工单-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
      EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder = eamTechnicalStatusEvaluationOrderService.getById(id);
      return Result.OK(eamTechnicalStatusEvaluationOrder);
   }

  /**
   * 导出excel
   *
   * @param request
   * @param eamTechnicalStatusEvaluationOrder
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) {
      return super.exportXls(request, eamTechnicalStatusEvaluationOrder, EamTechnicalStatusEvaluationOrder.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, EamTechnicalStatusEvaluationOrder.class);
  }

}