From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
index c6fbf3b..fcfa191 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
@@ -65,6 +65,9 @@
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String userId = sysUserInfo.getUserId();
hiddenDangerEntity.setUpdateUser(userId);
+ if (hiddenDangerEntity.getDictId() != null){
+ hiddenDangerEntity.setDangerLocation(hiddenDangerEntity.getDictId());
+ }
hiddenDangerEntity.setUpdateTime(new Date());
synchronized (Lock){
hiddenDangerMapper.update(hiddenDangerEntity);
@@ -103,19 +106,13 @@
PageHelper.startPage(pageNum,pageSize);
List<HiddenDangerEntity> hiddenDangerEntities = new ArrayList<>();
if(type == 1){//审核列表
- if (sysUserInfo.getUserType() == 2){
- map.put("createUser",sysUserInfo.getUserId());
- }
//小程序 待审核排前面 待审核按时间正序 审核成功的倒叙
hiddenDangerEntities = hiddenDangerMapper.selectAppList(map);
}else if(type == 2){//隐患举报详情列表
- if (sysUserInfo.getUserType() == 2){
- map.put("createUser",sysUserInfo.getUserId());
- }
+ map.put("createUser",sysUserInfo.getUserId());
//小程序 待审核排前面 待审核按时间正序 审核成功的倒叙
hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
- }
- else {
+ } else {
//web 按时间倒序
hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
}
@@ -174,7 +171,8 @@
public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String platUserId = regionInspectionRecordMapper.selectPlatUserId(hiddenDangerEntity.getCreateUser());
-
+ Map platUser = regionInspectionRecordMapper.getPlatUser(platUserId);
+ int user_type = (int) platUser.get("user_type");
Map account = new HashMap();
account.put("userId",platUserId);
//查询账户
@@ -187,6 +185,8 @@
}
hiddenDangerEntity.setAuditStatus(1);//1审核通过
hiddenDangerEntity.setDangerLocation(null);
+ hiddenDangerEntity.setAuditTime(new Date());
+ hiddenDangerEntity.setAuditUser(sysUserInfo.getUserId());
synchronized (Lock){
hiddenDangerMapper.update(hiddenDangerEntity);
IntegralAccountEntity integralAccountEntity = IntegralAccountEntity
@@ -195,7 +195,7 @@
.id(UUIDUtils.create())
.accumulateIntegral(accumulateIntegral+hiddenDangerEntity.getIntegral())
.totalIntegral(totalIntegral+hiddenDangerEntity.getIntegral())
- .userType(sysUserInfo.getUserType())
+ .userType(user_type)
.build();
IntegralDetailEntity integralDetailEntity = IntegralDetailEntity
@@ -206,7 +206,7 @@
.integralWater(hiddenDangerEntity.getIntegral())
.createTime(new Date())
.createUser(sysUserInfo.getUserId())
- .userType(sysUserInfo.getUserType())
+ .userType(user_type)
.userId(platUserId)
.type(1)
.remark("隐患审核")
--
Gitblit v1.9.3