From 46d143d1d6fe8f286399f4d027c9a86adf7cd7fc Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 09 七月 2025 08:50:01 +0800 Subject: [PATCH] feat(inspection,maintenance): - 实现保养工单批量确认功能 - 在点检记录确认时增加时间限制,距离上次更新时间两小时内不允许确认 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java index c00d56b..0f8e778 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java @@ -120,13 +120,15 @@ @Log(title = "淇濆吇璁″垝", businessType = BusinessType.IMPORT) @SaCheckPermission("eims:maintPlan:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { - //ExcelResult<MaintCheckItemVo> result = ExcelUtil.importExcel(file.getInputStream(), MaintCheckItemVo.class, new MaintCheckItemImportListener(updateSupport)); + public R<Void> importData(@RequestPart("files") List<MultipartFile> files, boolean updateSupport) throws Exception { + StringBuilder successMsg = new StringBuilder(); + for (MultipartFile file : files) { + String res = eimsMaintPlanService.importData(file, updateSupport); + successMsg.append(res).append("; \r\n"); - String res = eimsMaintPlanService.importData(file, updateSupport); - - return R.ok(res); + } + return R.ok(successMsg.toString()); } /** -- Gitblit v1.9.3