From e0f827f71f5bb9d1ed9f6414221e90eeb34632a7 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期四, 04 九月 2025 11:07:01 +0800 Subject: [PATCH] 排产工单模块设备点检涉及接口 --- src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java index 1546bcd..5f8d97e 100644 --- a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java +++ b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.eam.controller; import cn.hutool.core.collection.CollectionUtil; +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; @@ -24,10 +25,15 @@ import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail; import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest; import org.jeecg.modules.eam.service.IEamEquipmentService; +import org.jeecg.modules.eam.service.IEamMaintenanceOrderDetailService; +import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService; import org.jeecg.modules.eam.service.IEamMaintenanceStandardService; +import org.jeecg.modules.eam.vo.MaintenanceStandardDetailVo; +import org.jeecg.modules.eam.vo.MaintenanceStandardVo; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -60,6 +66,8 @@ private ISysBusinessCodeRuleService businessCodeRuleService; @Autowired private IEamEquipmentService eamEquipmentService; + @Autowired + private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -242,6 +250,33 @@ return Result.OK(eamMaintenanceStandard); } + @AutoLog(value = "淇濆吇鏍囧噯-閫氳繃璁惧id鏌ヨ淇濆吇鏍囧噯鍙婃槑缁嗛」") + @ApiOperation(value = "淇濆吇鏍囧噯-閫氳繃璁惧id鏌ヨ淇濆吇鏍囧噯鍙婃槑缁嗛」", notes = "淇濆吇鏍囧噯-閫氳繃璁惧id鏌ヨ淇濆吇鏍囧噯鍙婃槑缁嗛」") + @GetMapping(value = "/queryByEquipmentId") + public Result<MaintenanceStandardVo> queryByEquipmentId(@RequestParam("equipmentId") String equipmentId) { + EamMaintenanceStandard maintenanceStandard = eamMaintenanceStandardService.list(new LambdaQueryWrapper<EamMaintenanceStandard>() + .eq(EamMaintenanceStandard::getEquipmentId, equipmentId) + .eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0) + .eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.NORMAL.name()) + .eq(EamMaintenanceStandard::getMaintenanceCategory, MaintenanceCategoryEnum.POINT_INSPECTION.name())) + .stream().findFirst().orElse(null); + if (maintenanceStandard == null) { + return Result.error("鏈壘鍒拌璁惧涓嬬殑淇濆吇鏍囧噯锛�"); + } + MaintenanceStandardVo maintenanceStandardVo = new MaintenanceStandardVo(); + BeanUtils.copyProperties(maintenanceStandard, maintenanceStandardVo); + List<EamMaintenanceStandardDetail> maintenanceStandardDetails = eamMaintenanceStandardDetailService + .selectByStandardId(maintenanceStandard.getId()); + List<MaintenanceStandardDetailVo> maintenanceStandardDetailVos = CollectionUtil.newArrayList(); + maintenanceStandardDetails.forEach(item -> { + MaintenanceStandardDetailVo maintenanceStandardDetailVo = new MaintenanceStandardDetailVo(); + BeanUtils.copyProperties(item, maintenanceStandardDetailVo); + maintenanceStandardDetailVos.add(maintenanceStandardDetailVo); + }); + maintenanceStandardVo.setMaintenanceStandardDetailList(maintenanceStandardDetailVos); + return Result.OK(maintenanceStandardVo); + } + /** * 瀵煎嚭excel * -- Gitblit v1.9.3