|
@@ -93,6 +93,14 @@ public class HomeNoticeController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
List<PlanYears> list = planYearsService.list(lw);
|
|
|
+ for (PlanYears years : list) {
|
|
|
+ LambdaQueryWrapper<PlanQuarter> qw = new LambdaQueryWrapper<>();
|
|
|
+ qw.eq(PlanQuarter::getPlanYearId, years.getPlanYearId());
|
|
|
+ if (planQuarterService.count(qw) > 1) {
|
|
|
+ list.remove(years);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//项目搜索的结果中要包含临时计划
|
|
|
LambdaQueryWrapper<PlanQuarter> ls = new LambdaQueryWrapper<PlanQuarter>();
|
|
|
if (!StringUtils.isBlank(yearsStandardVo.getProjectName())) {
|