增加与ai大模型对话

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

@@ -63,7 +63,7 @@ public class WorkerController {
     @Operation(summary = "第三方可用工人查询（Mock）",
             description = "请求体为条件数组，示例：[{\"jobType\":\"搬运工\",\"workLocation\":\"上海\"}]。"
                     + "jobType 与 Mock 中 confirmed_work_type 精确匹配；workLocation 可选（包含匹配）。"
-                    + "按工种分组返回 groups[].workers，字段同 workflow-progress 的 workers。"
+                    + "按工种分组返回 groups[].workers，含 mobile / id_card_no 明文（便于添加第三方工人）。"
                     + "MVP Mock：classpath mock/available-workers.json。需企业 JWT。")
     public R<ThirdPartyWorkerGroupResponse> listAvailable(
             @RequestBody @NotEmpty(message = "查询条件不能为空")

huimv-employment/fe-api/src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://122.112.224.199:3306/fe_employment_db_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://122.112.224.199:3306/fe_employment_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: root
     password: "XyoGR4b1ODP+h3hjFieKZrO1VoHhpryX+rRbM4qbQChDnn7whnEJdAPjfBPqKBgsbbhfZR136+nG7y89I+H+UQ=="
     druid:

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/settlement/SettlementService.java

@@ -4,7 +4,6 @@ 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.FeDraftCostSnapshot;
-import com.huimv.employment.dao.entity.FeDraftWorkItem;
 import com.huimv.employment.dao.entity.FeEmploymentDraft;
 import com.huimv.employment.dao.entity.FeEmploymentOrder;
 import com.huimv.employment.dao.entity.FeEnterprise;
@@ -24,7 +23,6 @@ import com.huimv.employment.dao.mapper.FeSettlementFeeMapper;
 import com.huimv.employment.dao.mapper.FeSettlementItemMapper;
 import com.huimv.employment.dao.mapper.FeSettlementOrderMapper;
 import com.huimv.employment.dao.mapper.FeWorkerRegistrationMapper;
-import com.huimv.employment.service.draft.DraftWorkItemService;
 import com.huimv.employment.service.enterprise.EnterpriseService;
 import com.huimv.employment.service.notification.NotificationService;
 import com.huimv.employment.service.order.OrderWorkItemService;
@@ -48,7 +46,9 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -57,7 +57,7 @@ import java.util.concurrent.ThreadLocalRandom;
  * 流程：{@code task_publish} → 发起结算 → {@code settlement_pending} →
  * 确认并支付（Mock）→ {@code settlement_paid} → 完税/开票办结 → {@code completed}。
  * </p>
- * <p>MVP 无考勤、无真实支付/税票通道：金额按日薪/方案快照估算，支付与办结均为 Mock。</p>
+ * <p>MVP 无考勤、无真实支付/税票通道：明细按订单工种 unit_amount×work_days 计算，支付与办结均为 Mock。</p>
  */
 @Service
 public class SettlementService {
@@ -112,7 +112,6 @@ public class SettlementService {
     private final FeServicePlanMapper feServicePlanMapper;
     private final EnterpriseService enterpriseService;
     private final NotificationService notificationService;
-    private final DraftWorkItemService draftWorkItemService;
     private final OrderWorkItemService orderWorkItemService;
     private final OrderInvoiceService orderInvoiceService;
 
@@ -127,7 +126,6 @@ public class SettlementService {
                              FeServicePlanMapper feServicePlanMapper,
                              EnterpriseService enterpriseService,
                              NotificationService notificationService,
-                             DraftWorkItemService draftWorkItemService,
                              OrderWorkItemService orderWorkItemService,
                              OrderInvoiceService orderInvoiceService) {
         this.feSettlementOrderMapper = feSettlementOrderMapper;
@@ -141,7 +139,6 @@ public class SettlementService {
         this.feServicePlanMapper = feServicePlanMapper;
         this.enterpriseService = enterpriseService;
         this.notificationService = notificationService;
-        this.draftWorkItemService = draftWorkItemService;
         this.orderWorkItemService = orderWorkItemService;
         this.orderInvoiceService = orderInvoiceService;
     }
@@ -205,7 +202,11 @@ public class SettlementService {
             throw new BizException(ErrorCode.BAD_REQUEST, "无可结算工人（须登记已完成签署）");
         }
 
-        AmountBreakdown amounts = calculateAmounts(order, workers.size());
+        List<FeOrderWorkItem> orderItems = orderWorkItemService.listByOrderId(order.getId());
+        if (orderItems == null || orderItems.isEmpty()) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "订单无用工明细，无法按工种结算");
+        }
+        AmountBreakdown amounts = calculateAmountsByJobType(order, workers, orderItems);
         LocalDateTime now = LocalDateTime.now();
         // 多批次时取首个可结算工人的批次作为主批次引用
         Long batchId = workers.get(0).getBatchId();
@@ -225,28 +226,24 @@ public class SettlementService {
         settlement.setTotalOutflow(amounts.totalOutflow);
         settlement.setSettlementStatus(STATUS_PENDING);
         settlement.setComplianceTags("[\"合同已签署\",\"待企业确认结算\"]");
-        settlement.setComplianceRemark("MVP 按约定天数与日薪/方案快照生成，待企业确认后支付");
+        settlement.setComplianceRemark("按订单工种 unit_amount×work_days 生成明细，待企业确认后支付");
         settlement.setCreateTime(now);
         settlement.setUpdateTime(now);
         settlement.setDelFlag(0);
         feSettlementOrderMapper.insert(settlement);
 
-        // 2) 按人明细（姓名脱敏；MVP 个税/其他扣款为 0）
-        BigDecimal workDays = orderWorkItemService.primaryWorkDays(orderWorkItemService.listByOrderId(order.getId()));
-        if (workDays == null) {
-            workDays = BigDecimal.ONE;
-        }
-        for (FeWorkerRegistration reg : workers) {
+        // 2) 按人明细：匹配登记工种 → 订单用工明细计算应发
+        for (WorkerLine line : amounts.lines) {
             FeSettlementItem item = new FeSettlementItem();
             item.setSettlementId(settlement.getId());
-            item.setRegistrationId(reg.getId());
-            item.setWorkerId(reg.getWorkerId());
-            item.setWorkerNameMask(maskName(reg.getRealName()));
-            item.setWorkDays(workDays);
-            item.setGrossAmount(amounts.perWorkerGross);
+            item.setRegistrationId(line.registration.getId());
+            item.setWorkerId(line.registration.getWorkerId());
+            item.setWorkerNameMask(maskName(line.registration.getRealName()));
+            item.setWorkDays(line.workDays);
+            item.setGrossAmount(line.gross);
             item.setTaxAmount(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
             item.setOtherDeduction(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
-            item.setNetAmount(amounts.perWorkerNet);
+            item.setNetAmount(line.net);
             item.setItemStatus(STATUS_PENDING);
             item.setCreateTime(now);
             item.setUpdateTime(now);
@@ -561,45 +558,55 @@ public class SettlementService {
     }
 
     /**
-     * MVP 金额估算（无考勤）：
+     * 按工人确认工种匹配订单用工明细计算结算金额：
      * <ol>
-     *   <li>人均应发：优先方案成本快照人均到手，否则草稿日薪 × 工作天数</li>
-     *   <li>服务费：方案 {@code serviceFeeRate × 应发总额}</li>
-     *   <li>企业总支出：按快照/订单总支出 × 实际人数/计划人数折算；差额记 other_fee</li>
+     *   <li>每人应发 = 对应工种 {@code unit_amount × work_days}</li>
+     *   <li>应发总额 = 各人应发合计</li>
+     *   <li>服务费 = 方案费率 × 应发总额（若有）</li>
+     *   <li>企业总支出：优先按工种明细 total_amount 折算；否则 应发+服务费</li>
      * </ol>
      */
-    private AmountBreakdown calculateAmounts(FeEmploymentOrder order, int workerCount) {
-        List<FeOrderWorkItem> orderItems = orderWorkItemService.listByOrderId(order.getId());
-        int plannedCount = orderWorkItemService.sumWorkerCount(orderItems);
-        BigDecimal workDays = orderWorkItemService.primaryWorkDays(orderItems);
-        if (workDays == null || workDays.compareTo(BigDecimal.ZERO) <= 0) {
-            workDays = BigDecimal.ONE;
-        }
-        BigDecimal dailyWage = BigDecimal.ZERO;
-        FeOrderWorkItem firstOrderItem = orderWorkItemService.firstItem(orderItems);
-        if (firstOrderItem != null && firstOrderItem.getUnitAmount() != null) {
-            dailyWage = firstOrderItem.getUnitAmount();
-        } else if (order.getDraftId() != null) {
-            List<FeDraftWorkItem> items = draftWorkItemService.listByDraftId(order.getDraftId());
-            if (!items.isEmpty() && items.get(0).getUnitAmount() != null) {
-                dailyWage = items.get(0).getUnitAmount();
+    private AmountBreakdown calculateAmountsByJobType(FeEmploymentOrder order,
+                                                      List<FeWorkerRegistration> workers,
+                                                      List<FeOrderWorkItem> orderItems) {
+        Map<String, FeOrderWorkItem> jobTypeMap = new HashMap<>();
+        for (FeOrderWorkItem wi : orderItems) {
+            if (wi != null && StringUtils.hasText(wi.getJobType())) {
+                jobTypeMap.putIfAbsent(wi.getJobType().trim(), wi);
             }
         }
+        FeOrderWorkItem fallback = orderWorkItemService.firstItem(orderItems);
 
-        // 默认：日薪 × 天数
-        BigDecimal perGross = dailyWage.multiply(workDays).setScale(2, RoundingMode.HALF_UP);
-        BigDecimal serviceFeeRate = null;
-        FeDraftCostSnapshot snapshot = findSelectedSnapshot(order);
-        // 有快照则覆盖为方案测算的人均到手
-        if (snapshot != null && snapshot.getWorkerTakeHomePerWorker() != null
-                && snapshot.getWorkerTakeHomePerWorker().compareTo(BigDecimal.ZERO) > 0) {
-            perGross = snapshot.getWorkerTakeHomePerWorker().setScale(2, RoundingMode.HALF_UP);
+        List<WorkerLine> lines = new ArrayList<>();
+        BigDecimal gross = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        for (FeWorkerRegistration reg : workers) {
+            FeOrderWorkItem wi = resolveWorkItemForRegistration(reg, jobTypeMap, fallback);
+            BigDecimal workDays = wi.getWorkDays() != null && wi.getWorkDays().compareTo(BigDecimal.ZERO) > 0
+                    ? wi.getWorkDays() : BigDecimal.ONE;
+            BigDecimal unitAmount = wi.getUnitAmount() != null ? wi.getUnitAmount() : BigDecimal.ZERO;
+            BigDecimal perGross = unitAmount.multiply(workDays).setScale(2, RoundingMode.HALF_UP);
+            // 若明细已有 total_amount 且配置了人数，优先用「组内人均」作为该工种单价口径兜底为 0 时的回退
+            if (perGross.compareTo(BigDecimal.ZERO) <= 0
+                    && wi.getTotalAmount() != null
+                    && wi.getWorkerCount() != null
+                    && wi.getWorkerCount() > 0) {
+                perGross = wi.getTotalAmount()
+                        .divide(BigDecimal.valueOf(wi.getWorkerCount()), 2, RoundingMode.HALF_UP);
+            }
+
+            WorkerLine line = new WorkerLine();
+            line.registration = reg;
+            line.jobType = wi.getJobType();
+            line.workDays = workDays;
+            line.unitAmount = unitAmount;
+            line.gross = perGross;
+            line.net = perGross; // MVP：实发=应发
+            lines.add(line);
+            gross = gross.add(perGross);
         }
 
-        BigDecimal gross = perGross.multiply(BigDecimal.valueOf(workerCount)).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal serviceFeeRate = null;
         BigDecimal serviceFee = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
-        BigDecimal otherFee = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
-
         if (order.getSelectedPlanId() != null) {
             FeServicePlan plan = feServicePlanMapper.selectById(order.getSelectedPlanId());
             if (plan != null && plan.getServiceFeeRate() != null
@@ -609,8 +616,11 @@ public class SettlementService {
             }
         }
 
-        // 总支出：按实际结算人数相对计划人数比例折算（缺编开工场景）
+        int workerCount = workers.size();
+        int plannedCount = orderWorkItemService.sumWorkerCount(orderItems);
+        BigDecimal otherFee = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
         BigDecimal totalOutflow;
+        FeDraftCostSnapshot snapshot = findSelectedSnapshot(order);
         BigDecimal plannedTotal = orderWorkItemService.sumTotalAmount(orderItems);
         if (snapshot != null && snapshot.getEmployerTotalOutflow() != null && plannedCount > 0) {
             totalOutflow = snapshot.getEmployerTotalOutflow()
@@ -631,8 +641,7 @@ public class SettlementService {
         }
 
         AmountBreakdown breakdown = new AmountBreakdown();
-        breakdown.perWorkerGross = perGross;
-        breakdown.perWorkerNet = perGross; // MVP：实发=应发，暂不计个税
+        breakdown.lines = lines;
         breakdown.gross = gross;
         breakdown.deduction = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
         breakdown.net = gross;
@@ -644,6 +653,26 @@ public class SettlementService {
         return breakdown;
     }
 
+    /** 按登记 confirmed_work_type 精确匹配订单工种；无工种时回退首条明细。 */
+    private static FeOrderWorkItem resolveWorkItemForRegistration(FeWorkerRegistration reg,
+                                                                  Map<String, FeOrderWorkItem> jobTypeMap,
+                                                                  FeOrderWorkItem fallback) {
+        if (reg != null && StringUtils.hasText(reg.getConfirmedWorkType())) {
+            FeOrderWorkItem matched = jobTypeMap.get(reg.getConfirmedWorkType().trim());
+            if (matched != null) {
+                return matched;
+            }
+            throw new BizException(ErrorCode.BAD_REQUEST,
+                    "工人「" + (reg.getRealName() != null ? reg.getRealName() : reg.getId())
+                            + "」确认工种「" + reg.getConfirmedWorkType().trim()
+                            + "」不在订单用工明细中，无法结算");
+        }
+        if (fallback == null) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "订单无用工明细，无法结算");
+        }
+        return fallback;
+    }
+
     /** 取订单所选方案对应的草稿成本快照。 */
     private FeDraftCostSnapshot findSelectedSnapshot(FeEmploymentOrder order) {
         if (order.getDraftId() == null || order.getSelectedPlanId() == null) {
@@ -905,12 +934,20 @@ public class SettlementService {
         return curIdx >= 0 && targetIdx >= 0 && curIdx > targetIdx;
     }
 
+    /** 单人按工种计算的结算行。 */
+    private static final class WorkerLine {
+        private FeWorkerRegistration registration;
+        private String jobType;
+        private BigDecimal workDays;
+        private BigDecimal unitAmount;
+        private BigDecimal gross;
+        private BigDecimal net;
+    }
+
     /** 结算金额中间结果。 */
     private static final class AmountBreakdown {
-        /** 人均应发 */
-        private BigDecimal perWorkerGross;
-        /** 人均实发 */
-        private BigDecimal perWorkerNet;
+        /** 按人明细行 */
+        private List<WorkerLine> lines;
         /** 应发总额 */
         private BigDecimal gross;
         /** 扣款合计 */

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/worker/ThirdPartyWorkerService.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huimv.employment.common.exception.BizException;
 import com.huimv.employment.common.exception.ErrorCode;
 import com.huimv.employment.service.enterprise.EnterpriseService;
-import com.huimv.employment.service.registration.dto.RegistrationBatchWorkerItemResponse;
+import com.huimv.employment.service.worker.dto.ThirdPartyAvailableWorkerItem;
 import com.huimv.employment.service.worker.dto.ThirdPartyWorkerGroupResponse;
 import com.huimv.employment.service.worker.dto.ThirdPartyWorkerQueryItem;
 import org.slf4j.Logger;
@@ -66,7 +66,7 @@ public class ThirdPartyWorkerService {
         }
 
         // 保持查询工种顺序；同一工人只出现一次
-        Map<String, List<RegistrationBatchWorkerItemResponse>> grouped = new LinkedHashMap<>();
+        Map<String, List<ThirdPartyAvailableWorkerItem>> grouped = new LinkedHashMap<>();
         for (ThirdPartyWorkerQueryItem q : normalized) {
             grouped.putIfAbsent(q.getJobType(), new ArrayList<>());
         }
@@ -95,7 +95,7 @@ public class ThirdPartyWorkerService {
 
         int total = 0;
         List<ThirdPartyWorkerGroupResponse.JobTypeGroup> groups = new ArrayList<>();
-        for (Map.Entry<String, List<RegistrationBatchWorkerItemResponse>> e : grouped.entrySet()) {
+        for (Map.Entry<String, List<ThirdPartyAvailableWorkerItem>> e : grouped.entrySet()) {
             ThirdPartyWorkerGroupResponse.JobTypeGroup g = new ThirdPartyWorkerGroupResponse.JobTypeGroup();
             g.setJobType(e.getKey());
             g.setWorkers(e.getValue());
@@ -147,14 +147,16 @@ public class ThirdPartyWorkerService {
                 .contains(location.toLowerCase(Locale.ROOT));
     }
 
-    private static RegistrationBatchWorkerItemResponse toWorkerItem(MockWorkerRow row) {
-        RegistrationBatchWorkerItemResponse item = new RegistrationBatchWorkerItemResponse();
+    private static ThirdPartyAvailableWorkerItem toWorkerItem(MockWorkerRow row) {
+        ThirdPartyAvailableWorkerItem item = new ThirdPartyAvailableWorkerItem();
         item.setRegistrationId(row.registrationId);
         item.setWorkerId(row.workerId);
         item.setRealName(row.realName);
         item.setConfirmedWorkType(row.confirmedWorkType);
         item.setThirdPartySource(row.thirdPartySource != null ? row.thirdPartySource : 1);
-        item.setMobileMask(row.mobileMask);
+        item.setMobile(row.mobile);
+        item.setIdCardNo(row.idCardNo);
+        item.setMobileMask(StringUtils.hasText(row.mobileMask) ? row.mobileMask : maskMobile(row.mobile));
         item.setRegStatus(row.regStatus);
         item.setStatusTag(row.statusTag);
         item.setStatusText(row.statusText);
@@ -163,6 +165,13 @@ public class ThirdPartyWorkerService {
         return item;
     }
 
+    private static String maskMobile(String mobile) {
+        if (!StringUtils.hasText(mobile) || mobile.length() < 7) {
+            return mobile;
+        }
+        return mobile.substring(0, 3) + "****" + mobile.substring(mobile.length() - 4);
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     private static class MockRoot {
         public List<MockWorkerRow> workers;
@@ -180,6 +189,10 @@ public class ThirdPartyWorkerService {
         public String confirmedWorkType;
         @JsonProperty("third_party_source")
         public Integer thirdPartySource;
+        @JsonProperty("mobile")
+        public String mobile;
+        @JsonProperty("id_card_no")
+        public String idCardNo;
         @JsonProperty("mobile_mask")
         public String mobileMask;
         @JsonProperty("reg_status")

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/worker/dto/ThirdPartyAvailableWorkerItem.java

@@ -0,0 +1,169 @@
+package com.huimv.employment.service.worker.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+/**
+ * 第三方可用工人条目（含手机号/身份证明文，便于前端直接调用添加接口）。
+ */
+@Schema(description = "第三方可用工人条目")
+public class ThirdPartyAvailableWorkerItem {
+
+    @JsonProperty("registration_id")
+    @Schema(description = "第三方侧登记/候选人 ID（Mock）")
+    private Long registrationId;
+
+    @JsonProperty("worker_id")
+    @Schema(description = "工人 ID（第三方 Mock）")
+    private Long workerId;
+
+    @JsonProperty("real_name")
+    @Schema(description = "姓名", example = "王强")
+    private String realName;
+
+    @JsonProperty("confirmed_work_type")
+    @Schema(description = "工种", example = "搬运工")
+    private String confirmedWorkType;
+
+    @JsonProperty("third_party_source")
+    @Schema(description = "是否第三方人力来源：1=是", example = "1")
+    private Integer thirdPartySource;
+
+    @JsonProperty("mobile")
+    @Schema(description = "手机号明文", example = "13812341001")
+    private String mobile;
+
+    @JsonProperty("id_card_no")
+    @Schema(description = "身份证号明文", example = "110101199001011234")
+    private String idCardNo;
+
+    @JsonProperty("mobile_mask")
+    @Schema(description = "脱敏手机号（兼容展示）", example = "138****1001")
+    private String mobileMask;
+
+    @JsonProperty("reg_status")
+    @Schema(description = "登记状态")
+    private String regStatus;
+
+    @JsonProperty("status_tag")
+    @Schema(description = "前端状态样式标签")
+    private String statusTag;
+
+    @JsonProperty("status_text")
+    @Schema(description = "状态中文")
+    private String statusText;
+
+    @JsonProperty("fail_reason")
+    @Schema(description = "失败原因")
+    private String failReason;
+
+    @JsonProperty("submitted_at")
+    @Schema(description = "提交时间")
+    private LocalDateTime submittedAt;
+
+    public Long getRegistrationId() {
+        return registrationId;
+    }
+
+    public void setRegistrationId(Long registrationId) {
+        this.registrationId = registrationId;
+    }
+
+    public Long getWorkerId() {
+        return workerId;
+    }
+
+    public void setWorkerId(Long workerId) {
+        this.workerId = workerId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getConfirmedWorkType() {
+        return confirmedWorkType;
+    }
+
+    public void setConfirmedWorkType(String confirmedWorkType) {
+        this.confirmedWorkType = confirmedWorkType;
+    }
+
+    public Integer getThirdPartySource() {
+        return thirdPartySource;
+    }
+
+    public void setThirdPartySource(Integer thirdPartySource) {
+        this.thirdPartySource = thirdPartySource;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getIdCardNo() {
+        return idCardNo;
+    }
+
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
+    }
+
+    public String getMobileMask() {
+        return mobileMask;
+    }
+
+    public void setMobileMask(String mobileMask) {
+        this.mobileMask = mobileMask;
+    }
+
+    public String getRegStatus() {
+        return regStatus;
+    }
+
+    public void setRegStatus(String regStatus) {
+        this.regStatus = regStatus;
+    }
+
+    public String getStatusTag() {
+        return statusTag;
+    }
+
+    public void setStatusTag(String statusTag) {
+        this.statusTag = statusTag;
+    }
+
+    public String getStatusText() {
+        return statusText;
+    }
+
+    public void setStatusText(String statusText) {
+        this.statusText = statusText;
+    }
+
+    public String getFailReason() {
+        return failReason;
+    }
+
+    public void setFailReason(String failReason) {
+        this.failReason = failReason;
+    }
+
+    public LocalDateTime getSubmittedAt() {
+        return submittedAt;
+    }
+
+    public void setSubmittedAt(LocalDateTime submittedAt) {
+        this.submittedAt = submittedAt;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/worker/dto/ThirdPartyWorkerGroupResponse.java

@@ -1,7 +1,6 @@
 package com.huimv.employment.service.worker.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.huimv.employment.service.registration.dto.RegistrationBatchWorkerItemResponse;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.ArrayList;
@@ -79,8 +78,8 @@ public class ThirdPartyWorkerGroupResponse {
         @Schema(description = "该工种可用人数")
         private Integer workerCount;
 
-        @Schema(description = "可用人员列表（字段同 workflow-progress 的 workers 子对象）")
-        private List<RegistrationBatchWorkerItemResponse> workers = new ArrayList<>();
+        @Schema(description = "可用人员列表（含 mobile / id_card_no 明文）")
+        private List<ThirdPartyAvailableWorkerItem> workers = new ArrayList<>();
 
         public String getJobType() {
             return jobType;
@@ -98,11 +97,11 @@ public class ThirdPartyWorkerGroupResponse {
             this.workerCount = workerCount;
         }
 
-        public List<RegistrationBatchWorkerItemResponse> getWorkers() {
+        public List<ThirdPartyAvailableWorkerItem> getWorkers() {
             return workers;
         }
 
-        public void setWorkers(List<RegistrationBatchWorkerItemResponse> workers) {
+        public void setWorkers(List<ThirdPartyAvailableWorkerItem> workers) {
             this.workers = workers != null ? workers : new ArrayList<>();
         }
     }

huimv-employment/fe-service/src/main/resources/mock/available-workers.json

@@ -6,6 +6,8 @@
       "real_name": "王强",
       "confirmed_work_type": "搬运工",
       "third_party_source": 1,
+      "mobile": "13812341001",
+      "id_card_no": "110101199001011001",
       "mobile_mask": "138****1001",
       "reg_status": "completed",
       "status_tag": "done",
@@ -20,6 +22,8 @@
       "real_name": "李明",
       "confirmed_work_type": "搬运工",
       "third_party_source": 1,
+      "mobile": "13912342002",
+      "id_card_no": "110101199002021002",
       "mobile_mask": "139****2002",
       "reg_status": "completed",
       "status_tag": "done",
@@ -34,6 +38,8 @@
       "real_name": "赵磊",
       "confirmed_work_type": "搬运工",
       "third_party_source": 1,
+      "mobile": "13712343003",
+      "id_card_no": "310101199003031003",
       "mobile_mask": "137****3003",
       "reg_status": "completed",
       "status_tag": "done",
@@ -48,6 +54,8 @@
       "real_name": "陈厨",
       "confirmed_work_type": "厨师",
       "third_party_source": 1,
+      "mobile": "13612344004",
+      "id_card_no": "330101199004041004",
       "mobile_mask": "136****4004",
       "reg_status": "completed",
       "status_tag": "done",
@@ -62,6 +70,8 @@
       "real_name": "周敏",
       "confirmed_work_type": "厨师",
       "third_party_source": 1,
+      "mobile": "13512345005",
+      "id_card_no": "330101199005051005",
       "mobile_mask": "135****5005",
       "reg_status": "completed",
       "status_tag": "done",
@@ -76,6 +86,8 @@
       "real_name": "孙洁",
       "confirmed_work_type": "保洁",
       "third_party_source": 1,
+      "mobile": "13412346006",
+      "id_card_no": "330101199006061006",
       "mobile_mask": "134****6006",
       "reg_status": "completed",
       "status_tag": "done",
@@ -90,6 +102,8 @@
       "real_name": "钱峰",
       "confirmed_work_type": "保安",
       "third_party_source": 1,
+      "mobile": "13312347007",
+      "id_card_no": "310101199007071007",
       "mobile_mask": "133****7007",
       "reg_status": "completed",
       "status_tag": "done",
@@ -104,6 +118,8 @@
       "real_name": "吴涛",
       "confirmed_work_type": "仓库分拣",
       "third_party_source": 1,
+      "mobile": "13212348008",
+      "id_card_no": "310101199008081008",
       "mobile_mask": "132****8008",
       "reg_status": "completed",
       "status_tag": "done",