From e511b9ab654b831842a1ced1ce7c4556c6b9d96d Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 15 五月 2025 11:50:38 +0800 Subject: [PATCH] art: 设备管理-二保,明细查询 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java index b7f3457..14e4263 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java @@ -1,15 +1,13 @@ package org.jeecg.modules.eam.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; 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.EamSecondMaintenanceOrderDetail; import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderDetailService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import java.util.List; - /** +/** * @Description: 璁惧浜岀骇淇濆吇鏄庣粏 * @Author: jeecg-boot * @Date: 2025-04-29 @@ -29,30 +27,45 @@ @Slf4j @Api(tags="璁惧浜岀骇淇濆吇鏄庣粏") @RestController -@RequestMapping("/eam/eamSecondMaintenanceOrderDetail") +@RequestMapping("/eam/secondMaintenanceOrderDetail") public class EamSecondMaintenanceOrderDetailController extends JeecgController<EamSecondMaintenanceOrderDetail, IEamSecondMaintenanceOrderDetailService> { @Autowired private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService; - + /** * 鍒嗛〉鍒楄〃鏌ヨ * - * @param eamSecondMaintenanceOrderDetail + * @param orderId * @param pageNo * @param pageSize - * @param req * @return */ - @AutoLog(value = "璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ") - @ApiOperation(value="璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ") + @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") - public Result<?> queryPageList(EamSecondMaintenanceOrderDetail eamSecondMaintenanceOrderDetail, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamSecondMaintenanceOrderDetail, req.getParameterMap()); - Page<EamSecondMaintenanceOrderDetail> page = new Page<EamSecondMaintenanceOrderDetail>(pageNo, pageSize); + public Result<?> queryPageList(@RequestParam("orderId") String orderId, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId); + queryWrapper.orderByAsc(EamSecondMaintenanceOrderDetail::getItemCode); + Page<EamSecondMaintenanceOrderDetail> page = new Page<>(pageNo, pageSize); IPage<EamSecondMaintenanceOrderDetail> pageList = eamSecondMaintenanceOrderDetailService.page(page, queryWrapper); return Result.OK(pageList); } + + /** + * 涓�娆″姞杞� + * + * @param orderId + * @return + */ + @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�") + @GetMapping(value = "/queryList") + public Result<?> queryList(@RequestParam("orderId") String orderId) { + LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId); + queryWrapper.orderByAsc(EamSecondMaintenanceOrderDetail::getItemCode); + List<EamSecondMaintenanceOrderDetail> list = eamSecondMaintenanceOrderDetailService.list(queryWrapper); + return Result.OK(list); + } } -- Gitblit v1.9.3