Forráskód Böngészése

fix: 执过滤非终止的包

shc 8 hónapja
szülő
commit
bb733ae5c6

+ 16 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsState.java

@@ -178,4 +178,20 @@ public class UpmsState {
         private final String state;
         private final String desc;
     }
+
+    @Getter
+    @AllArgsConstructor
+    public enum ScorePackageState {
+
+        TO_PICKUP("1", "已下发待申领"),
+        TO_CHECK("2", "已申领待审批"),
+        DOING("3", "进行中"),
+        TO_SETTLE("4", "已完成待结算"),
+        STOP("6", "已终止"),
+        TO_APPROVAL("7", "已完成待上级审批");
+
+        @EnumValue
+        private final String state;
+        private final String desc;
+    }
 }

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackaeServiceImpl.java

@@ -1167,7 +1167,9 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
                 Map<String, Integer> parent = relPkgTtq.stream().collect(Collectors.toMap(WmPackageTaskTypeQty::getTaskTypeName, WmPackageTaskTypeQty::getQty, (v1, v2) -> v2));
 
-                List<WmScorePackage> list = this.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getRelationScoreId, wmScorePackage.getRelationScoreId()));
+                List<WmScorePackage> list = this.list(Wrappers.<WmScorePackage>lambdaQuery()
+                        .ne(WmScorePackage::getScorePackageStatus, UpmsState.ScorePackageState.STOP)
+                        .eq(WmScorePackage::getRelationScoreId, wmScorePackage.getRelationScoreId()));
                 if (CollUtil.isNotEmpty(list)) {
                     Set<Integer> pkgIds = list.stream().map(pkg -> Integer.valueOf(pkg.getId())).collect(Collectors.toSet());
                     List<WmPackageTaskTypeQty> taskTypeQtyList