From 9d3675b12829de9ec46c210c5c8c460705206dbc Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期六, 18 十一月 2023 16:46:48 +0800 Subject: [PATCH] 问题项修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java index 943f517..15e1c5a 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java @@ -15,8 +15,11 @@ import org.jeecg.common.system.base.entity.SysUpload; import org.jeecg.common.system.base.entity.SysUploadRela; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.DailyMaintenanceOrder; import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail; +import org.jeecg.modules.eam.entity.InspectionOrder; import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService; +import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -41,6 +44,8 @@ @Autowired private IDailyMaintenanceOrderDetailService dailyMaintenanceOrderDetailService; + @Autowired + private IDailyMaintenanceOrderService dailyMaintenanceOrderService; @Autowired private ISysBaseAPI sysBaseApi; @@ -183,7 +188,14 @@ @PermissionData public Result<?> getDailyMaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) { IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.getDailyMaintenanceOrderDetailList(pageNo, pageSize, params); -// for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) { + for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) { + String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId"); + DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId); + if("4".equals(dailyMaintenanceOrder.getStatus())){ + record.put("disabled",false); + }else{ + record.put("disabled",true); + } // //鑾峰彇鏄惁鏈夌ず渚嬪浘鐗� //// List<SysUploadRela> sketchUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) record.get("maintenanceStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list(); // List<SysUploadRela> sketchUploadRelas = sysBaseApi.listByBusIdAndBusType((String) record.get("maintenanceStandardDetailId"), null); @@ -200,7 +212,7 @@ // SysUpload upload = new SysUpload(); // record.put("sketchPhoto", upload); // } -// } + } return Result.ok(dailyMaintenanceOrderDetailList); } -- Gitblit v1.9.3