bug

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -92,6 +92,7 @@ public class HomeNoticeController extends BaseController {
                 lw.eq(PlanYears::getPurchaseDeptId, SecurityUtils.getDeptId());
             }
         }
+        //如果年度计划已添加到季度计划，或临时计划同步到年度计划，就不展示年度计划数据
         List<PlanYears> list = planYearsService.list(lw);
         for (PlanYears years : list) {
             LambdaQueryWrapper<PlanQuarter> qw = new LambdaQueryWrapper<>();

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

@@ -18,20 +18,16 @@ import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.plan.service.impl.PlanQuarterServiceImpl;
-import com.ozs.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -57,8 +53,6 @@ public class PlanQuarterController extends BaseController {
     private PlanQuarterServiceImpl quarterServiceImpl;
     @Autowired
     private TokenService tokenService;
-    @Autowired
-    private ISysDeptService iSysDeptService;
 
     @ApiOperation(value = "查询季度计划")
     @PostMapping("/list")

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2549,25 +2549,25 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         resVo6.setColumnNamePlus("累计项目数量");
         resVos.add(resVo6);
         //本月度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
         StatisticalChartsResVo resVoA = pmDemandMapper.majorProjectByStatusThisMonthFi(pmDemandReqVo);
         resVoA.setColumnName("本月度完成");
         resVoA.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoA);
         //本季度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
         StatisticalChartsResVo resVoB = pmDemandMapper.majorProjectByStatusThisQuaFi(pmDemandReqVo);
         resVoB.setColumnName("本季度完成");
         resVoB.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoB);
         //本年度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
         StatisticalChartsResVo resVoC = pmDemandMapper.majorProjectByStatusThisYearFi(pmDemandReqVo);
         resVoC.setColumnName("本年度完成");
         resVoC.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoC);
         //今年以来累计完成数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
         StatisticalChartsResVo resVo8 = pmDemandMapper.majorProjectByStatusToThisYear(pmDemandReqVo);
         resVo8.setColumnName("今年以来累计");
         resVo8.setColumnNamePlus("累计完成数量");