Merge remote-tracking branch 'origin/master'

lyh

2025-06-25 4864c87d65e797d2ecd827b1eca9d46aec0950aa

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

@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -10,22 +11,21 @@
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EamMajorPartialRepairDetail;
import org.jeecg.modules.eam.service.IEamMajorPartialRepairDetailService;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -34,17 +34,18 @@
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
 * @Description: 大修项修明细表
 * @Description: eam_major_partial_repair_detail
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date:   2025-06-20
 * @Version: V1.0
 */
@Slf4j
@Api(tags="大修项修明细表")
@Api(tags="eam_major_partial_repair_detail")
@RestController
@RequestMapping("/eam/eamMajorPartialRepairDetail")
@Slf4j
public class EamMajorPartialRepairDetailController extends JeecgController<EamMajorPartialRepairDetail, IEamMajorPartialRepairDetailService> {
   @Autowired
   private IEamMajorPartialRepairDetailService eamMajorPartialRepairDetailService;
@@ -58,10 +59,10 @@
    * @param req
    * @return
    */
   @AutoLog(value = "大修项修明细表-分页列表查询")
   @ApiOperation(value="大修项修明细表-分页列表查询", notes="大修项修明细表-分页列表查询")
   //@AutoLog(value = "eam_major_partial_repair_detail-分页列表查询")
   @ApiOperation(value="eam_major_partial_repair_detail-分页列表查询", notes="eam_major_partial_repair_detail-分页列表查询")
   @GetMapping(value = "/list")
   public Result<?> queryPageList(EamMajorPartialRepairDetail eamMajorPartialRepairDetail,
   public Result<IPage<EamMajorPartialRepairDetail>> queryPageList(EamMajorPartialRepairDetail eamMajorPartialRepairDetail,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
@@ -77,10 +78,11 @@
    * @param eamMajorPartialRepairDetail
    * @return
    */
   @AutoLog(value = "大修项修明细表-添加")
   @ApiOperation(value="大修项修明细表-添加", notes="大修项修明细表-添加")
   @AutoLog(value = "eam_major_partial_repair_detail-添加")
   @ApiOperation(value="eam_major_partial_repair_detail-添加", notes="eam_major_partial_repair_detail-添加")
   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:add")
   @PostMapping(value = "/add")
   public Result<?> add(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
   public Result<String> add(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
      eamMajorPartialRepairDetailService.save(eamMajorPartialRepairDetail);
      return Result.OK("添加成功！");
   }
@@ -91,10 +93,11 @@
    * @param eamMajorPartialRepairDetail
    * @return
    */
   @AutoLog(value = "大修项修明细表-编辑")
   @ApiOperation(value="大修项修明细表-编辑", notes="大修项修明细表-编辑")
   @AutoLog(value = "eam_major_partial_repair_detail-编辑")
   @ApiOperation(value="eam_major_partial_repair_detail-编辑", notes="eam_major_partial_repair_detail-编辑")
   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<?> edit(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
   public Result<String> edit(@RequestBody EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
      eamMajorPartialRepairDetailService.updateById(eamMajorPartialRepairDetail);
      return Result.OK("编辑成功!");
   }
@@ -105,10 +108,11 @@
    * @param id
    * @return
    */
   @AutoLog(value = "大修项修明细表-通过id删除")
   @ApiOperation(value="大修项修明细表-通过id删除", notes="大修项修明细表-通过id删除")
   @AutoLog(value = "eam_major_partial_repair_detail-通过id删除")
   @ApiOperation(value="eam_major_partial_repair_detail-通过id删除", notes="eam_major_partial_repair_detail-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:delete")
   @DeleteMapping(value = "/delete")
   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      eamMajorPartialRepairDetailService.removeById(id);
      return Result.OK("删除成功!");
   }
@@ -119,12 +123,13 @@
    * @param ids
    * @return
    */
   @AutoLog(value = "大修项修明细表-批量删除")
   @ApiOperation(value="大修项修明细表-批量删除", notes="大修项修明细表-批量删除")
   @AutoLog(value = "eam_major_partial_repair_detail-批量删除")
   @ApiOperation(value="eam_major_partial_repair_detail-批量删除", notes="eam_major_partial_repair_detail-批量删除")
   //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.eamMajorPartialRepairDetailService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功！");
      return Result.OK("批量删除成功!");
   }
   
   /**
@@ -133,11 +138,14 @@
    * @param id
    * @return
    */
   @AutoLog(value = "大修项修明细表-通过id查询")
   @ApiOperation(value="大修项修明细表-通过id查询", notes="大修项修明细表-通过id查询")
   //@AutoLog(value = "eam_major_partial_repair_detail-通过id查询")
   @ApiOperation(value="eam_major_partial_repair_detail-通过id查询", notes="eam_major_partial_repair_detail-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
   public Result<EamMajorPartialRepairDetail> queryById(@RequestParam(name="id",required=true) String id) {
      EamMajorPartialRepairDetail eamMajorPartialRepairDetail = eamMajorPartialRepairDetailService.getById(id);
      if(eamMajorPartialRepairDetail==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(eamMajorPartialRepairDetail);
   }

@@ -147,9 +155,10 @@
   * @param request
   * @param eamMajorPartialRepairDetail
   */
    //@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair_detail:exportXls")
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamMajorPartialRepairDetail eamMajorPartialRepairDetail) {
      return super.exportXls(request, eamMajorPartialRepairDetail, EamMajorPartialRepairDetail.class, "大修项修明细表");
        return super.exportXls(request, eamMajorPartialRepairDetail, EamMajorPartialRepairDetail.class, "eam_major_partial_repair_detail");
  }

  /**
@@ -159,6 +168,7 @@
   * @param response
   * @return
   */
    //@RequiresPermissions("eam_major_partial_repair_detail:importExcel")
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamMajorPartialRepairDetail.class);