feat: 中止积分包值计算逻辑v2.2

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

@@ -62,6 +62,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_CREATE;
+import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_END;
 import static com.qunzhixinxi.hnqz.admin.enums.ReportEnum.REPORT_STATUS_SUBMIT;
 
 /**
@@ -797,6 +798,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			}
 
 			if (wmScorePackage1.getYshtt() != null && wmScorePackage1.getYshtt() > 100) {
+				// if (wmScorePackage.getScore().equals(wmScorePackage.getShtg()) && !wmScorePackage.getScore().equals(wmScorePackage.getYsh()) ) {
+					wmScorePackage1.setYsh(wmScorePackage1.getScore());
+				// }
 				wmScorePackage1.setYshtt(100);
 			}
 			if (wmScorePackage1.getShbtgtt() != null && wmScorePackage1.getShbtgtt() > 100) {
@@ -836,17 +840,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 				//统计发包方还未审核的
 				long drugNeedToCheckCount = tasks.stream()
-						.filter(t -> "3".equals(t.getTaskStatus()) && "0".equals(t.getReportDrugApprovalStatus()))
+						.filter(t -> "3".equals(t.getTaskStatus()) && "2".equals(t.getReportOneApprovalStatus()))
 						.count();
 
 				// 统计cso未审核 和审核通过的还未提交到药企的任务数
 				long csoNeedToCheckCount = tasks.stream().filter(t -> "2".equals(t.getTaskStatus()) ||
-						("3".equals(t.getTaskStatus()) && reportWaitingCheckStatus.contains(t.getReportDrugApprovalStatus()))).count();
+						("3".equals(t.getTaskStatus()) && reportWaitingCheckStatus.contains(t.getReportOneApprovalStatus()))).count();
 
 				// 如果有发包方未审核的不能中止
 				if (drugNeedToCheckCount != 0L){
 					stopStatus = WmScorePackage.PackageStopStatus.NOTHING;
-				} else if (csoNeedToCheckCount != 0){
+				} else if (csoNeedToCheckCount != 0L){
 					// 如果有cso未审核的提示信息
 					stopStatus = WmScorePackage.PackageStopStatus.REMAIN_MSG;
 				} else {
@@ -970,6 +974,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 									wmScorePackage.setScorePackageStatus("6");//已终止
 									wmScorePackage.setEnableFlag("1");
 									taskList1.forEach(task -> {task.setEnableFlag("1");
+										task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
+										task.setReportDrugApprovalInfo(ReportEnum.APPROVAL_OPINION_NO.getType());
 									wmTaskMapper.updateById(task);});
 									all = true;
 								}