feat: 个人承接积分包列表-终止状态字段调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -1964,7 +1964,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	@Override
 	public R getScorePackagePage(Page<WmScorePackage> page, Integer packageType1, Integer packageType2, String scorePackageName, Integer scorePackageStatus, String typeId) {
 
-		List<String> reportWaitingCheckStatus = Arrays.asList("0", "1");
+		List<String> reportWaitingCheckStatus = Arrays.asList("0", "1", "2", "3", "4");
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
 
@@ -2176,38 +2176,24 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 
 			// 设置中止状态
-			WmScorePackage.PackageStopStatus stopStatus;
-
-			if (scorePackage.getRelationScoreId() == null) {
-				stopStatus = WmScorePackage.PackageStopStatus.ALL_IN;
-			} else {
-
-				//统计发包方还未审核的
-				long drugNeedToCheckCount = taskList.stream()
-						.filter(t -> "3".equals(t.getTaskStatus()) && "2".equals(t.getReportOneApprovalStatus()))
-						.count();
+			//统计发包方还未审核的
+			long drugNeedToCheckCount = taskList.stream()
+					.filter(t -> "3".equals(t.getTaskStatus()) && reportWaitingCheckStatus.contains(t.getReportDrugApprovalStatus()))
+					.count();
 
-				// 统计cso未审核 和审核通过的还未提交到药企的任务数
-				long csoNeedToCheckCount = taskList.stream()
-						.filter(t -> "2".equals(t.getTaskStatus()) ||
-								("3".equals(t.getTaskStatus()) && reportWaitingCheckStatus.contains(t.getReportOneApprovalStatus())))
-						.count();
+			// 统计cso未审核 和审核通过的还未提交到药企的任务数
+			long csoNeedToCheckCount = taskList.stream()
+					.filter(t -> "2".equals(t.getTaskStatus()) ||
+							("3".equals(t.getTaskStatus()) && (reportWaitingCheckStatus.contains(t.getReportOneApprovalStatus()))))
+					.count();
 
-				// 如果有发包方未审核的不能中止
-				if (drugNeedToCheckCount != 0L) {
-					stopStatus = WmScorePackage.PackageStopStatus.NOTHING;
-				} else if (csoNeedToCheckCount != 0L) {
-					// 如果有cso未审核的提示信息
-					stopStatus = WmScorePackage.PackageStopStatus.REMAIN_MSG;
-				} else {
-					// 无提示信息
-					stopStatus = WmScorePackage.PackageStopStatus.REMAIN;
-				}
+			// 如果有发包方未审核的不能中止
+			if (drugNeedToCheckCount != 0L || csoNeedToCheckCount != 0L) {
+				scorePackage.setStopStatus(WmScorePackage.PackageStopStatus.NOTHING);
 			}
+		}
 
-			scorePackage.setStopStatus(stopStatus);
 
-		}
 
 		return R.ok(wmScorePackagePage);
 	}