From d10ee39ef95eb2442902e36dd36b1683cbd10af6 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 06 三月 2025 15:10:03 +0800 Subject: [PATCH] art: 项目性维修-详情页面-附件,设备状态,技术状态不展示问题修改, 设备选择过滤,只能选择用户范围内的设备信息 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java index 066c353..29b331c 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProjectMaintenanceOrderController.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; @@ -233,9 +234,16 @@ */ @ApiOperation(value = "椤圭洰鎬х淮淇槑缁嗕富琛↖D鏌ヨ", notes = "椤圭洰鎬х淮淇槑缁�-閫氫富琛↖D鏌ヨ") @GetMapping(value = "/queryProjectMaintenanceOrderDetailByMainId") - public Result<List<ProjectMaintenanceOrderDetail>> queryProjectMaintenanceOrderDetailByMainId(@RequestParam(name = "id", required = true) String id) { - List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.selectByMainId(id); - return Result.OK(projectMaintenanceOrderDetailList); + public Result<?> queryProjectMaintenanceOrderDetailByMainId(@RequestParam(name = "id", required = true) String id) { +// List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.selectByMainId(id); + //瀛楀吀杞崲 + LambdaQueryWrapper<ProjectMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectMaintenanceOrderDetail::getProjectMaintenanceOrderId, id); + queryWrapper.orderByDesc(ProjectMaintenanceOrderDetail::getId); + //鍒嗛〉 榛樿涓�娆″ぇ淇垨椤逛慨涓嶄細瓒呰繃100鍙拌澶� + Page<ProjectMaintenanceOrderDetail> page = new Page<ProjectMaintenanceOrderDetail>(1, 100); + Page<ProjectMaintenanceOrderDetail> page1 = projectMaintenanceOrderDetailService.page(page, queryWrapper); + return Result.OK(page1); } /** -- Gitblit v1.9.3