From 2c783432245859f3ee745e4e9d8cc98dfa7c0865 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 21 十一月 2023 11:28:46 +0800
Subject: [PATCH] 20231121_qiuyh_调整巡检打卡、防患举报导出
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 3a995b4..cc10f59 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
@@ -15,6 +15,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -88,8 +89,19 @@
map.put("companyId",sysUserInfo.getCompanyId());
int pageNum = (int) map.get("pageNum");
int pageSize = (int) map.get("pageSize");
+ int type = 0;
+ if( map.get("type")!= null){
+ type = (int) map.get("type");//type =1 小程序来的
+ }
PageHelper.startPage(pageNum,pageSize);
- List<HiddenDangerEntity> hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
+ List<HiddenDangerEntity> hiddenDangerEntities = new ArrayList<>();
+ if(type == 1){
+ //小程序 待审核排前面 待审核按时间正序 审核成功的倒叙
+ hiddenDangerEntities = hiddenDangerMapper.selectAppList(map);
+ }else {
+ //web 按时间倒序
+ hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
+ }
hiddenDangerEntities.forEach(obj ->{
String id = obj.getId();
obj.setImgEntities(hiddenDangerMapper.selectImgList(id));
@@ -110,7 +122,7 @@
obj.setAuditStatusName("未审核");
break;
case 1:
- obj.setAuditStatusName("审核通过");
+ obj.setAuditStatusName("已审核");
break;
case 2:
obj.setAuditStatusName("审核失败");
--
Gitblit v1.9.3