From 9a12866758b1749953e1330c2e64d25d7a6a05b5 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 09 十一月 2023 14:11:48 +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 | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 47fc2ef..3a995b4 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
@@ -4,6 +4,7 @@
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.ExcelUtils;
import com.thhy.general.utils.UUIDUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity;
@@ -13,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -96,24 +98,51 @@
}
@Override
- public BasicResult selectNoPageList(Map<String, Object> map) {
+ public void export(Map<String, Object> map, HttpServletResponse response) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
map.put("companyId",sysUserInfo.getCompanyId());
List<HiddenDangerEntity> hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
hiddenDangerEntities.forEach(obj ->{
- String id = obj.getId();
- obj.setImgEntities(hiddenDangerMapper.selectImgList(id));
+ Integer auditStatus = obj.getAuditStatus();
+ Integer level = obj.getLevel();
+ switch (auditStatus){
+ case 0:
+ obj.setAuditStatusName("未审核");
+ break;
+ case 1:
+ obj.setAuditStatusName("审核通过");
+ break;
+ case 2:
+ obj.setAuditStatusName("审核失败");
+ break;
+ }
+ if (level != null){
+ switch (level){
+ case 1:
+ obj.setLevelName("一般隐患");
+ break;
+ case 2:
+ obj.setLevelName("重大隐患");
+ break;
+ case 3:
+ obj.setLevelName("不存在");
+ break;
+ }
+ }
});
- return BasicResult.success(hiddenDangerEntities);
+ ExcelUtils.downExcel(hiddenDangerEntities,HiddenDangerEntity.class,response,"隐患举报");
}
@Override
public BasicResult selectInfo(String id) {
- return BasicResult.success(hiddenDangerMapper.selectInfo(id));
+ HiddenDangerEntity hiddenDangerEntity = hiddenDangerMapper.selectInfo(id);
+ hiddenDangerEntity.setImgEntities(hiddenDangerMapper.selectImgList(id));
+ return BasicResult.success(hiddenDangerEntity);
}
@Override
public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
+ hiddenDangerEntity.setAuditStatus(1);//1审核通过
hiddenDangerMapper.update(hiddenDangerEntity);
return BasicResult.success();
}
--
Gitblit v1.9.3