仓库查询过滤优化

czt

2025-12-22 d6e33e1daa6118dd6e799907eb3d8bc312f785b8

 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java

@@ -1,17 +1,19 @@
package com.fzzy.igds;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;

@@ -28,6 +30,7 @@
    @Resource
    private CoreDeptService coreDeptService;

    /*-------------------巡检监管统计信息--------------------*/
    /**
     * patrolPR#getData 巡检监管统计
     *
@@ -58,12 +61,26 @@
            for (Patrol patrol : weekList) {
                patrolSuperData = map.get(patrol.getDeptId());

                //7天内统计
                patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);

                //当天统计
                if(patrol.getCreateTime().after(end)){
                    patrolSuperData.setCurNum(patrolSuperData.getCurNum() + 1);
                    patrolSuperData.setIsPatrol("Y");
                }

                //昨天统计
                if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){
                    patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);
                }
            }
        }

        return new ArrayList<>(map.values());
    }

    /*-------------------电子巡更记录主表信息--------------------*/
    /**
     * patrolPR#pagePatrolData 获取巡检记录信息
     *
@@ -85,4 +102,47 @@
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }



    /*-------------------电子巡更配置信息--------------------*/

    /**
     * patrolPR#listPatrolConf
     * 银行列表
     */
    @DataProvider
    public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
        return patrolService.listPatrolConf(param);
    }

    /**
     * 保存/更新
     * patrolPR#saveUpdateConf
     * @param bank
     * @return
     */
    @Transactional
    @DataResolver
    public BaseResp saveUpdateConf(PatrolConf bank){

        if(StringUtils.isEmpty(bank.getId())){
            return patrolService.addPatrolConf(bank);
        }else {
            return patrolService.updatePatrolConf(bank);
        }
    }


    /**
     * 删除
     * patrolPR#deletePatrolConf
     * @param bank
     * @return
     */
    @Expose
    public BaseResp deletePatrolConf(PatrolConf bank){
        if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
        return BaseResp.success();
    }

}