在线用户菜单页排序修复

sgj

2026-03-23 452cf744b08f2148729427fec50b07a4cf0cad31

 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();