添加查询条件

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

@@ -77,6 +77,15 @@ public class PlanYearsController extends BaseController {
             if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
                 lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
             }
+            //是否是拉取到季度计划 true：是
+            if (!ObjectUtils.isEmpty(vo.getIsToQuarter()) && vo.getIsToQuarter().equals("true")) {
+                //查出不在季度计划表中的id
+                List<Integer> ids = planYearsService.idNotInQuarter();
+                if (ObjectUtils.isEmpty(ids)) {
+                    return AjaxResult.success(new Page());
+                }
+                lw.in(PlanYears::getPlanYearId, ids);
+            }
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                 lw.like(PlanYears::getProjectName, vo.getProjectName());
             }
@@ -306,13 +315,13 @@ public class PlanYearsController extends BaseController {
         LoginUser loginUser = getLoginUser();
         List<String> list = new ArrayList<>();
         list.add("网空采购站");
-        if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getDeptId())) {
+        if (ObjectUtils.isEmpty(loginUser) || ObjectUtils.isEmpty(loginUser.getDeptId())) {
             return error("当前登陆过期，请重新登录！");
         }
         Long deptId = loginUser.getDeptId();
         // 获取当前登陆人的部门名称
         SysDept sysDept = iSysDeptService.selectById(deptId);
-        if (StringUtils.isNull(sysDept) || StringUtils.isNull(sysDept.getDeptName())) {
+        if (ObjectUtils.isEmpty(sysDept) || ObjectUtils.isEmpty(sysDept.getDeptName())) {
             return error("当前登陆人没有部门信息，请核对数据！");
         }
 

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

@@ -1,6 +1,7 @@
 package com.ozs.plan.doman.vo.requestVo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
@@ -163,7 +164,14 @@ public class PlanYearsStandardVo extends PageVo {
     @JsonFormat(pattern = "yyyy-MM")
     private Date endTime;
 
-    /** 查看详情的类型 */
+    /**
+     * 查看详情的类型
+     */
     @ApiModelProperty("详情类型，1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况")
     private String detailType;
+
+    /**
+     * 是否是拉取到季度计划 true：是
+     */
+    private String isToQuarter;
 }

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

@@ -6,6 +6,7 @@ import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -81,4 +82,8 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
     public Integer sendLetter(PlanYearsStandardVo yearsStandardVo);
 
     List<PlanYears> query(PlanYearsStandardVo vo);
+
+    @Select("SELECT plan_year_id FROM plan_years WHERE plan_year_id not in" +
+            "(SELECT plan_year_id FROM plan_practical WHERE del_flay=0)  AND del_flay=0")
+    List<Integer> idNotInQuarter();
 }

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

@@ -274,4 +274,11 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @return
      */
     AjaxResult handleApp(PlanYearsStandardVo yearsStandardVo);
+
+    /**
+     * 查出不在季度计划表中的id
+     *
+     * @return
+     */
+    List<Integer> idNotInQuarter();
 }

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

@@ -1262,6 +1262,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success("已拒绝改申请");
     }
 
+    @Override
+    public List<Integer> idNotInQuarter() {
+        return planYearsMapper.idNotInQuarter();
+    }
+
     /**
      * 根据年度计划提报时间的阈值进行提示
      *