sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/logic/iot/simcardbatch/lifecycle/repository.go

@@ -155,11 +155,15 @@ func (r *Repository) SaveValidationFailure(ctx context.Context, task *Task) erro
 			if row == nil {
 				continue
 			}
+			status := consts.BatchDetailStatusFailed
+			if batchimport.IsNotExecuted(row) {
+				status = consts.BatchDetailStatusNotExecuted
+			}
 			if _, err := tx.Ctx(ctx).Model(dao.BatchDetail.Table()).
 				Where(dao.BatchDetail.Columns().Id, row.DetailID).
 				Where(dao.BatchDetail.Columns().BatchNo, task.Batch.BatchNo).
 				Data(do.BatchDetail{
-					DetailStatus: consts.BatchDetailStatusFailed,
+					DetailStatus: status,
 					ErrorReason:  row.Reason,
 					Snapshot:     row.Snapshot(),
 					UpdatedBy:    task.Operator.UserId,
@@ -255,21 +259,23 @@ func (r *Repository) FinalizeBatch(ctx context.Context, task *Task) error {
 	}
 	rows := make([]batchimport.Row, 0, len(task.Rows))
 	successCount := 0
+	failCount := 0
 	for _, row := range task.Rows {
 		rows = append(rows, row)
-		if row != nil && row.Reason == "" {
+		if row != nil && row.Reason == "" && task.ValidationOK {
 			successCount++
+		} else if row == nil || !batchimport.IsNotExecuted(row) {
+			failCount++
 		}
 	}
-	failCount := len(task.Rows) - successCount
-	validCount := 0
+	validCount := len(task.Rows) - failCount
 	if task.ValidationOK {
 		validCount = len(task.Rows)
 	}
 	importStatus := consts.ImportStatusSuccess
 	batchStatus := consts.BatchAsyncStatusSuccess
 	runResult := consts.BatchRunResultSuccess
-	if failCount > 0 {
+	if failCount > 0 || !task.ValidationOK {
 		importStatus = consts.ImportStatusFailed
 		batchStatus = consts.BatchAsyncStatusFailed
 		runResult = consts.BatchRunResultFailed