From 5790d7573a83278667878e0f73104f8fc8ec5cf3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 11:03:51 +0800
Subject: [PATCH] 巡检统计信息纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java | 9 ++++++---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index 51ef2af..86a1468 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -73,6 +74,7 @@
if (null != param.getEnd()) {
queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
}
+ queryWrapper.orderByDesc("create_time");
patrolMapper.selectPage(page, queryWrapper);
}
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 aea2e71..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
@@ -8,7 +8,9 @@
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;
@@ -17,6 +19,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.*;
@@ -60,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());
@@ -75,7 +78,7 @@
//鏄ㄥぉ缁熻
if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){
- patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);
+ patrolSuperData.setYesterdayNum(patrolSuperData.getYesterdayNum() + 1);
}
}
}
--
Gitblit v1.9.3