From 3e23507b3a1d5785e6b13b5906f570940f796b05 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 22 Sep 2026 20:21:43 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=AE=A2=E5=95=86=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E3=80=81=E5=A4=8D?=
 =?UTF-8?q?=E8=AF=84=E7=8A=B6=E6=80=81=E4=B8=8E=E7=A9=BA=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

提交审批前必须完成且仅保留一条自评，审核通过前必须完成复评。
列表返回最新复评状态；删除最后一条评分会落库；评分为 0 时不再被当成空值覆盖。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../transport/pojo/vo/CustomerArchiveVO.java  |  4 +++
 .../mapper/CustomerArchiveMapper.xml          | 11 +++++-
 .../impl/CustomerArchiveServiceImpl.java      | 35 +++++++++++++------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
index bd1befa..880566e 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
@@ -98,6 +98,10 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@Schema(description = "资金使用率（百分比）")
 	private BigDecimal fundUseRate;
 
+	@TableField(exist = false)
+	@Schema(description = "评分复评状态")
+	private String reviewStatus;
+
 	@TableField(exist = false)
 	@Schema(description = "已付金额合计（元）")
 	private BigDecimal usedFundLimit;
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
index d9df135..f67cfed 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
@@ -46,6 +46,7 @@
         <result column="current_node" property="currentNode"/>
         <result column="current_processor" property="currentProcessor"/>
         <result column="approved_time" property="approvedTime"/>
+        <result column="review_status" property="reviewStatus"/>
     </resultMap>
 
     <select id="selectCustomerArchivePage" resultMap="customerArchiveResultMap">
@@ -92,7 +93,15 @@
             approval_status,
             current_node,
             current_processor,
-            approved_time
+            approved_time,
+            (
+                SELECT s.review_status
+                FROM blade_customer_credit_score s
+                WHERE s.customer_id = blade_customer_archive.id
+                  AND (s.is_deleted = 0 OR s.is_deleted IS NULL)
+                ORDER BY s.score_date DESC, s.update_time DESC, s.id DESC
+                LIMIT 1
+            ) AS review_status
         FROM blade_customer_archive
         WHERE is_deleted = 0
         <if test="userId != null">
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
index e4b403a..53c479c 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
@@ -213,6 +213,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		CustomerArchiveVO detail = detail(id);
 		prepare(detail);
 		validateBase(detail);
+		validateScoreForApproval(detail);
 		validateApproval(detail);
 		CustomerArchive before = Objects.requireNonNull(BeanUtil.copyProperties(detail, CustomerArchive.class));
 		CustomerArchive after = copyCustomer(before);
@@ -323,6 +324,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			log.info("流程结束审核通过跳过，客商已是审核通过 id={}", id);
 			return true;
 		}
+		validateReviewCompleted(buildDetail(before));
 		CustomerArchive after = copyCustomer(before);
 		after.setAccessType(ACCESS_FORMAL);
 		after.setApprovalStatus(APPROVAL_APPROVED);
@@ -383,6 +385,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		CustomerArchiveVO detail = detail(id);
 		prepare(detail);
 		validateBase(detail);
+		validateReviewCompleted(detail);
 		// 临时客商审核通过时由流程转为正式客商，不要求补齐正式客商材料。
 		validateApproval(detail, Objects.equals(detail.getAccessType(), ACCESS_TEMPORARY));
 		CustomerArchive before = Objects.requireNonNull(BeanUtil.copyProperties(detail, CustomerArchive.class));
@@ -556,16 +559,30 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		validateApproval(customer, false);
 	}
 
+	private void validateReviewCompleted(CustomerArchiveVO customer) {
+		List<CustomerCreditScoreVO> scores = customer.getScores() == null ? List.of() : customer.getScores();
+		boolean reviewCompleted = scores.size() == 1 && "已完成".equals(scores.get(0).getReviewStatus());
+		if (!reviewCompleted) {
+			throw new ServiceException("请先完成复评");
+		}
+	}
+
+	private void validateScoreForApproval(CustomerArchiveVO customer) {
+		List<CustomerCreditScoreVO> scores = customer.getScores() == null ? List.of() : customer.getScores();
+		if (scores.size() > 1) {
+			throw new ServiceException("评分记录只能有一条");
+		}
+		boolean selfCompleted = scores.size() == 1 && "已完成".equals(scores.get(0).getSelfStatus());
+		if (!selfCompleted) {
+			throw new ServiceException("提交审批前必须完成自评");
+		}
+	}
+
 	private void validateApproval(CustomerArchiveVO customer, boolean temporaryToFormal) {
 		if (Objects.equals(customer.getAccessType(), ACCESS_FORMAL) && !temporaryToFormal) {
 			if (Func.isEmpty(customer.getQualificationAttachments())) {
 				throw new ServiceException("正式客商提交审核前必须上传客商材料");
 			}
-			boolean hasCompletedScore = customer.getScores().stream()
-				.anyMatch(score -> "已完成".equals(score.getSelfStatus()) || "已完成".equals(score.getReviewStatus()) || Func.isNotEmpty(score.getFinalScore()));
-			if (!hasCompletedScore) {
-				throw new ServiceException("正式客商提交审核前必须完成信用评分");
-			}
 		}
 	}
 
@@ -597,10 +614,8 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		insertContacts(customerId, customer.getContacts());
 		insertReceiptAccounts(customerId, customer.getReceiptAccounts());
 		insertInvoices(customerId, customer);
-		if (Func.isNotEmpty(customer.getScores())) {
-			deleteScores(List.of(customerId));
-			insertScores(customerId, customer.getScores());
-		}
+		deleteScores(List.of(customerId));
+		insertScores(customerId, customer.getScores());
 	}
 
 	private void insertContacts(Long customerId, List<CustomerContactVO> contacts) {
@@ -774,7 +789,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			}
 			for (int detailIndex = 0; detailIndex < details.size(); detailIndex++) {
 				CustomerCreditScoreDetailVO detailVO = details.get(detailIndex);
-				if (Func.isEmpty(detailVO.getScore())) {
+				if (detailVO.getScore() == null) {
 					detailVO.setScore(resolveFullScore(detailVO.getOptionsJson()));
 				}
 				CustomerCreditScoreDetail detail = Objects.requireNonNull(BeanUtil.copyProperties(detailVO, CustomerCreditScoreDetail.class));