From ac8870aae3ec2b5ec5315cc668b482858195cfa4 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期五, 04 七月 2025 15:14:52 +0800 Subject: [PATCH] 优化处理 --- src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java index bf3b915..9dfc64f 100644 --- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java +++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java @@ -437,6 +437,7 @@ /** * 隐患计划执行中---隐患登记 */ + @Transactional public ApiResult editPointDangerRegisterSave(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 ApiRequestHeader requestHeader = getHeader(header); @@ -450,6 +451,9 @@ } if (ObjectUtils.isEmpty(hdcp.getFindTime())){ throw new RuntimeException("发现时间不能为空"); + } + if(ObjectUtils.isEmpty(hdcp.getDangerSrc())){ + throw new RuntimeException("隐患来源不能为空"); } hdcp.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间 hdcp.setRegisterUserId(Long.valueOf(header.userId));//设置隐患登记上报创建人ID @@ -488,9 +492,18 @@ hdcp.setUpdateTime(DateUtils.getNowDate()); i = hdcpService.updateHiddenDangerCheckPoint(hdcp); //20250623增加此逻辑 - int result = riskService.updateDangerInfo(hdcp); - if (result < 1){ - throw new RuntimeException("修改失败"); + PreventRiskDangerInfo dangerInfoByDangerCheckPointId = riskService.getDangerInfoByDangerCheckPointId(hdcp.getId()); + if (dangerInfoByDangerCheckPointId != null){ + // todo-2022 此处修改附属表 20250623 放开 + int result = riskService.updateDangerInfo(hdcp); + if (result < 1){ + throw new RuntimeException("修改失败"); + } + }else { + int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); + if (result < 1){ + throw new RuntimeException("修改失败"); + } } } @@ -498,7 +511,7 @@ return ApiResult.success("隐患排查计划执行--隐患登记--成功"); } catch (Exception e) { - return ApiResult.error("异常"); + return ApiResult.error(e.getMessage()); } } -- Gitblit v1.9.2