From c83bd5ccc72512c9935135ff76b7c3f7e81a14b8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 24 五月 2023 15:27:45 +0800
Subject: [PATCH] 检索上报数据时，兼容改名
---
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
index 95c1949..16a6aad 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -97,7 +97,7 @@
/**
- * 定时隐患排查保存
+ * 定时隐患排查保存 -- todo
*/
public ApiResult editDangerScheduleSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -209,8 +209,15 @@
queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
queryExist.setCheckPointId(hdcp.getCheckPointId());
queryExist.setCheckId(hdcp.getCheckId());
+
+ /**
+ * 本次查询结果 ：如果未上报过隐患，必定为空
+ * ？同一个检查任务，同一个排查点，可能多次上报隐患。
+ * 本次查询未用到id,导致数据不唯一
+ * */
List<HiddenDangerCheckPoint> queryExistList = hdcpService.selectHiddenDangerCheckPointList(queryExist);
int i=0;
+ //如果隐患信息已经存在，就新插入一条；如果不存在，就修改隐患信息
if(queryExistList.size()>0){
hdcp.setId(null);
hdcp.setCheckTime(DateUtils.getNowDate());
@@ -219,6 +226,9 @@
hdcp.setCompanyId(user.getCompanyId());
i = hdcpService.insertHiddenDangerCheckPoint(hdcp);
+ if (i< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
+ }
// todo-2022 此处插入附属表
//获取Id返回值
@@ -233,10 +243,14 @@
hdcp.setUpdateTime(DateUtils.getNowDate());
i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
- // todo-2022 此处修改附属表
- int result = riskService.updateDangerInfo(hdcp);
- if (result < 1){
- throw new RuntimeException("修改失败");
+ // todo-2022 此处修改附属表,注释：
+// int result = riskService.updateDangerInfo(hdcp);
+// if (result < 1){
+// throw new RuntimeException("修改失败");
+// }
+ int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+ if (result< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
}
}
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
--
Gitblit v1.9.2