f

internal/infrastructure/database/repositories/certification/gorm_enterprise_info_submit_record_repository.go

@@ -91,21 +91,22 @@ func (r *GormEnterpriseInfoSubmitRecordRepository) ExistsByUnifiedSocialCodeExcl
 }
 
 func (r *GormEnterpriseInfoSubmitRecordRepository) List(ctx context.Context, filter repositories.ListSubmitRecordsFilter) (*repositories.ListSubmitRecordsResult, error) {
-	db := r.GetDB(ctx).Model(&entities.EnterpriseInfoSubmitRecord{})
-	if filter.ManualReviewStatus != "" {
-		db = db.Where("manual_review_status = ?", filter.ManualReviewStatus)
+	base := r.GetDB(ctx).Model(&entities.EnterpriseInfoSubmitRecord{})
+	if filter.CertificationStatus != "" {
+		base = base.Joins("JOIN certifications ON certifications.user_id = enterprise_info_submit_records.user_id AND certifications.deleted_at IS NULL").
+			Where("certifications.status = ?", filter.CertificationStatus)
 	}
 	if filter.CompanyName != "" {
-		db = db.Where("company_name LIKE ?", "%"+filter.CompanyName+"%")
+		base = base.Where("enterprise_info_submit_records.company_name LIKE ?", "%"+filter.CompanyName+"%")
 	}
 	if filter.LegalPersonPhone != "" {
-		db = db.Where("legal_person_phone = ?", filter.LegalPersonPhone)
+		base = base.Where("enterprise_info_submit_records.legal_person_phone = ?", filter.LegalPersonPhone)
 	}
 	if filter.LegalPersonName != "" {
-		db = db.Where("legal_person_name LIKE ?", "%"+filter.LegalPersonName+"%")
+		base = base.Where("enterprise_info_submit_records.legal_person_name LIKE ?", "%"+filter.LegalPersonName+"%")
 	}
 	var total int64
-	if err := db.Count(&total).Error; err != nil {
+	if err := base.Count(&total).Error; err != nil {
 		return nil, err
 	}
 	if filter.PageSize <= 0 {
@@ -116,20 +117,21 @@ func (r *GormEnterpriseInfoSubmitRecordRepository) List(ctx context.Context, fil
 	}
 	offset := (filter.Page - 1) * filter.PageSize
 	var records []*entities.EnterpriseInfoSubmitRecord
-	q := r.GetDB(ctx)
-	if filter.ManualReviewStatus != "" {
-		q = q.Where("manual_review_status = ?", filter.ManualReviewStatus)
+	q := r.GetDB(ctx).Model(&entities.EnterpriseInfoSubmitRecord{})
+	if filter.CertificationStatus != "" {
+		q = q.Joins("JOIN certifications ON certifications.user_id = enterprise_info_submit_records.user_id AND certifications.deleted_at IS NULL").
+			Where("certifications.status = ?", filter.CertificationStatus)
 	}
 	if filter.CompanyName != "" {
-		q = q.Where("company_name LIKE ?", "%"+filter.CompanyName+"%")
+		q = q.Where("enterprise_info_submit_records.company_name LIKE ?", "%"+filter.CompanyName+"%")
 	}
 	if filter.LegalPersonPhone != "" {
-		q = q.Where("legal_person_phone = ?", filter.LegalPersonPhone)
+		q = q.Where("enterprise_info_submit_records.legal_person_phone = ?", filter.LegalPersonPhone)
 	}
 	if filter.LegalPersonName != "" {
-		q = q.Where("legal_person_name LIKE ?", "%"+filter.LegalPersonName+"%")
+		q = q.Where("enterprise_info_submit_records.legal_person_name LIKE ?", "%"+filter.LegalPersonName+"%")
 	}
-	err := q.Order("submit_at DESC").Offset(offset).Limit(filter.PageSize).Find(&records).Error
+	err := q.Order("enterprise_info_submit_records.submit_at DESC").Offset(offset).Limit(filter.PageSize).Find(&records).Error
 	if err != nil {
 		return nil, err
 	}

internal/infrastructure/http/handlers/certification_handler.go

@@ -458,7 +458,7 @@ func (h *CertificationHandler) AdminCompleteCertificationWithoutContract(c *gin.
 // @Security Bearer
 // @Param page query int false "页码"
 // @Param page_size query int false "每页条数"
-// @Param manual_review_status query string false "审核状态 pending/approved/rejected"
+// @Param certification_status query string false "按状态机筛选：info_pending_review/info_submitted/info_rejected，空为全部"
 // @Success 200 {object} responses.AdminSubmitRecordsListResponse
 // @Router /api/v1/certifications/admin/submit-records [get]
 func (h *CertificationHandler) AdminListSubmitRecords(c *gin.Context) {
@@ -564,6 +564,34 @@ func (h *CertificationHandler) AdminRejectSubmitRecord(c *gin.Context) {
 	h.response.Success(c, nil, "已拒绝")
 }
 
+// AdminTransitionCertificationStatus 管理端按用户变更认证状态（以状态机为准）
+// @Summary 管理端变更认证状态
+// @Tags 认证管理
+// @Accept json
+// @Produce json
+// @Security Bearer
+// @Param request body commands.AdminTransitionCertificationStatusCommand true "user_id, target_status(info_submitted/info_rejected), remark"
+// @Success 200 {object} map[string]interface{}
+// @Router /api/v1/certifications/admin/transition-status [post]
+func (h *CertificationHandler) AdminTransitionCertificationStatus(c *gin.Context) {
+	adminID := h.getCurrentUserID(c)
+	if adminID == "" {
+		h.response.Unauthorized(c, "未登录")
+		return
+	}
+	var cmd commands.AdminTransitionCertificationStatusCommand
+	if err := c.ShouldBindJSON(&cmd); err != nil {
+		h.response.BadRequest(c, "参数错误")
+		return
+	}
+	cmd.AdminID = adminID
+	if err := h.appService.AdminTransitionCertificationStatus(c.Request.Context(), &cmd); err != nil {
+		h.response.BadRequest(c, err.Error())
+		return
+	}
+	h.response.Success(c, nil, "状态已更新")
+}
+
 // ================ 回调处理 ================
 
 // HandleEsignCallback 处理e签宝回调

internal/infrastructure/http/routes/certification_routes.go

@@ -77,10 +77,14 @@ func (r *CertificationRoutes) Register(router *http.GinRouter) {
 
 		}
 
-		// 管理端企业审核（需管理员权限）
-		adminCertGroup := certificationGroup.Group("/admin/submit-records")
-		adminCertGroup.Use(r.auth.Handle())
-		adminCertGroup.Use(r.admin.Handle())
+		// 管理端企业审核（需管理员权限，以状态机状态为准）
+		adminGroup := certificationGroup.Group("/admin")
+		adminGroup.Use(r.auth.Handle())
+		adminGroup.Use(r.admin.Handle())
+		{
+			adminGroup.POST("/transition-status", r.handler.AdminTransitionCertificationStatus)
+		}
+		adminCertGroup := adminGroup.Group("/submit-records")
 		{
 			adminCertGroup.GET("", r.handler.AdminListSubmitRecords)
 			adminCertGroup.GET("/:id", r.handler.AdminGetSubmitRecordByID)