From a013aea101294906be4af0f5081dc6f5c2878d02 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 22:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 12 +++++++++---
hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml | 6 ++++++
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java | 1 +
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/controller/RegionInspectionRecordController.java | 3 +--
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java | 5 ++++-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java | 2 ++
6 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
index 286940c..6bf9cce 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
@@ -27,6 +27,7 @@
*/
@Excel(sort = 2,title = "隐患地点")
private String dangerLocation;
+ private String dictId;
/**
* 隐患标题
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/controller/RegionInspectionRecordController.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/controller/RegionInspectionRecordController.java
index 9c48252..df32012 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/controller/RegionInspectionRecordController.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/controller/RegionInspectionRecordController.java
@@ -85,8 +85,7 @@
@PostMapping("selectAppInfo")
BasicResult selectAppInfo(@RequestBody Map map){
String regionInspectionId = map.get("regionInspectionId").toString();
- String userId = map.get("userId").toString();
- return regionInspectionRecordService.selectAppInfo(regionInspectionId,userId);
+ return regionInspectionRecordService.selectAppInfo(regionInspectionId,null);
}
/**
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
index b9be0e3..9fe5b0c 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java
@@ -43,4 +43,6 @@
//小程序巡检打卡列表
List<Map> selectAppList(Map map);
+
+ String selectPlatUserId(String userId);
}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
index b12d1b6..d32f128 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
@@ -158,6 +158,8 @@
@Override
public BasicResult selectAppInfo(String regionInspectionId, String userId) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ userId = sysUserInfo.getUserId();
RegionInspectionEntity obj = regionInspectionRecordMapper.selectInfo(regionInspectionId, userId);
List<RegionInspectionHazardInformEntity> regionList = new ArrayList<>();
if (obj.getRegionIds()!=null){
@@ -196,7 +198,8 @@
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String companyId = sysUserInfo.getCompanyId();
String userId = sysUserInfo.getUserId();
- map.put("userId",userId);
+ String platUserId = regionInspectionRecordMapper.selectPlatUserId(userId);
+ map.put("userId",platUserId);
map.put("companyId",companyId);
int pageNum = (int) map.get("pageNum");
int pageSize = (int) map.get("pageSize");
diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
index 07cd957..39bd177 100644
--- a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
@@ -137,7 +137,8 @@
<select id="selectInfo" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
select
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -152,6 +153,7 @@
from t_hidden_danger t
LEFT JOIN sys_users su ON su.user_id = t.createUser
LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
+ LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation
where t.id=#{id}
</select>
@@ -159,7 +161,8 @@
<select id="selectPageList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
SELECT
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -174,6 +177,7 @@
from t_hidden_danger t
LEFT JOIN sys_users su ON su.user_id = t.createUser
LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
+ LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation
WHERE
t.isUse = 1
and t.companyId = #{companyId}
@@ -187,7 +191,8 @@
<select id="selectAppList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
SELECT
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -202,6 +207,7 @@
from t_hidden_danger t
LEFT JOIN sys_users su ON su.user_id = t.createUser
LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
+ LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation
WHERE
t.isUse = 1
and t.companyId = #{companyId}
diff --git a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
index 0bae3bf..3066bd9 100644
--- a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
@@ -311,4 +311,10 @@
a.id
</select>
+ <select id="selectPlatUserId" resultType="java.lang.String">
+ SELECT
+ plat_id platId
+ FROM sys_users
+ WHERE user_id= #{userId,jdbcType=VARCHAR}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3