From 3dfc79a424b662fdb1f649b728aa811d70204c9b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 21 八月 2023 10:27:13 +0800 Subject: [PATCH] 点检 保养 调整 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionPlanController.java | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionPlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionPlanController.java index dd36f73..afc1554 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionPlanController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionPlanController.java @@ -137,7 +137,7 @@ String fileType = json.getString("fileType"); String description = json.getString("description"); String type = json.getString("type"); - // 鏂囦欢鍙樻洿 +// 鏂囦欢鍙樻洿 if (isFileChange) { if (StrUtils.isNotBlankOrNull(uploadId)) { // 鎯呭舰涓�銆佷粠鏂囦欢绠$悊涓�夋嫨 @@ -194,30 +194,30 @@ specialtyInspectionPlanDetailService.save(specialtyInspectionPlanDetail); } - boolean isFileChange = json.getBoolean("isFileChange"); - String uploadId = json.getString("uploadId"); - String fileType = json.getString("fileType"); - String description = json.getString("description"); - String type = json.getString("type"); - // 鏂囦欢鍙樻洿 - if (isFileChange) { - if (StrUtils.isNotBlankOrNull(uploadId)) { - // 鎯呭舰涓�銆佷粠鏂囦欢绠$悊涓�夋嫨 -// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId); - } else { - // 鎯呭舰浜屻�侀噸鏂颁笂浼� - // 1銆佹寔涔卽pload - MultipartFile multipartFile = request.getFile("file"); - List<MultipartFile> multipartFileList = new ArrayList<>(); - multipartFileList.add(multipartFile); -// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description); - List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description); - // 2銆佸垱寤�/淇敼 uploadRela - // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲� -// uploadRelaService.saveOrUpdateUploadRale(specialtyInspectionPlan.getId(), type, sysUploads.get(0).getId()); - sysBaseApi.saveOrUpdateUploadRale(specialtyInspectionPlan.getId(), type, sysUploads.get(0).getId()); - } - } +// boolean isFileChange = json.getBoolean("isFileChange"); +// String uploadId = json.getString("uploadId"); +// String fileType = json.getString("fileType"); +// String description = json.getString("description"); +// String type = json.getString("type"); +// // 鏂囦欢鍙樻洿 +// if (isFileChange) { +// if (StrUtils.isNotBlankOrNull(uploadId)) { +// // 鎯呭舰涓�銆佷粠鏂囦欢绠$悊涓�夋嫨 +//// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId); +// } else { +// // 鎯呭舰浜屻�侀噸鏂颁笂浼� +// // 1銆佹寔涔卽pload +// MultipartFile multipartFile = request.getFile("file"); +// List<MultipartFile> multipartFileList = new ArrayList<>(); +// multipartFileList.add(multipartFile); +//// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description); +// List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description); +// // 2銆佸垱寤�/淇敼 uploadRela +// // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲� +//// uploadRelaService.saveOrUpdateUploadRale(specialtyInspectionPlan.getId(), type, sysUploads.get(0).getId()); +// sysBaseApi.saveOrUpdateUploadRale(specialtyInspectionPlan.getId(), type, sysUploads.get(0).getId()); +// } +// } return Result.ok("涓婁紶鎴愬姛!"); } -- Gitblit v1.9.3