改正错误分页

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.plan;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -37,14 +38,14 @@ public class PlanQuarterController extends BaseController {
     @ApiOperation(value = "查询季度计划")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-        PageInfo<PlanQuarter> page = quarterService.selectPlanQuarterList(quarterStandardVo);
+        Page page = quarterService.selectPlanQuarterList(quarterStandardVo);
         return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "审核单位查询季度计划")
     @PostMapping("/examineList")
     public AjaxResult examineList(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-        PageInfo<PlanQuarter> page = quarterService.selectPlanQuarterExamineList(quarterStandardVo);
+        Page page = quarterService.selectPlanQuarterExamineList(quarterStandardVo);
         return AjaxResult.success(page);
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -1,6 +1,6 @@
 package com.ozs.web.controller.plan;
 
-import com.github.pagehelper.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
@@ -39,14 +39,14 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/list")
     public AjaxResult list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         //List<PlanYears> list = planYearsService.selectPlanYearsList(yearsStandardVo);
-        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
+        Page page = planYearsService.selectPlanYearsList(yearsStandardVo);
         return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "审核单位查询年度计划")
     @PostMapping("/examineList")
     public AjaxResult examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        PageInfo<PlanYears> page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        Page page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
         return AjaxResult.success(page);
     }
 

purchase-common/src/main/java/com/ozs/common/utils/PageUtils.java

@@ -1,22 +1,24 @@
 package com.ozs.common.utils;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.page.PageDomain;
 import com.ozs.common.core.page.TableSupport;
 import com.ozs.common.utils.sql.SqlUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 分页工具类
  *
  * @author ruoyi
  */
-public class PageUtils extends PageHelper
-{
+public class PageUtils extends PageHelper {
     /**
      * 设置请求分页数据
      */
-    public static void startPage()
-    {
+    public static void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
@@ -28,8 +30,48 @@ public class PageUtils extends PageHelper
     /**
      * 清理分页的线程变量
      */
-    public static void clearPage()
-    {
+    public static void clearPage() {
         PageHelper.clearPage();
     }
+
+    /**
+     * 分页函数
+     *
+     * @param currentPage 当前页数
+     * @param pageSize    每一页的数据条数
+     * @param list        要进行分页的数据列表
+     * @return 当前页要展示的数据
+     * @author pochettino
+     */
+    public static Page getPages(Integer currentPage, Integer pageSize, List list) {
+        Page page = new Page();
+        if (list == null) {
+            return null;
+        }
+        int size = list.size();
+
+        if (pageSize > size) {
+            pageSize = size;
+        }
+        if (pageSize != 0) {
+            // 求出最大页数，防止currentPage越界
+            int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+
+            if (currentPage > maxPage) {
+                currentPage = maxPage;
+            }
+        }
+        // 当前页第一条数据的下标
+        int curIdx = currentPage > 1 ? (currentPage - 1) * pageSize : 0;
+
+        List pageList = new ArrayList();
+
+        // 将当前页的数据放进pageList
+        for (int i = 0; i < pageSize && curIdx + i < size; i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+
+        page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
+        return page;
+    }
 }

purchase-system/src/main/java/com/ozs/plan/service/PlanQuarterService.java

@@ -1,7 +1,7 @@
 package com.ozs.plan.service;
 
 
-import com.github.pagehelper.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanQuarter;
@@ -23,7 +23,7 @@ public interface PlanQuarterService {
      * @param vo 季度计划请求对象
      * @return 季度计划记录集合
      */
-    public PageInfo<PlanQuarter> selectPlanQuarterList(PlanQuarterStandardVo vo);
+    public Page selectPlanQuarterList(PlanQuarterStandardVo vo);
 
     /**
      * 查询季度计划记录集合--导出
@@ -39,7 +39,7 @@ public interface PlanQuarterService {
      * @param vo 季度计划请求对象
      * @return 季度计划记录集合
      */
-    public PageInfo<PlanQuarter> selectPlanQuarterExamineList(PlanQuarterStandardVo vo);
+    public Page selectPlanQuarterExamineList(PlanQuarterStandardVo vo);
 
     /**
      * 查询季度计划记录集合(审核单位--导出）

purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -1,9 +1,8 @@
 package com.ozs.plan.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanYears;
@@ -25,7 +24,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
+    public Page selectPlanYearsList(PlanYearsStandardVo vo);
 
     /**
      * 查询年度计划记录集合--导出
@@ -41,7 +40,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
+    public Page selectPlanYearsExamineList(PlanYearsStandardVo vo);
 
     /**
      * 查询年度计划记录集合(审核单位--导出）
@@ -207,8 +206,9 @@ public interface PlanYearsService extends IService<PlanYears> {
     AjaxResult procurementOfficeWinningTheBidTotal();
 
     /**
-     * 采购办首未中标项目理总数 
+     * 采购办首未中标项目理总数
+     *
      * @return
-     */ 
+     */
     AjaxResult procurementOfficeFailureToWinTheBidTotal();
 }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -12,6 +12,7 @@ import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanQuarter;
@@ -69,11 +70,10 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     private SysFileService fileService;
 
     @Override
-    public PageInfo<PlanQuarter> selectPlanQuarterList(PlanQuarterStandardVo vo) {
+    public Page selectPlanQuarterList(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
         List<PlanQuarter> planQuarter;
         List<PlanQuarter> planQuarterList = new ArrayList<>();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         try {
             BeanUtils.copyProperties(vo, quarters);
             planQuarter = planQuarterMapper.selectPlanQuarterList(quarters);
@@ -81,8 +81,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanQuarter> pageInfo = new PageInfo<PlanQuarter>(planQuarterList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
+        return pages;
     }
 
     @Override
@@ -125,9 +125,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     }
 
     @Override
-    public PageInfo<PlanQuarter> selectPlanQuarterExamineList(PlanQuarterStandardVo vo) {
+    public Page selectPlanQuarterExamineList(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         List<PlanQuarter> planQuarter;
         List<PlanQuarter> planQuarterList = new ArrayList<>();
         try {
@@ -137,8 +136,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanQuarter> pageInfo = new PageInfo<PlanQuarter>(planQuarterList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
+        return pages;
     }
 
     @Override

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -2,19 +2,11 @@ package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.ozs.base.domain.BaseAgency;
-import com.ozs.base.domain.BaseNoticeType;
-import com.ozs.base.vo.BaseNoticeVo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.core.domain.entity.SysProcurementStandard;
 import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
@@ -24,6 +16,7 @@ import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -38,18 +31,12 @@ import com.ozs.pm.doman.PmDemand;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
-import com.ozs.system.domain.SysOperLog;
-import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
-import com.ozs.system.mapper.SysOperLogMapper;
-import com.ozs.system.mapper.SysProcurementStandardMapper;
 import com.ozs.system.mapper.SysRoleMapper;
-import com.ozs.system.mapper.SysUserRoleMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
-import com.ozs.system.service.ISysRoleService;
 import com.ozs.system.service.ISysUserService;
 import com.ozs.system.service.SysFileService;
 import lombok.extern.slf4j.Slf4j;
@@ -66,8 +53,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -98,15 +83,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Autowired
     private ISysUserService userService;
     @Autowired
-    private SysProcurementStandardMapper sysProcurementStandardMapper;
-    @Autowired
     private PmDemandMapper pmDemandMapper;
+
     @Override
-    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
+    public Page selectPlanYearsList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         List<PlanYears> planYears;
         List<PlanYears> planYearsList = new ArrayList<>();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue(), true);
         try {
             BeanUtils.copyProperties(vo, ofYears);
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
@@ -114,8 +97,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYearsList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planYearsList);
+        return pages;
     }
 
     @Override
@@ -158,9 +141,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     @Override
-    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
+    public Page selectPlanYearsExamineList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         List<PlanYears> planYears;
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
@@ -170,8 +152,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYearsList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planYearsList);
+        return pages;
     }
 
     @Override
@@ -554,16 +536,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
-                        .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                                .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PlanYears::getPurchaseDeptId, collect)
-                        .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",ProjectStatus.PLANWAIEXAMINE.getCode(),ProjectStatus.PLANTOEXAMINE.getCode());
+                                .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -583,7 +565,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                pmDemands =pmDemandMapper.selectList(queryWrapper);
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -602,7 +584,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -611,7 +593,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(),PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
+                        .in("project_status", PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -631,8 +613,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                queryWrapper.in("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode(),PmProjectStatus.UNDER_CONSTRUCTION.getCode());
-                pmDemands =pmDemandMapper.selectList(queryWrapper);
+                queryWrapper.in("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -651,8 +633,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                queryWrapper.in("project_status",PmProjectStatus.UNDER_CONSTRUCTION.getCode(),PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
-                pmDemands =pmDemandMapper.selectList(queryWrapper);
+                queryWrapper.in("project_status", PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -671,7 +653,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -680,7 +662,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
+                        .in("project_status", PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
                                 PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
                                 PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
                                 PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
@@ -707,7 +689,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -743,7 +725,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -752,7 +734,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .lt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -772,7 +754,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -781,7 +763,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .gt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {