From 40b263fb22d260e5d3afffcb6009eabd935aef03 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期四, 13 七月 2023 09:49:25 +0800 Subject: [PATCH] 临时提交 --- src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 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 8d108f0..fc5cbbd 100644 --- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java +++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java @@ -7,6 +7,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; +import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.project.mobile.domain.ApiRequestHeader; import com.ruoyi.project.mobile.domain.ApiResult; @@ -45,6 +46,9 @@ @Autowired IUserService userService;//用户Service + + @Autowired + private RiskService riskService; /** * 获取隐患列表 @@ -141,6 +145,14 @@ hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 + // todo-2022 此处插入附属表 +// HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); + int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); + if (result< 1){ + throw new RuntimeException("添加隐患附属信息失败"); + } + + return ApiResult.success("隐患核查保存成功"); } catch (Exception e) { return ApiResult.error("异常"); @@ -168,6 +180,11 @@ hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 + // todo-2022 隐患信息附属表 + int result = riskService.updateDangerInfoRectify(hdcp); + if (result < 1){ + throw new RuntimeException("整改信息保存失败"); + } return ApiResult.success("隐患整改保存成功"); } catch (Exception e) { return ApiResult.error("异常"); @@ -203,6 +220,12 @@ hdcpService.updateHiddenDangerCheckPoint(hdcp); hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 + + // todo-2022 验收通过,修改为已验收状态 + int result = riskService.updateDangerInfoAccept(hdcp); + if (result < 1){ + throw new RuntimeException("隐患验收信息保存失败"); + } return ApiResult.success("隐患验收保存成功"); } catch (Exception e) { @@ -264,7 +287,7 @@ /** - * 隐患计划执行中---设置为记录正常 + * 隐患计划执行中---设置为记录正常 // todo */ public ApiResult editPointSetNormal(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 -- Gitblit v1.9.2