Merge branch 'master' of http://192.168.1.25:3000/lbyzx123/huimv-employment

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/ConversationController.java

@@ -13,6 +13,12 @@ import com.huimv.employment.service.conversation.dto.ConversationChatRequest;
 import com.huimv.employment.service.conversation.dto.ConversationCreateRequest;
 import com.huimv.employment.service.conversation.dto.ConversationMessagePageResponse;
 import com.huimv.employment.service.conversation.dto.ConversationSummaryResponse;
+import com.huimv.employment.service.draft.DraftService;
+import com.huimv.employment.service.draft.dto.McpDraftCalculateResponse;
+import com.huimv.employment.service.order.EmploymentOrderService;
+import com.huimv.employment.service.order.dto.EmploymentOrderItemResponse;
+import com.huimv.employment.service.registration.RegistrationBatchService;
+import com.huimv.employment.service.registration.dto.RegistrationBatchDetailResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -54,13 +60,22 @@ public class ConversationController {
     private final ConversationService conversationService;
     private final ConversationChatService conversationChatService;
     private final ConversationMessageService conversationMessageService;
+    private final DraftService draftService;
+    private final RegistrationBatchService registrationBatchService;
+    private final EmploymentOrderService employmentOrderService;
 
     public ConversationController(ConversationService conversationService,
                                   ConversationChatService conversationChatService,
-                                  ConversationMessageService conversationMessageService) {
+                                  ConversationMessageService conversationMessageService,
+                                  DraftService draftService,
+                                  RegistrationBatchService registrationBatchService,
+                                  EmploymentOrderService employmentOrderService) {
         this.conversationService = conversationService;
         this.conversationChatService = conversationChatService;
         this.conversationMessageService = conversationMessageService;
+        this.draftService = draftService;
+        this.registrationBatchService = registrationBatchService;
+        this.employmentOrderService = employmentOrderService;
     }
 
     /**
@@ -106,6 +121,51 @@ public class ConversationController {
                 loginUser.getUserId(), conversationId, page, size));
     }
 
+    /**
+     * 查询指定会话下全部草稿的成本测算（方案对比）。
+     */
+    @GetMapping("/{id}/drafts/cost-comparison")
+    @Operation(summary = "按会话查询全部草稿成本测算",
+            description = "返回该会话下可测算草稿的方案对比列表；"
+                    + "每个元素结构与 GET /api/v1/mp/drafts/{id}/cost-comparison 一致（含 draft_id、schemes）。"
+                    + "字段不完整无法测算的草稿自动跳过。仅可查询本企业用户自己的会话。")
+    public R<List<McpDraftCalculateResponse>> listDraftCostComparisons(
+            @PathVariable("id") Long conversationId) {
+        LoginUser loginUser = requireEnterprise();
+        return R.ok(draftService.listCostComparisonsByConversation(
+                loginUser.getUserId(), conversationId));
+    }
+
+    /**
+     * 查询指定会话下全部草稿的登记进度。
+     */
+    @GetMapping("/{id}/drafts/registration-progress")
+    @Operation(summary = "按会话查询全部草稿登记进度",
+            description = "返回该会话下已确认方案并建有登记批次的草稿进度列表；"
+                    + "每个元素结构与 GET /api/v1/mp/registration-batches?draft_id= 一致。"
+                    + "尚未确认方案、无批次的草稿自动跳过。仅可查询本企业用户自己的会话。")
+    public R<List<RegistrationBatchDetailResponse>> listDraftRegistrationProgress(
+            @PathVariable("id") Long conversationId) {
+        LoginUser loginUser = requireEnterprise();
+        return R.ok(registrationBatchService.listDetailsByConversation(
+                loginUser.getUserId(), conversationId));
+    }
+
+    /**
+     * 查询指定会话下全部草稿已转成正式订单的列表。
+     */
+    @GetMapping("/{id}/drafts/orders")
+    @Operation(summary = "按会话查询草稿关联订单列表",
+            description = "返回该会话下草稿已确认并生成的正式订单；"
+                    + "仅「有订单」的草稿会出现在结果中，尚未确认方案的草稿不返回。"
+                    + "仅可查询本企业用户自己的会话。")
+    public R<List<EmploymentOrderItemResponse>> listDraftOrders(
+            @PathVariable("id") Long conversationId) {
+        LoginUser loginUser = requireEnterprise();
+        return R.ok(employmentOrderService.listByConversation(
+                loginUser.getUserId(), conversationId));
+    }
+
     /**
      * 在已有会话内发起 AI 对话（SSE 流式，流结束后落库）。
      */

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/DraftService.java

@@ -24,6 +24,7 @@ import com.huimv.employment.service.draft.dto.DraftFieldResponse;
 import com.huimv.employment.service.draft.dto.DraftUpdateRequest;
 import com.huimv.employment.service.draft.dto.McpDraftCalculateResponse;
 import com.huimv.employment.service.enterprise.EnterpriseService;
+import com.huimv.employment.service.conversation.ConversationService;
 import com.huimv.employment.service.registration.RegistrationBatchService;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,7 @@ import org.springframework.util.StringUtils;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -81,6 +83,7 @@ public class DraftService {
     private final FeEmploymentOrderMapper feEmploymentOrderMapper;
     private final FeRegistrationBatchMapper feRegistrationBatchMapper;
     private final EnterpriseService enterpriseService;
+    private final ConversationService conversationService;
     private final DraftCostCalculationEngine draftCostCalculationEngine;
     private final RegistrationBatchService registrationBatchService;
     private final ObjectMapper objectMapper;
@@ -91,6 +94,7 @@ public class DraftService {
                         FeEmploymentOrderMapper feEmploymentOrderMapper,
                         FeRegistrationBatchMapper feRegistrationBatchMapper,
                         EnterpriseService enterpriseService,
+                        ConversationService conversationService,
                         DraftCostCalculationEngine draftCostCalculationEngine,
                         RegistrationBatchService registrationBatchService,
                         ObjectMapper objectMapper) {
@@ -100,6 +104,7 @@ public class DraftService {
         this.feEmploymentOrderMapper = feEmploymentOrderMapper;
         this.feRegistrationBatchMapper = feRegistrationBatchMapper;
         this.enterpriseService = enterpriseService;
+        this.conversationService = conversationService;
         this.draftCostCalculationEngine = draftCostCalculationEngine;
         this.registrationBatchService = registrationBatchService;
         this.objectMapper = objectMapper;
@@ -173,6 +178,46 @@ public class DraftService {
         return response;
     }
 
+    /**
+     * 按会话查询其下全部草稿的成本测算结果。
+     * <p>返回元素结构与 {@link #calculateCostComparison} / {@code GET .../drafts/{id}/cost-comparison} 相同。
+     * 字段不足以测算的草稿跳过，不中断整次查询。</p>
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public List<McpDraftCalculateResponse> listCostComparisonsByConversation(Long userId, Long conversationId) {
+        conversationService.requireOwned(userId, conversationId);
+        FeEnterprise enterprise = enterpriseService.findEnterpriseByUserId(userId);
+        if (enterprise == null) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "请先完成企业登记");
+        }
+        List<FeEmploymentDraft> drafts = feEmploymentDraftMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentDraft>()
+                        .eq(FeEmploymentDraft::getConversationId, conversationId)
+                        .eq(FeEmploymentDraft::getEnterpriseId, enterprise.getId())
+                        .orderByAsc(FeEmploymentDraft::getId));
+        List<McpDraftCalculateResponse> result = new ArrayList<>();
+        if (drafts == null || drafts.isEmpty()) {
+            return result;
+        }
+        LocalDateTime now = LocalDateTime.now();
+        for (FeEmploymentDraft draft : drafts) {
+            try {
+                List<DraftCostCalculationEngine.CalculatedScheme> schemes =
+                        draftCostCalculationEngine.calculate(draft);
+                if (STATUS_PENDING.equals(draft.getStatus())) {
+                    persistCostSnapshots(draft, schemes);
+                    updateDraftEstimates(draft, schemes, now);
+                }
+                McpDraftCalculateResponse response = draftCostCalculationEngine.toApiResponse(schemes);
+                response.setDraftId(draft.getId());
+                result.add(response);
+            } catch (BizException ignored) {
+                // 草稿不完整或无法测算时跳过
+            }
+        }
+        return result;
+    }
+
     /**
      * 微信端确认此方案：选定 SCHEME_A/SCHEME_B，转正式订单。
      * <p>若尚未测算，将自动先测算再确认。</p>

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/McpDraftService.java

@@ -351,8 +351,8 @@ public class McpDraftService {
         draft.setUserId(conversation.getUserId());
         draft.setConversationId(conversation.getId());
         draft.setScenario(resolveScenario(request));
-        if (StringUtils.hasText(request.getIntentText())) {
-            String title = request.getIntentText().trim();
+        if (StringUtils.hasText(conversation.getTitle())) {
+            String title = conversation.getTitle().trim();
             draft.setTitle(title.length() <= 200 ? title : title.substring(0, 200));
         }
         draft.setStatus(DB_STATUS_PENDING);

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/EmploymentOrderService.java

@@ -0,0 +1,111 @@
+package com.huimv.employment.service.order;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.huimv.employment.common.exception.BizException;
+import com.huimv.employment.common.exception.ErrorCode;
+import com.huimv.employment.dao.entity.FeEmploymentDraft;
+import com.huimv.employment.dao.entity.FeEmploymentOrder;
+import com.huimv.employment.dao.entity.FeEnterprise;
+import com.huimv.employment.dao.mapper.FeEmploymentDraftMapper;
+import com.huimv.employment.dao.mapper.FeEmploymentOrderMapper;
+import com.huimv.employment.service.conversation.ConversationService;
+import com.huimv.employment.service.enterprise.EnterpriseService;
+import com.huimv.employment.service.order.dto.EmploymentOrderItemResponse;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 企业端用工订单查询。
+ */
+@Service
+public class EmploymentOrderService {
+
+    private final FeEmploymentOrderMapper feEmploymentOrderMapper;
+    private final FeEmploymentDraftMapper feEmploymentDraftMapper;
+    private final ConversationService conversationService;
+    private final EnterpriseService enterpriseService;
+
+    public EmploymentOrderService(FeEmploymentOrderMapper feEmploymentOrderMapper,
+                                  FeEmploymentDraftMapper feEmploymentDraftMapper,
+                                  ConversationService conversationService,
+                                  EnterpriseService enterpriseService) {
+        this.feEmploymentOrderMapper = feEmploymentOrderMapper;
+        this.feEmploymentDraftMapper = feEmploymentDraftMapper;
+        this.conversationService = conversationService;
+        this.enterpriseService = enterpriseService;
+    }
+
+    /**
+     * 按会话查询其下草稿已转成正式订单的列表。
+     * <p>仅返回已存在订单的草稿；无订单的草稿不出现在结果中。</p>
+     */
+    public List<EmploymentOrderItemResponse> listByConversation(Long userId, Long conversationId) {
+        conversationService.requireOwned(userId, conversationId);
+        FeEnterprise enterprise = enterpriseService.findEnterpriseByUserId(userId);
+        if (enterprise == null) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "请先完成企业登记");
+        }
+
+        List<FeEmploymentDraft> drafts = feEmploymentDraftMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentDraft>()
+                        .eq(FeEmploymentDraft::getConversationId, conversationId)
+                        .eq(FeEmploymentDraft::getEnterpriseId, enterprise.getId())
+                        .orderByAsc(FeEmploymentDraft::getId));
+        if (drafts == null || drafts.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Long> draftIds = new ArrayList<>(drafts.size());
+        for (FeEmploymentDraft draft : drafts) {
+            if (draft.getId() != null) {
+                draftIds.add(draft.getId());
+            }
+        }
+        if (draftIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<FeEmploymentOrder> orders = feEmploymentOrderMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentOrder>()
+                        .eq(FeEmploymentOrder::getEnterpriseId, enterprise.getId())
+                        .in(FeEmploymentOrder::getDraftId, draftIds)
+                        .orderByDesc(FeEmploymentOrder::getCreateTime)
+                        .orderByDesc(FeEmploymentOrder::getId));
+        if (orders == null || orders.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<EmploymentOrderItemResponse> result = new ArrayList<>(orders.size());
+        for (FeEmploymentOrder order : orders) {
+            result.add(toItem(order));
+        }
+        return result;
+    }
+
+    private static EmploymentOrderItemResponse toItem(FeEmploymentOrder order) {
+        EmploymentOrderItemResponse item = new EmploymentOrderItemResponse();
+        item.setDraftId(order.getDraftId());
+        item.setOrderId(order.getId());
+        item.setOrderNo(order.getOrderNo());
+        item.setTitle(order.getTitle());
+        item.setWorkerCount(order.getWorkerCount());
+        item.setWorkDays(order.getWorkDays());
+        item.setWorkType(order.getWorkType());
+        item.setWorkLocation(order.getWorkLocation());
+        item.setWorkStartDate(order.getWorkStartDate());
+        item.setWorkEndDate(order.getWorkEndDate());
+        item.setOrderStatus(order.getOrderStatus());
+        item.setCurrentStepCode(order.getCurrentStepCode());
+        item.setRegisteredCount(order.getRegisteredCount());
+        item.setPendingCount(order.getPendingCount());
+        item.setAbnormalCount(order.getAbnormalCount());
+        item.setTotalOutflow(order.getTotalOutflow());
+        item.setSelectedPlanId(order.getSelectedPlanId());
+        item.setCreateTime(order.getCreateTime());
+        item.setUpdateTime(order.getUpdateTime());
+        return item;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/dto/EmploymentOrderItemResponse.java

@@ -0,0 +1,231 @@
+package com.huimv.employment.service.order.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "用工订单列表项")
+public class EmploymentOrderItemResponse {
+
+    @JsonProperty("draft_id")
+    @Schema(description = "关联草稿 ID")
+    private Long draftId;
+
+    @JsonProperty("order_id")
+    @Schema(description = "订单主键 ID")
+    private Long orderId;
+
+    @JsonProperty("order_no")
+    @Schema(description = "订单编号", example = "ord_123")
+    private String orderNo;
+
+    @Schema(description = "订单标题")
+    private String title;
+
+    @JsonProperty("worker_count")
+    @Schema(description = "用工人数")
+    private Integer workerCount;
+
+    @JsonProperty("work_days")
+    @Schema(description = "工作天数")
+    private Integer workDays;
+
+    @JsonProperty("work_type")
+    @Schema(description = "岗位类型")
+    private String workType;
+
+    @JsonProperty("work_location")
+    @Schema(description = "工作地点")
+    private String workLocation;
+
+    @JsonProperty("work_start_date")
+    private LocalDate workStartDate;
+
+    @JsonProperty("work_end_date")
+    private LocalDate workEndDate;
+
+    @JsonProperty("order_status")
+    @Schema(description = "订单状态", example = "confirmed")
+    private String orderStatus;
+
+    @JsonProperty("current_step_code")
+    @Schema(description = "当前流程步骤")
+    private String currentStepCode;
+
+    @JsonProperty("registered_count")
+    private Integer registeredCount;
+
+    @JsonProperty("pending_count")
+    private Integer pendingCount;
+
+    @JsonProperty("abnormal_count")
+    private Integer abnormalCount;
+
+    @JsonProperty("total_outflow")
+    @Schema(description = "企业总支出")
+    private BigDecimal totalOutflow;
+
+    @JsonProperty("selected_plan_id")
+    private Long selectedPlanId;
+
+    @JsonProperty("create_time")
+    private LocalDateTime createTime;
+
+    @JsonProperty("update_time")
+    private LocalDateTime updateTime;
+
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getWorkerCount() {
+        return workerCount;
+    }
+
+    public void setWorkerCount(Integer workerCount) {
+        this.workerCount = workerCount;
+    }
+
+    public Integer getWorkDays() {
+        return workDays;
+    }
+
+    public void setWorkDays(Integer workDays) {
+        this.workDays = workDays;
+    }
+
+    public String getWorkType() {
+        return workType;
+    }
+
+    public void setWorkType(String workType) {
+        this.workType = workType;
+    }
+
+    public String getWorkLocation() {
+        return workLocation;
+    }
+
+    public void setWorkLocation(String workLocation) {
+        this.workLocation = workLocation;
+    }
+
+    public LocalDate getWorkStartDate() {
+        return workStartDate;
+    }
+
+    public void setWorkStartDate(LocalDate workStartDate) {
+        this.workStartDate = workStartDate;
+    }
+
+    public LocalDate getWorkEndDate() {
+        return workEndDate;
+    }
+
+    public void setWorkEndDate(LocalDate workEndDate) {
+        this.workEndDate = workEndDate;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getCurrentStepCode() {
+        return currentStepCode;
+    }
+
+    public void setCurrentStepCode(String currentStepCode) {
+        this.currentStepCode = currentStepCode;
+    }
+
+    public Integer getRegisteredCount() {
+        return registeredCount;
+    }
+
+    public void setRegisteredCount(Integer registeredCount) {
+        this.registeredCount = registeredCount;
+    }
+
+    public Integer getPendingCount() {
+        return pendingCount;
+    }
+
+    public void setPendingCount(Integer pendingCount) {
+        this.pendingCount = pendingCount;
+    }
+
+    public Integer getAbnormalCount() {
+        return abnormalCount;
+    }
+
+    public void setAbnormalCount(Integer abnormalCount) {
+        this.abnormalCount = abnormalCount;
+    }
+
+    public BigDecimal getTotalOutflow() {
+        return totalOutflow;
+    }
+
+    public void setTotalOutflow(BigDecimal totalOutflow) {
+        this.totalOutflow = totalOutflow;
+    }
+
+    public Long getSelectedPlanId() {
+        return selectedPlanId;
+    }
+
+    public void setSelectedPlanId(Long selectedPlanId) {
+        this.selectedPlanId = selectedPlanId;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/registration/RegistrationBatchService.java

@@ -17,6 +17,7 @@ import com.huimv.employment.dao.mapper.FeWorkerRegistrationMapper;
 import com.huimv.employment.dao.mapper.FeWorkflowDefinitionMapper;
 import com.huimv.employment.dao.mapper.FeWorkflowStepMapper;
 import com.huimv.employment.service.config.RegistrationQrProperties;
+import com.huimv.employment.service.conversation.ConversationService;
 import com.huimv.employment.service.enterprise.EnterpriseService;
 import com.huimv.employment.service.registration.dto.RegistrationBatchDetailResponse;
 import com.huimv.employment.service.registration.dto.RegistrationBatchProgressResponse;
@@ -76,6 +77,7 @@ public class RegistrationBatchService {
     private final FeWorkflowDefinitionMapper feWorkflowDefinitionMapper;
     private final FeWorkflowStepMapper feWorkflowStepMapper;
     private final EnterpriseService enterpriseService;
+    private final ConversationService conversationService;
     private final WeChatMiniAppService weChatMiniAppService;
     private final RegistrationQrProperties qrProperties;
 
@@ -86,6 +88,7 @@ public class RegistrationBatchService {
                                     FeWorkflowDefinitionMapper feWorkflowDefinitionMapper,
                                     FeWorkflowStepMapper feWorkflowStepMapper,
                                     EnterpriseService enterpriseService,
+                                    ConversationService conversationService,
                                     WeChatMiniAppService weChatMiniAppService,
                                     RegistrationQrProperties qrProperties) {
         this.feRegistrationBatchMapper = feRegistrationBatchMapper;
@@ -95,6 +98,7 @@ public class RegistrationBatchService {
         this.feWorkflowDefinitionMapper = feWorkflowDefinitionMapper;
         this.feWorkflowStepMapper = feWorkflowStepMapper;
         this.enterpriseService = enterpriseService;
+        this.conversationService = conversationService;
         this.weChatMiniAppService = weChatMiniAppService;
         this.qrProperties = qrProperties;
     }
@@ -180,6 +184,35 @@ public class RegistrationBatchService {
         return toDetailResponse(batch, order, draft);
     }
 
+    /**
+     * 按会话查询其下全部草稿的登记进度详情。
+     * <p>元素结构与 {@link #getDetailByDraftId} 相同；尚未确认方案、无批次的草稿跳过。</p>
+     */
+    public List<RegistrationBatchDetailResponse> listDetailsByConversation(Long userId, Long conversationId) {
+        conversationService.requireOwned(userId, conversationId);
+        FeEnterprise enterprise = enterpriseService.findEnterpriseByUserId(userId);
+        if (enterprise == null) {
+            throw new BizException(ErrorCode.NOT_FOUND, "企业信息不存在");
+        }
+        List<FeEmploymentDraft> drafts = feEmploymentDraftMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentDraft>()
+                        .eq(FeEmploymentDraft::getConversationId, conversationId)
+                        .eq(FeEmploymentDraft::getEnterpriseId, enterprise.getId())
+                        .orderByAsc(FeEmploymentDraft::getId));
+        List<RegistrationBatchDetailResponse> result = new ArrayList<>();
+        if (drafts == null || drafts.isEmpty()) {
+            return result;
+        }
+        for (FeEmploymentDraft draft : drafts) {
+            try {
+                result.add(getDetailByDraftId(userId, draft.getId()));
+            } catch (BizException ignored) {
+                // 未确认方案或无批次时跳过
+            }
+        }
+        return result;
+    }
+
     /**
      * 企业端登记进度详情：按批次主键 ID 或业务编号（如 bat_1）。
      */
@@ -215,6 +248,7 @@ public class RegistrationBatchService {
         String batchNo = batch.getBatchNo();
 
         RegistrationBatchDetailResponse response = new RegistrationBatchDetailResponse();
+        response.setDraftId(draft != null ? draft.getId() : order.getDraftId());
         response.setBatchId(batch.getId());
         response.setBatchNo(batchNo);
         response.setTitle(title);

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/registration/dto/RegistrationBatchDetailResponse.java

@@ -10,6 +10,10 @@ import java.util.List;
 @Schema(description = "登记批次详情（进度管理）")
 public class RegistrationBatchDetailResponse {
 
+    @JsonProperty("draft_id")
+    @Schema(description = "关联草稿 ID")
+    private Long draftId;
+
     @JsonProperty("batch_id")
     @Schema(description = "批次主键 ID")
     private Long batchId;
@@ -69,6 +73,14 @@ public class RegistrationBatchDetailResponse {
     @Schema(description = "人员列表")
     private List<RegistrationBatchWorkerItemResponse> workers = new ArrayList<>();
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public Long getBatchId() {
         return batchId;
     }