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

@@ -14,7 +14,7 @@ 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.draft.dto.DraftWithCostComparisonResponse;
 import com.huimv.employment.service.order.EmploymentOrderService;
 import com.huimv.employment.service.order.dto.EmploymentOrderItemResponse;
 import com.huimv.employment.service.registration.RegistrationBatchService;
@@ -125,11 +125,11 @@ public class ConversationController {
      * 查询指定会话下全部草稿的成本测算（方案对比）。
      */
     @GetMapping("/{id}/drafts/cost-comparison")
-    @Operation(summary = "按会话查询全部草稿成本测算",
-            description = "返回该会话下可测算草稿的方案对比列表；"
-                    + "每个元素结构与 GET /api/v1/mp/drafts/{id}/cost-comparison 一致（含 draft_id、schemes）。"
-                    + "字段不完整无法测算的草稿自动跳过。仅可查询本企业用户自己的会话。")
-    public R<List<McpDraftCalculateResponse>> listDraftCostComparisons(
+    @Operation(summary = "按会话查询全部草稿及成本测算",
+            description = "返回该会话下全部草稿信息；每条草稿内嵌 cost_comparison，"
+                    + "结构与 GET /api/v1/mp/drafts/{id}/cost-comparison 一致。"
+                    + "无法测算时 cost_comparison 为 null。仅可查询本企业用户自己的会话。")
+    public R<List<DraftWithCostComparisonResponse>> listDraftCostComparisons(
             @PathVariable("id") Long conversationId) {
         LoginUser loginUser = requireEnterprise();
         return R.ok(draftService.listCostComparisonsByConversation(

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

@@ -22,6 +22,7 @@ import com.huimv.employment.service.draft.dto.DraftConfirmResponse;
 import com.huimv.employment.service.draft.dto.DraftDetailResponse;
 import com.huimv.employment.service.draft.dto.DraftFieldResponse;
 import com.huimv.employment.service.draft.dto.DraftUpdateRequest;
+import com.huimv.employment.service.draft.dto.DraftWithCostComparisonResponse;
 import com.huimv.employment.service.draft.dto.McpDraftCalculateResponse;
 import com.huimv.employment.service.enterprise.EnterpriseService;
 import com.huimv.employment.service.conversation.ConversationService;
@@ -179,12 +180,13 @@ public class DraftService {
     }
 
     /**
-     * 按会话查询其下全部草稿的成本测算结果。
-     * <p>返回元素结构与 {@link #calculateCostComparison} / {@code GET .../drafts/{id}/cost-comparison} 相同。
-     * 字段不足以测算的草稿跳过，不中断整次查询。</p>
+     * 按会话查询其下全部草稿信息，并附带成本测算。
+     * <p>外层为草稿详情；{@code cost_comparison} 与
+     * {@link #calculateCostComparison} / {@code GET .../drafts/{id}/cost-comparison} 实体相同。
+     * 无法测算时 {@code cost_comparison} 为 null，草稿本身仍返回。</p>
      */
     @Transactional(rollbackFor = Exception.class)
-    public List<McpDraftCalculateResponse> listCostComparisonsByConversation(Long userId, Long conversationId) {
+    public List<DraftWithCostComparisonResponse> listCostComparisonsByConversation(Long userId, Long conversationId) {
         conversationService.requireOwned(userId, conversationId);
         FeEnterprise enterprise = enterpriseService.findEnterpriseByUserId(userId);
         if (enterprise == null) {
@@ -195,12 +197,14 @@ public class DraftService {
                         .eq(FeEmploymentDraft::getConversationId, conversationId)
                         .eq(FeEmploymentDraft::getEnterpriseId, enterprise.getId())
                         .orderByAsc(FeEmploymentDraft::getId));
-        List<McpDraftCalculateResponse> result = new ArrayList<>();
+        List<DraftWithCostComparisonResponse> result = new ArrayList<>();
         if (drafts == null || drafts.isEmpty()) {
             return result;
         }
         LocalDateTime now = LocalDateTime.now();
         for (FeEmploymentDraft draft : drafts) {
+            DraftDetailResponse detail = toDetail(draft, listFields(draft.getId()));
+            DraftWithCostComparisonResponse item = copyToWithCost(detail);
             try {
                 List<DraftCostCalculationEngine.CalculatedScheme> schemes =
                         draftCostCalculationEngine.calculate(draft);
@@ -208,16 +212,55 @@ public class DraftService {
                     persistCostSnapshots(draft, schemes);
                     updateDraftEstimates(draft, schemes, now);
                 }
-                McpDraftCalculateResponse response = draftCostCalculationEngine.toApiResponse(schemes);
-                response.setDraftId(draft.getId());
-                result.add(response);
+                McpDraftCalculateResponse cost = draftCostCalculationEngine.toApiResponse(schemes);
+                cost.setDraftId(draft.getId());
+                item.setCostComparison(cost);
             } catch (BizException ignored) {
-                // 草稿不完整或无法测算时跳过
+                item.setCostComparison(null);
             }
+            result.add(item);
         }
         return result;
     }
 
+    private static DraftWithCostComparisonResponse copyToWithCost(DraftDetailResponse source) {
+        DraftWithCostComparisonResponse target = new DraftWithCostComparisonResponse();
+        target.setId(source.getId());
+        target.setDraftNo(source.getDraftNo());
+        target.setEnterpriseId(source.getEnterpriseId());
+        target.setUserId(source.getUserId());
+        target.setConversationId(source.getConversationId());
+        target.setScenario(source.getScenario());
+        target.setTitle(source.getTitle());
+        target.setStatus(source.getStatus());
+        target.setWorkerCount(source.getWorkerCount());
+        target.setWorkDays(source.getWorkDays());
+        target.setWorkType(source.getWorkType());
+        target.setWorkContent(source.getWorkContent());
+        target.setWorkLocation(source.getWorkLocation());
+        target.setWorkLocationSource(source.getWorkLocationSource());
+        target.setSettlementMode(source.getSettlementMode());
+        target.setDailyWage(source.getDailyWage());
+        target.setInsuranceRequired(source.getInsuranceRequired());
+        target.setInsuranceLevel(source.getInsuranceLevel());
+        target.setCheckInRequired(source.getCheckInRequired());
+        target.setQrValidDays(source.getQrValidDays());
+        target.setWorkStartDate(source.getWorkStartDate());
+        target.setWorkEndDate(source.getWorkEndDate());
+        target.setJobRequirements(source.getJobRequirements());
+        target.setMissingFields(source.getMissingFields());
+        target.setRiskPrompts(source.getRiskPrompts());
+        target.setEstimatedTotal(source.getEstimatedTotal());
+        target.setEstimatedPerCapita(source.getEstimatedPerCapita());
+        target.setSelectedPlanId(source.getSelectedPlanId());
+        target.setQrCodeUrl(source.getQrCodeUrl());
+        target.setQrToken(source.getQrToken());
+        target.setFields(source.getFields());
+        target.setCreateTime(source.getCreateTime());
+        target.setUpdateTime(source.getUpdateTime());
+        return target;
+    }
+
     /**
      * 微信端确认此方案：选定 SCHEME_A/SCHEME_B，转正式订单。
      * <p>若尚未测算，将自动先测算再确认。</p>

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

@@ -0,0 +1,25 @@
+package com.huimv.employment.service.draft.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 会话下草稿信息 + 成本测算（测算实体同单草稿 cost-comparison）。
+ */
+@Schema(description = "草稿信息（含成本测算）")
+public class DraftWithCostComparisonResponse extends DraftDetailResponse {
+
+    @JsonProperty("cost_comparison")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @Schema(description = "成本测算结果，结构同 GET /api/v1/mp/drafts/{id}/cost-comparison；无法测算时为 null")
+    private McpDraftCalculateResponse costComparison;
+
+    public McpDraftCalculateResponse getCostComparison() {
+        return costComparison;
+    }
+
+    public void setCostComparison(McpDraftCalculateResponse costComparison) {
+        this.costComparison = costComparison;
+    }
+}