sgj
2026-03-10 5790d7573a83278667878e0f73104f8fc8ec5cf3
巡检统计信息纠正
已修改2个文件
11 ■■■■ 文件已修改
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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);
                }
            }
        }