查询计划审核页面

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

@@ -97,38 +97,7 @@ public class PlanQuarterController extends BaseController {
             }
 
             LoginUser loginUser = tokenService.getLoginUser(request);
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = iSysDeptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanQuarter::getIsExcess, 0);
-                        wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanQuarter::getIsExcess, 0);
-                        wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(PlanQuarter::getIsExcess, 1);
-                                wrapper.in(PlanQuarter::getPurchaseDeptId, childDeptIds);
-                            });
-                }
-            }
+
             lw.orderBy(true, false, PlanQuarter::getCreateTime);
             List<PlanQuarter> list = quarterService.list(lw);
             planQuarterList = quarterServiceImpl.changeTo(list);
@@ -147,69 +116,13 @@ public class PlanQuarterController extends BaseController {
     public AjaxResult examineList(@RequestBody PlanQuarterStandardVo vo, HttpServletRequest request) {
         List<PlanQuarterResponseVo> planQuarterList = new ArrayList<>();
         try {
-            LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<>();
-            lw.eq(PlanQuarter::getPlanType, "0");
-            lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-            if (!ObjectUtils.isEmpty(vo.getProjectName())) {
-                lw.like(PlanQuarter::getProjectName, vo.getProjectName());
-            }
-            if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
-                lw.eq(PlanQuarter::getPurchaseServices, vo.getPurchaseServices());
-            }
-            if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                lw.eq(PlanQuarter::getIsExcess, vo.getIsExcess());
-            }
-            if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
-                lw.eq(PlanQuarter::getProjectStatus, vo.getProjectStatus());
-            } else {
-                lw.apply("  project_status IN (1,3)", "");
-            }
-            if (!ObjectUtils.isEmpty(vo.getBeginTime())) {
-                lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
-            }
-            if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
-                lw.le(PlanQuarter::getPlanDemandSubTime, parse);
-            }
-
             LoginUser loginUser = tokenService.getLoginUser(request);
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = iSysDeptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanQuarter::getIsExcess, 0);
-                        wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanQuarter::getIsExcess, 0);
-                        wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(PlanQuarter::getIsExcess, 1);
-                                wrapper.in(PlanQuarter::getPurchaseDeptId, childDeptIds);
-                            });
-                }
+            vo.setCreated(String.valueOf(loginUser.getUserId()));
+            vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            List<PlanQuarter> planYears = quarterService.queryPage(vo);
+            if (!ObjectUtils.isEmpty(planYears) && !ObjectUtils.isEmpty(planYears.size())) {
+                planQuarterList = quarterServiceImpl.changeTo(planYears);
             }
-            lw.orderBy(true, false, PlanQuarter::getCreateTime);
-            List<PlanQuarter> list = quarterService.list(lw);
-            planQuarterList = quarterServiceImpl.changeTo(list);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -95,40 +95,6 @@ public class PlanYearsController extends BaseController {
                 lw.le(PlanYears::getPlanDemandSubTime, parse);
             }
             lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-
-            LoginUser loginUser = tokenService.getLoginUser(request);
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = iSysDeptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanYears::getIsExcess, 0);
-                        wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanYears::getIsExcess, 0);
-                        wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(PlanYears::getIsExcess, 1);
-                                wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
-                            });
-                }
-            }
             lw.orderBy(true, false, PlanYears::getCreateTime);
             List<PlanYears> planYears = planYearsService.list(lw);
             planYearsList = planYearsServiceImpl.changeTo(planYears);
@@ -147,68 +113,13 @@ public class PlanYearsController extends BaseController {
     public AjaxResult examineList(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
         try {
-            LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
-            if (!ObjectUtils.isEmpty(vo.getProjectName())) {
-                lw.like(PlanYears::getProjectName, vo.getProjectName());
-            }
-            if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
-                lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
-            }
-            if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
-            }
-            if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
-                lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
-            } else {
-                lw.apply("  project_status IN (1,3)", "");
-            }
-            if (!ObjectUtils.isEmpty(vo.getBeginTime())) {
-                lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
-            }
-            if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
-                lw.le(PlanYears::getPlanDemandSubTime, parse);
-            }
-            lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-
             LoginUser loginUser = tokenService.getLoginUser(request);
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = iSysDeptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanYears::getIsExcess, 0);
-                        wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(PlanYears::getIsExcess, 0);
-                        wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(PlanYears::getIsExcess, 1);
-                                wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
-                            });
-                }
+            vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            vo.setCreated(String.valueOf(loginUser.getUserId()));
+            List<PlanYears> planYears = planYearsService.queryPage(vo);
+            if (!ObjectUtils.isEmpty(planYears) && !ObjectUtils.isEmpty(planYears.size())) {
+                planYearsList = planYearsServiceImpl.changeTo(planYears);
             }
-            lw.orderBy(true, false, PlanYears::getCreateTime);
-            List<PlanYears> planYears = planYearsService.list(lw);
-            planYearsList = planYearsServiceImpl.changeTo(planYears);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.plan;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
@@ -8,15 +9,15 @@ import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 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.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
-import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.plan.service.ProvisionalPlanService;
-import com.ozs.plan.service.impl.PlanQuarterServiceImpl;
+import com.ozs.plan.service.impl.ProvisionalPlanServiceImpl;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.SysFileRefService;
@@ -57,6 +58,8 @@ public class ProvisionalPlanController extends BaseController {
     @Autowired
     private ProvisionalPlanService provisionalPlanService;
     @Autowired
+    private ProvisionalPlanServiceImpl provisionalPlanServiceImpl;
+    @Autowired
     private TokenService tokenService;
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -143,13 +146,25 @@ public class ProvisionalPlanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:selectProvisionalPlanAudit')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.QUERY)
     public AjaxResult selectProvisionalPlanAudit(@RequestBody ProvisionalPlanVo vo, HttpServletRequest request) {
+        List<ProvisionalPlan> provisionalPlanList = new ArrayList<>();
         if (StringUtils.isNull(vo)
                 || StringUtils.isNull(vo.getPageNum())
                 || StringUtils.isNull(vo.getPageSize())) {
             throw new ServiceException("分页参数不能为空！");
         }
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        return provisionalPlanService.selectProvisionalPlanAudit(vo, request, loginUser);
+        try {
+            LoginUser loginUser = tokenService.getLoginUser(request);
+            vo.setCreated(String.valueOf(loginUser.getUserId()));
+            vo.setPurchaseDeptId(loginUser.getDeptId());
+            List<ProvisionalPlan> provisionalPlans = provisionalPlanService.queryPage(vo);
+            if (!ObjectUtils.isEmpty(provisionalPlans) && !ObjectUtils.isEmpty(provisionalPlans.size())) {
+                provisionalPlanList = provisionalPlanServiceImpl.changeTo(provisionalPlans);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), provisionalPlanList);
+        return AjaxResult.success(pages);
     }
 
     @ApiOperation(value = "查询临时计划详情")

purchase-system/src/main/java/com/ozs/plan/doman/PlanQuarter.java

@@ -174,4 +174,10 @@ public class PlanQuarter {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date endTime;
+
+    /**
+     * 是否显示审核按钮
+     */
+    @TableField(exist = false)
+    private Boolean flag;
 }

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -156,6 +156,11 @@ public class PlanYears {
      */
     private Integer delFlay;
 
+    /**
+     * 是否显示审核按钮
+     */
+    @TableField(exist = false)
+    private Boolean flag;
     /**
      * 查询参数开始时间和结束时间
      */

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -66,7 +66,7 @@ public class ProvisionalPlan {
 
     @ApiModelProperty(value = "采购服务站")
     @TableField("purchase_services")
-    private String  purchaseServices;
+    private String purchaseServices;
 
     @Excel(name = "采购服务站")
     @TableField(exist = false)
@@ -155,4 +155,10 @@ public class ProvisionalPlan {
     @ApiModelProperty(value = "附件关联")
     @TableField(exist = false)
     List<SysFileRef> sysFileRefs;
+
+    /**
+     * 是否显示审核按钮 （true:显示，false：不显示）
+     */
+    @TableField(exist = false)
+    private Boolean flag;
 }

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/ProvisionalPlanVo.java

@@ -106,4 +106,8 @@ public class ProvisionalPlanVo extends PageVo {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    /**
+     * 是否显示审核按钮
+     */
+    private Boolean flag;
 }

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanQuarterResponseVo.java

@@ -1,6 +1,7 @@
 package com.ozs.plan.doman.vo.responseVo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.system.domain.SysFileInfo;
@@ -141,4 +142,8 @@ public class PlanQuarterResponseVo implements Serializable {
      * 待办事项提示信息
      */
     private String tipsMessage;
+    /**
+     * 是否显示审核按钮（true:显示，false：不显示）
+     */
+    private Boolean flag;
 }

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -1,6 +1,7 @@
 package com.ozs.plan.doman.vo.responseVo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.system.domain.SysFileInfo;
@@ -134,4 +135,8 @@ public class PlanYearsResponseVo implements Serializable {
      * 待办事项提示信息
      */
     private String tipsMessage;
+    /**
+     * 是否显示审核按钮（true:显示，false：不显示）
+     */
+    private Boolean flag;
 }

purchase-system/src/main/java/com/ozs/plan/mapper/PlanQuarterMapper.java

@@ -3,7 +3,6 @@ package com.ozs.plan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.plan.doman.PlanQuarter;
-import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -96,4 +95,6 @@ public interface PlanQuarterMapper extends BaseMapper<PlanQuarter> {
     public Integer review(PlanQuarterStandardVo vo);
 
     Integer sendLetter(Long planPracticalId);
+
+    List<PlanQuarter> query(PlanQuarterStandardVo vo);
 }

purchase-system/src/main/java/com/ozs/plan/mapper/PlanYearsMapper.java

@@ -25,14 +25,6 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      */
     public List<PlanYears> selectPlanYearsList(PlanYears planYears);
 
-    /**
-     * 查询年度计划记录集合(审核单位)
-     *
-     * @param planYears 年度计划请求对象
-     * @return 年度计划记录集合
-     */
-    public List<PlanYears> selectPlanYearsExamineList(PlanYears planYears);
-
     /**
      * 创建年度计划
      *
@@ -87,4 +79,6 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
     public Integer review(PlanYearsStandardVo vo);
 
     public Integer sendLetter(PlanYearsStandardVo yearsStandardVo);
+
+    List<PlanYears> query(PlanYearsStandardVo vo);
 }

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -34,4 +34,6 @@ public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
      * @return
      */
     ProvisionalPlan selectProvisionalPlanByYearId(@Param("planYearId") Integer planYearId);
+
+    List<ProvisionalPlan> query(ProvisionalPlanVo vo);
 }

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

@@ -136,4 +136,9 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      * @return 结果
      */
     AjaxResult downLoadPlanFile(PlanQuarterStandardVo quarterStandardVo);
+
+    /**
+     * 查询审核分页
+     */
+    List<PlanQuarter> queryPage(PlanQuarterStandardVo vo);
 }

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

@@ -20,8 +20,6 @@ import java.util.List;
 public interface PlanYearsService extends IService<PlanYears> {
 
 
-    //public Page selectPlanYearsExamineList(PlanYearsStandardVo vo);
-
     /**
      * 查询年度计划记录集合--导出
      *
@@ -253,4 +251,9 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @return
      */
     AjaxResult projectDetails(PlanYearsStandardVo yearsStandardVo);
+
+    /**
+     * 查询审核分页
+     */
+    List<PlanYears> queryPage(PlanYearsStandardVo vo);
 }

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

@@ -32,4 +32,6 @@ public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
     AjaxResult auditPass(ProvisionalPlanVo provisionalPlanVo);
 
     AjaxResult auditNoPass(ProvisionalPlanVo provisionalPlanVo);
+
+    List<ProvisionalPlan> queryPage(ProvisionalPlanVo vo);
 }

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

@@ -13,11 +13,9 @@ import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
-import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.QuarterEnum;
 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;
@@ -28,6 +26,7 @@ import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.mapper.PlanQuarterMapper;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanQuarterService;
+import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.doman.PmDemand;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
@@ -578,6 +577,42 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return AjaxResult.success();
     }
 
+    @Override
+    public List<PlanQuarter> queryPage(PlanQuarterStandardVo vo) {
+        List<PlanQuarter> query = planQuarterMapper.query(vo);
+        if (!ObjectUtils.isEmpty(query)) {
+            query.stream().map(o -> {
+                LambdaQueryWrapper<PmAuditDeptRef> lw = new LambdaQueryWrapper();
+                lw.eq(PmAuditDeptRef::getRefId, o.getPlanPracticalId());
+                lw.eq(PmAuditDeptRef::getRefType, "1");
+                List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
+                if (!ObjectUtils.isEmpty(list)) {
+                    List<PmAuditDeptRef> collect = list.stream()
+                            .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
+                            .collect(Collectors.toList());
+                    String deptLevel = collect.get(0).getDeptLevel();
+                    boolean f = true;
+                    f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                            f = false;
+                        }
+                    }
+                    /*
+                    *  String s1="A";
+                        String s2="B";
+                System.out.println(s1.compareTo(s2));
+                *   over: -1
+                * */
+                    o.setFlag(f);
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
+        return query;
+    }
+
     //字段赋值对应的名称
     public List<PlanQuarterResponseVo> changeTo(List<PlanQuarter> planQuarters) {
         //获取季度计划各个季度提报时间的阈值

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.service.BaseAgencyService;
 import com.ozs.common.constant.Constants;
@@ -16,7 +17,7 @@ import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.*;
 import com.ozs.common.exception.ServiceException;
-import com.ozs.common.exception.base.BaseException;
+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;
@@ -49,13 +50,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -126,22 +127,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     private PmAuditDeptRefService pmAuditDeptRefService;
 
 
-    //@Override
-    //public Page selectPlanYearsExamineList(PlanYearsStandardVo vo) {
-    //    PlanYears ofYears = new PlanYears();
-    //    PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
-    //    List<PlanYears> planYears;
-    //    List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
-    //    try {
-    //        BeanUtils.copyProperties(vo, ofYears);
-    //        planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
-    //        planYearsList = changeTo(planYears);
-    //    } catch (Exception e) {
-    //        e.printStackTrace();
-    //    }
-    //    Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planYearsList);
-    //    return pages;
-    //}
 
     @Override
     public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
@@ -171,38 +156,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                // 添加数据权限
-                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                    // 需求单位
-                    /*（purchase_dept_id = 当前用户deptID） */
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
                     lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                    // 采购管理部门  或  采购办
-                    SysDept sysDept = new SysDept();
-                    sysDept.setParentId(loginUser.getDeptId());
-                    sysDept.setStatus("0");
-                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                            .stream()
-                            .map(SysDept::getDeptId)
-                            .collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(childDeptIds)) {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanYears::getIsExcess, 0);
-                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                        });
-                    } else {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanYears::getIsExcess, 0);
-                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                        })
-                                .or((wrapper) -> {
-                                    wrapper.eq(PlanYears::getIsExcess, 1);
-                                    wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
-                                });
-                    }
                 }
+
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -1242,6 +1199,42 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.error("没有查到相关数据！");
     }
 
+    @Override
+    public List<PlanYears> queryPage(PlanYearsStandardVo vo) {
+        List<PlanYears> planYears = planYearsMapper.query(vo);
+        if (!ObjectUtils.isEmpty(planYears)) {
+            planYears.stream().map(o -> {
+                LambdaQueryWrapper<PmAuditDeptRef> lw = new LambdaQueryWrapper();
+                lw.eq(PmAuditDeptRef::getRefId, o.getPlanYearId());
+                lw.eq(PmAuditDeptRef::getRefType, "0");
+                List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
+                if (!ObjectUtils.isEmpty(list)) {
+                    List<PmAuditDeptRef> collect = list.stream()
+                            .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
+                            .collect(Collectors.toList());
+                    String deptLevel = collect.get(0).getDeptLevel();
+                    boolean f = true;
+                    f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                            f = false;
+                        }
+                    }
+                    /*
+                    *  String s1="A";
+                        String s2="B";
+                System.out.println(s1.compareTo(s2));
+                *    -1
+                * */
+                    o.setFlag(f);
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
+        return planYears;
+    }
+
     private List<SysFileInfo> getSysFileInfoList(Long redId, Integer type) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", redId);

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

@@ -31,6 +31,7 @@ import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.ProvisionalPlanService;
+import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.doman.PmDemand;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
@@ -507,6 +508,42 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         return review(provisionalPlanVo);
     }
 
+    @Override
+    public List<ProvisionalPlan> queryPage(ProvisionalPlanVo vo) {
+        List<ProvisionalPlan> provisionalPlanList = provisionalPlanMapper.query(vo);
+        if (!ObjectUtils.isEmpty(provisionalPlanList)) {
+            provisionalPlanList.stream().map(o -> {
+                LambdaQueryWrapper<PmAuditDeptRef> lw = new LambdaQueryWrapper();
+                lw.eq(PmAuditDeptRef::getRefId, o.getPlanPracticalId());
+                lw.eq(PmAuditDeptRef::getRefType, "1");
+                List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
+                if (!ObjectUtils.isEmpty(list)) {
+                    List<PmAuditDeptRef> collect = list.stream()
+                            .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
+                            .collect(Collectors.toList());
+                    String deptLevel = collect.get(0).getDeptLevel();
+                    boolean f = true;
+                    f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                            f = false;
+                        }
+                    }
+                    /*
+                    *  String s1="A";
+                        String s2="B";
+                System.out.println(s1.compareTo(s2));
+                *   over: -1
+                * */
+                    o.setFlag(f);
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
+        return null;
+    }
+
     private AjaxResult review(ProvisionalPlanVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {

purchase-system/src/main/resources/mapper/plan/PlanQuarterMapper.xml

@@ -143,6 +143,41 @@
           and del_flay = 0
     </select>
 
+    <select id="query" resultType="com.ozs.plan.doman.PlanQuarter"
+            parameterType="com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo">
+        select p.* from
+        plan_practical p left join pm_audit_dept_ref r
+        on p.plan_year_id = r.ref_id and r.ref_type = 1 and plan_type = 0
+        <where>
+            ( #{created} = 1 or r.dept_id = #{purchaseDeptId} )
+            AND r.`status`=0 and plan_type = 0
+            <if test="projectName != null and projectName != ''">
+                AND p.project_name like concat('%', #{projectName}, '%')
+            </if>
+            <if test="purchaseServices != null and purchaseServices != ''">
+                AND p.purchase_services = #{purchaseServices}
+            </if>
+            <if test="isExcess != null and isExcess != ''">
+                AND p.is_excess = #{isExcess}
+            </if>
+            <if test="projectStatus == null or projectStatus ==''">
+                AND p.project_status in (1,3)
+            </if>
+            <if test="projectStatus != null and projectStatus != ''">
+                AND p.project_status = #{projectStatus}
+            </if>
+            <if test="beginTime != null "><!-- 开始时间检索 -->
+                and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+            </if>
+            <if test="endTime != null "><!-- 结束时间检索 -->
+                and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
+            and p.del_flay=0
+        </where>
+        order by create_time desc
+
+    </select>
+
     <!--	创建计划信息-->
     <insert id="insertPlanQuarter" parameterType="com.ozs.plan.doman.PlanQuarter" useGeneratedKeys="true"
             keyProperty="planPracticalId">

purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -78,34 +78,6 @@
 		order by create_time desc
 	</select>
 
-	<select id="selectPlanYearsExamineList" parameterType="com.ozs.plan.doman.PlanYears" resultMap="PlanYearsResult">
-		select * from plan_years
-		<where>
-			<if test="projectName != null and projectName != ''">
-				AND project_name like concat('%', #{projectName}, '%')
-			</if>
-			<if test="purchaseServices != null and purchaseServices != ''">
-				AND purchase_services = #{purchaseServices}
-			</if>
-			<if test="isExcess != null and isExcess != ''">
-				AND is_excess = #{isExcess}
-			</if>
-			<if test="projectStatus == null or projectStatus ==''">
-				AND project_status in (1,3)
-			</if>
-			<if test="projectStatus != null and projectStatus != ''">
-				AND project_status = #{projectStatus}
-			</if>
-			<if test="beginTime != null "><!-- 开始时间检索 -->
-				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
-			</if>
-			<if test="endTime != null "><!-- 结束时间检索 -->
-				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
-			</if>
-			and del_flay=0
-		</where>
-		order by create_time desc
-	</select>
 
 	<select id="countProjectName" resultType="java.lang.Integer" parameterType="java.lang.String">
 		select count(plan_years.plan_year_id)
@@ -129,6 +101,41 @@
 		  and del_flay = 0
 	</select>
 
+	<select id="query" resultType="com.ozs.plan.doman.PlanYears"
+			parameterType="com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo">
+		select p.* from
+		plan_years p left join pm_audit_dept_ref r
+		on p.plan_year_id = r.ref_id and r.ref_type = 0
+		<where>
+			( #{created} = 1 or r.dept_id = #{purchaseDeptId} )
+
+			<if test="projectName != null and projectName != ''">
+				AND p.project_name like concat('%', #{projectName}, '%')
+			</if>
+			<if test="purchaseServices != null and purchaseServices != ''">
+				AND p.purchase_services = #{purchaseServices}
+			</if>
+			<if test="isExcess != null and isExcess != ''">
+				AND p.is_excess = #{isExcess}
+			</if>
+			<if test="projectStatus == null or projectStatus ==''">
+				AND p.project_status in (1,3)
+			</if>
+			<if test="projectStatus != null and projectStatus != ''">
+				AND p.project_status = #{projectStatus}
+			</if>
+			<if test="beginTime != null "><!-- 开始时间检索 -->
+				and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+			</if>
+			<if test="endTime != null "><!-- 结束时间检索 -->
+				and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+			</if>
+			and p.del_flay=0
+		</where>
+		order by create_time desc
+
+	</select>
+
 	<!--	创建计划信息-->
 	<insert id="insertPlanYears" parameterType="com.ozs.plan.doman.PlanYears" useGeneratedKeys="true"
 			keyProperty="planYearId">

purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -197,9 +197,45 @@
         where plan_practical_id = #{planPracticalId}
     </update>
 
-    <select id="selectProvisionalPlanByYearId" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.Integer">
+    <select id="selectProvisionalPlanByYearId" resultType="com.ozs.plan.doman.ProvisionalPlan"
+            parameterType="java.lang.Integer">
         select *
         from plan_practical
         where plan_year_id = #{planYearId}
     </select>
+
+    <select id="query" resultType="com.ozs.plan.doman.ProvisionalPlan"
+            parameterType="com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo">
+        select p.* from
+        plan_practical p left join pm_audit_dept_ref r
+        on p.plan_year_id = r.ref_id and r.ref_type = 1 and plan_type = 1
+        <where>
+            ( #{created} = 1 or r.dept_id = #{purchaseDeptId} )
+            AND r.`status`=0 and plan_type = 0
+            <if test="projectName != null and projectName != ''">
+                AND p.project_name like concat('%', #{projectName}, '%')
+            </if>
+            <if test="purchaseServices != null and purchaseServices != ''">
+                AND p.purchase_services = #{purchaseServices}
+            </if>
+            <if test="isExcess != null and isExcess != ''">
+                AND p.is_excess = #{isExcess}
+            </if>
+            <if test="projectStatus == null or projectStatus ==''">
+                AND p.project_status in (1,3)
+            </if>
+            <if test="projectStatus != null and projectStatus != ''">
+                AND p.project_status = #{projectStatus}
+            </if>
+            <if test="startTime != null "><!-- 开始时间检索 -->
+                and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            </if>
+            <if test="endTime != null "><!-- 结束时间检索 -->
+                and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
+            and p.del_flay=0
+        </where>
+        order by create_time desc
+
+    </select>
 </mapper>