From 0f15ebf6575a2f79fdeadee3613bc3eb0923a590 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 23 十一月 2023 14:12:29 +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 | 17 +++++++++++++++--
1 files changed, 15 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 cfbd110..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("审核失败");
@@ -142,6 +154,7 @@
@Override
public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
+ hiddenDangerEntity.setAuditStatus(1);//1审核通过
hiddenDangerMapper.update(hiddenDangerEntity);
return BasicResult.success();
}
--
Gitblit v1.9.3