HUIXIAN

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

@@ -579,6 +579,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 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())))
@@ -586,7 +587,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     String deptLevel = collect.get(0).getDeptLevel();
                     boolean f = true;
                     f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;

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

@@ -1249,18 +1249,24 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         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) {
+
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;

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

@@ -500,7 +500,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     String deptLevel = collect.get(0).getDeptLevel();
                     boolean f = true;
                     f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;