feat: 15、30-医院/16-商业/18-药店 0分的也能审核

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

@@ -2400,6 +2400,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		// scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
 		scorePackage.setYjd((int) yjd);
 		scorePackage.setYjddsh((int) yjddsh);
+
+		// 15、30-医院/16-商业/18-药店 0分的也能审核
+		if (dsh <= 0) {
+			boolean anyMatch = taskList.stream().anyMatch(t -> TaskStatusEnum.UNDER_REVIEW.val().equals(t.getTaskStatus())
+					&& Arrays.asList("15", "16", "18", "30").contains(t.getTaskTypeId()));
+			dsh = anyMatch ? 1 : 0;
+		}
 		scorePackage.setDsh(dsh);
 		if (!StrUtil.equalsAny(scorePackage.getScorePackageStatus(), "1", "6")) {
 			scorePackage.setYsh(ysh);
@@ -2656,6 +2663,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		// scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
 		scorePackage.setYjd((int) yjd);
 		scorePackage.setYjddsh((int) yjddsh);
+
+		// 15、30-医院/16-商业/18-药店 0分的也能审核
+		if (dsh <= 0) {
+			boolean anyMatch = taskList.stream().anyMatch(t -> TaskStatusEnum.UNDER_REVIEW.val().equals(t.getTaskStatus())
+					&& Arrays.asList("15", "16", "18", "30").contains(t.getTaskTypeId()));
+			dsh = anyMatch ? 1 : 0;
+		}
 		scorePackage.setDsh(dsh);
 		if (!StrUtil.equalsAny(scorePackage.getScorePackageStatus(), "1", "6")) {
 			scorePackage.setYsh(ysh);

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -1079,6 +1079,7 @@
 		t.id AS id,
 		t.task_rule_id AS task_rule_id,
 		t.score AS score,
+		p.score_package_name,
 		p.score_package_name AS score_package_id,
 		t.task_type_id AS task_type_id,
 		t.lookinto_date AS lookinto_date,