From 75f33e37d7c74fc0196df39a8a26fa15cf3d1eb6 Mon Sep 17 00:00:00 2001 From: Timer <@> Date: Wed, 25 Mar 2026 00:56:45 +0800 Subject: [PATCH] bug --- .../SafetyCheckComprehensiveController.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java b/src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java index b90b79eb..a387817f 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java @@ -36,6 +36,7 @@ import java.util.UUID; /** * 综合检查 + * * @author lt */ @Controller @@ -125,11 +126,13 @@ public class SafetyCheckComprehensiveController { @RequestMapping("/save.do") @ResponseBody @Transactional(rollbackFor = Exception.class) - public Result save(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile file) throws Exception { + public Result save(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile[] multipartFiles) throws Exception { User cu = (User) request.getSession().getAttribute("cu"); bean.setId(UUID.randomUUID().toString()); - if (file.getSize() > 0) { - safetyFilesService.upload(request, null, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE.getId(), SafetyCheckStatusEnum.APPLY.getId(), bean.getId()); + if (multipartFiles != null) { + for (MultipartFile file : multipartFiles) { + safetyFilesService.upload(request, file, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE.getId(), SafetyCheckStatusEnum.APPLY.getId(), bean.getId()); + } } bean.setCheckCode(safetySeqService.code(request, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE)); if (bean.getCheckResult() == SafetyCheckResultEnum.OK.getId()) { @@ -153,8 +156,8 @@ public class SafetyCheckComprehensiveController { @RequestMapping("/saveApply.do") @ResponseBody @Transactional(rollbackFor = Exception.class) - public Result saveApply(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile file) throws Exception { - if(StringUtils.isEmpty(bean.getDutyUserId())){ + public Result saveApply(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile[] file) throws Exception { + if (StringUtils.isEmpty(bean.getDutyUserId())) { return Result.failed("整改负责人不能为空!"); } @@ -232,7 +235,7 @@ public class SafetyCheckComprehensiveController { @ResponseBody @Transactional(rollbackFor = Exception.class) public Result apply(HttpServletRequest request, SafetyCheckComprehensive bean) throws IOException, ServiceException { - if(StringUtils.isEmpty(bean.getDutyUserId())){ + if (StringUtils.isEmpty(bean.getDutyUserId())) { return Result.failed("整改负责人不能为空!"); } update(request, bean); @@ -336,7 +339,7 @@ public class SafetyCheckComprehensiveController { @ResponseBody @Transactional(rollbackFor = Exception.class) public Result response(HttpServletRequest request, SafetyCheckComprehensive bean, String processInstanceId) throws IOException, ServiceException { - if(StringUtils.isEmpty(bean.getConfirmUserId())){ + if (StringUtils.isEmpty(bean.getConfirmUserId())) { return Result.failed("验证人不能为空!"); } @@ -388,7 +391,7 @@ public class SafetyCheckComprehensiveController { bean.getConfirmUserName(), bean.getCopyUserId(), bean.getCopyUserName(), - SafetyCheckStatusEnum.COMPLETE.getTaskRecordPass( bean.getConfirmUserName())); + SafetyCheckStatusEnum.COMPLETE.getTaskRecordPass(bean.getConfirmUserName())); safetyFlowTaskService.saveWorkFlowRecord(true, bean.getId(), "结束",