Przeglądaj źródła

DeBugDeBugDeBug

buzhanyi 2 lat temu
rodzic
commit
4699da42fc

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

@@ -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())) {

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

@@ -891,6 +891,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     //是否可以执行发函
+    @Override
     public boolean sendLetterDo(String projectStatus) {
         List<String> ls = new ArrayList<>();
         ls.add(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode());