From 5445185e5e0dab34d626bed169b45d8e0d532696 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 13 九月 2023 09:17:35 +0800 Subject: [PATCH] 保养、维修实际用料 bug修改, --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java index 2058084..52c547e 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java @@ -81,27 +81,27 @@ @GetMapping("getMaintenanceStandardList") public Result<?> getMaintenanceStandardList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) { IPage<Map<String, Object>> maintenanceStandardDetails = maintenanceStandardDetailService.getMaintenanceStandardDetailById(pageNo, pageSize, params); - for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) { - //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁 -// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list(); - List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null); - if (sysUploadRelas.size() > 0) { - detail.put("isNoPhotoFlag", true); - //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo"); - List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo"); - ; - SysUpload upload = new SysUpload(); - if (CollectionUtils.isNotEmpty(uploadRelas)) { - //upload = uploadService.getById(uploadRelas.get(0).getUploadId()); - upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId()); - } - detail.put("upload", upload); - } else { - detail.put("isNoPhotoFlag", false); - SysUpload upload = new SysUpload(); - detail.put("upload", upload); - } - } +// for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) { +// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁 +//// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list(); +// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null); +// if (sysUploadRelas.size() > 0) { +// detail.put("isNoPhotoFlag", true); +// //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo"); +// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo"); +// ; +// SysUpload upload = new SysUpload(); +// if (CollectionUtils.isNotEmpty(uploadRelas)) { +// //upload = uploadService.getById(uploadRelas.get(0).getUploadId()); +// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId()); +// } +// detail.put("upload", upload); +// } else { +// detail.put("isNoPhotoFlag", false); +// SysUpload upload = new SysUpload(); +// detail.put("upload", upload); +// } +// } return Result.ok(maintenanceStandardDetails); } -- Gitblit v1.9.3