From 452cf744b08f2148729427fec50b07a4cf0cad31 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 23 三月 2026 15:18:15 +0800
Subject: [PATCH] 在线用户菜单页排序修复
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
index c07ff6e..efe8be5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -4,16 +4,22 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PatrolSuperData;
-import com.fzzy.igds.domain.*;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.*;
@@ -57,7 +63,7 @@
if(null != weekList && weekList.size() > 0){
PatrolSuperData patrolSuperData;
Date start = DateUtil.getCurZero(DateUtil.getNewByDay(new Date(), -1)); //鏄ㄥぉ闆剁偣闆跺垎
- Date end = DateUtil.getCurZero(new Date()); //浠婂ぉ闆剁偣闆跺垎
+ Date end = DateUtil.getCurZero(new Date()); //浠婂ぉ闆剁偣闆跺垎
for (Patrol patrol : weekList) {
patrolSuperData = map.get(patrol.getDeptId());
@@ -72,7 +78,7 @@
//鏄ㄥぉ缁熻
if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){
- patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);
+ patrolSuperData.setYesterdayNum(patrolSuperData.getYesterdayNum() + 1);
}
}
}
@@ -147,6 +153,7 @@
* @return
*/
@Expose
+ @Log(title = "宸℃閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
public BaseResp deletePatrolConf(PatrolConf bank){
if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
return BaseResp.success();
--
Gitblit v1.9.3