增加与ai大模型对话

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

@@ -51,8 +51,9 @@ public class WorkerRegistrationController {
 
     @PostMapping("/{id}/approve")
     @Operation(summary = "企业审核通过用工登记",
-            description = "企业主审核 under_review 登记：reg_status→completed，写 reviewed_at/reviewed_by；"
-                    + "批次 completed_count+1；订单若仍为 registration 则推进到 enterprise_audit。",
+            description = "企业主审核 under_review 登记：该人 reg_status→contract_signing（进入签合同）；"
+                    + "写 reviewed_at/reviewed_by；批次 completed_count+1；"
+                    + "订单若尚未签约则推进到 contract_signing（不要求整批审完）。",
             parameters = {
                     @Parameter(name = "id", in = ParameterIn.PATH, required = true,
                             description = "fe_worker_registration.id（进度人员列表 registration_id）")

huimv-employment/fe-dao/src/main/java/com/huimv/employment/dao/entity/FeWorkerRegistration.java

@@ -36,7 +36,7 @@ public class FeWorkerRegistration {
 
     private String confirmedWorkType;
 
-    /** pending / registering / completed / verify_failed / under_review / rejected */
+    /** pending / registering / under_review / contract_signing / completed / verify_failed / rejected */
     private String regStatus;
 
     private String failReason;

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

@@ -65,6 +65,7 @@ public class RegistrationBatchService {
     private static final String REG_PENDING = "pending";
     private static final String REG_REGISTERING = "registering";
     private static final String REG_UNDER_REVIEW = "under_review";
+    private static final String REG_CONTRACT_SIGNING = "contract_signing";
     private static final String REG_COMPLETED = "completed";
     private static final String REG_VERIFY_FAILED = "verify_failed";
     private static final String REG_REJECTED = "rejected";
@@ -322,9 +323,9 @@ public class RegistrationBatchService {
         if (registrations != null) {
             for (FeWorkerRegistration reg : registrations) {
                 String status = reg.getRegStatus();
-                if (REG_COMPLETED.equals(status)) {
+                if (REG_COMPLETED.equals(status) || REG_CONTRACT_SIGNING.equals(status)) {
                     completed++;
-                } else if (REG_VERIFY_FAILED.equals(status)) {
+                } else if (REG_VERIFY_FAILED.equals(status) || REG_REJECTED.equals(status)) {
                     abnormal++;
                 } else if (REG_PENDING.equals(status)) {
                     appliedPending++;
@@ -496,6 +497,9 @@ public class RegistrationBatchService {
         if (REG_COMPLETED.equals(regStatus)) {
             return "done";
         }
+        if (REG_CONTRACT_SIGNING.equals(regStatus)) {
+            return "contract";
+        }
         if (REG_VERIFY_FAILED.equals(regStatus) || REG_REJECTED.equals(regStatus)) {
             return "fail";
         }
@@ -512,6 +516,9 @@ public class RegistrationBatchService {
         if (REG_COMPLETED.equals(regStatus)) {
             return "已完成";
         }
+        if (REG_CONTRACT_SIGNING.equals(regStatus)) {
+            return "待签约";
+        }
         if (REG_REJECTED.equals(regStatus)) {
             return "已驳回";
         }

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

@@ -31,12 +31,16 @@ public class WorkerRegistrationService {
 
     private static final String BATCH_ACTIVE = "active";
     private static final String REG_UNDER_REVIEW = "under_review";
+    /** 审核通过后进入个人签合同阶段 */
+    private static final String REG_CONTRACT_SIGNING = "contract_signing";
     private static final String REG_COMPLETED = "completed";
     /** 企业审核驳回（与实名核验失败 verify_failed 区分） */
     private static final String REG_REJECTED = "rejected";
     private static final String STEP_REGISTRATION = "registration";
     private static final String STEP_ENTERPRISE_AUDIT = "enterprise_audit";
     private static final String STEP_CONTRACT_SIGNING = "contract_signing";
+    private static final String STEP_PLAN_CONFIRMED = "plan_confirmed";
+    private static final String STEP_DRAFT_CREATED = "draft_created";
     private static final String APPLY_SUCCESS = "success";
     private static final String APPLY_ALREADY = "already_applied";
     private static final String REVIEW_APPROVED = "approved";
@@ -119,16 +123,15 @@ public class WorkerRegistrationService {
         feWorkerRegistrationMapper.insert(reg);
 
         bumpBatchCounters(batch, now);
-        bumpOrderCounters(order, now);
-        maybeAdvanceOrderToEnterpriseAudit(order, now);
+        bumpOrderCountersAndAdvanceToEnterpriseAudit(order, now);
 
         return toResponse(reg, batch, order, APPLY_SUCCESS, "申请已提交，请等待企业确认");
     }
 
     /**
      * 企业审核通过用工登记。
-     * <p>仅 {@code under_review} 可审核；写 reviewed_*，登记置 completed，批次 completed_count+1；
-     * 当本批次登记审核全部结束且通过人数达标时，订单推进到 {@code contract_signing}。</p>
+     * <p>仅 {@code under_review} 可审；该人 {@code reg_status→contract_signing}（进入个人签合同）；
+     * 订单若尚未进入签约阶段则推进到 {@code contract_signing}（不要求整批审完）。</p>
      */
     @Transactional(rollbackFor = Exception.class)
     public WorkerRegistrationReviewResponse approve(Long userId, Long registrationId) {
@@ -138,7 +141,7 @@ public class WorkerRegistrationService {
         FeRegistrationBatch batch = requireBatch(reg.getBatchId());
         FeEmploymentOrder order = requireOrder(reg.getOrderId());
 
-        if (REG_COMPLETED.equals(reg.getRegStatus())) {
+        if (REG_CONTRACT_SIGNING.equals(reg.getRegStatus()) || REG_COMPLETED.equals(reg.getRegStatus())) {
             return toReviewResponse(reg, batch, order, REVIEW_ALREADY, "该登记已审核通过");
         }
         if (REG_REJECTED.equals(reg.getRegStatus())) {
@@ -151,33 +154,29 @@ public class WorkerRegistrationService {
         LocalDateTime now = LocalDateTime.now();
         FeWorkerRegistration update = new FeWorkerRegistration();
         update.setId(reg.getId());
-        update.setRegStatus(REG_COMPLETED);
+        update.setRegStatus(REG_CONTRACT_SIGNING);
         update.setFailReason(null);
         update.setReviewedAt(now);
         update.setReviewedBy(userId);
         update.setUpdateTime(now);
         feWorkerRegistrationMapper.updateById(update);
 
-        reg.setRegStatus(REG_COMPLETED);
+        reg.setRegStatus(REG_CONTRACT_SIGNING);
         reg.setFailReason(null);
         reg.setReviewedAt(now);
         reg.setReviewedBy(userId);
 
         bumpCompletedCounters(batch, now);
-        batch = feRegistrationBatchMapper.selectById(batch.getId());
-        maybeAdvanceOrderAfterRegistrationAudit(batch, order, now);
+        maybeAdvanceOrderToContractSigning(order, now);
 
         order = feEmploymentOrderMapper.selectById(order.getId());
-        String message = STEP_CONTRACT_SIGNING.equals(order.getCurrentStepCode())
-                ? "审核通过，登记审核已全部完成，已进入合同签署"
-                : "审核通过";
-        return toReviewResponse(reg, batch, order, REVIEW_APPROVED, message);
+        return toReviewResponse(reg, batch, order, REVIEW_APPROVED, "审核通过，已进入合同签署");
     }
 
     /**
      * 企业驳回用工登记。
-     * <p>仅 {@code under_review} 可驳回；写 fail_reason / reviewed_*，登记置 rejected，并释放名额（registered-1、pending+1）。
-     * 若驳回后本批次已无待审且通过人数仍达标，同样可推进到下一节点。</p>
+     * <p>仅 {@code under_review} 可驳回；写 fail_reason / reviewed_*，登记置 rejected，并释放名额。
+     * 驳回不影响其他人的签约进度，不推进订单到签约。</p>
      */
     @Transactional(rollbackFor = Exception.class)
     public WorkerRegistrationReviewResponse reject(Long userId, Long registrationId,
@@ -199,7 +198,7 @@ public class WorkerRegistrationService {
         if (REG_REJECTED.equals(reg.getRegStatus())) {
             return toReviewResponse(reg, batch, order, REVIEW_ALREADY, "该登记已驳回");
         }
-        if (REG_COMPLETED.equals(reg.getRegStatus())) {
+        if (REG_CONTRACT_SIGNING.equals(reg.getRegStatus()) || REG_COMPLETED.equals(reg.getRegStatus())) {
             throw new BizException(ErrorCode.BAD_REQUEST, "该登记已审核通过，无法驳回");
         }
         if (!REG_UNDER_REVIEW.equals(reg.getRegStatus())) {
@@ -222,8 +221,6 @@ public class WorkerRegistrationService {
         reg.setReviewedBy(userId);
 
         releaseSlotCounters(batch, order, now);
-        batch = feRegistrationBatchMapper.selectById(batch.getId());
-        maybeAdvanceOrderAfterRegistrationAudit(batch, order, now);
 
         order = feEmploymentOrderMapper.selectById(order.getId());
         return toReviewResponse(reg, batch, order, REVIEW_REJECTED, "已驳回");
@@ -301,43 +298,47 @@ public class WorkerRegistrationService {
     }
 
     /**
-     * 有人提交登记申请后，订单从 registration 进入 enterprise_audit（企业审核阶段）。
+     * 申请成功后：名额计数 + 如需则推进到 enterprise_audit。
      */
-    private void maybeAdvanceOrderToEnterpriseAudit(FeEmploymentOrder order, LocalDateTime now) {
-        String step = order.getCurrentStepCode();
-        if (STEP_REGISTRATION.equals(step) || !StringUtils.hasText(step)) {
-            FeEmploymentOrder update = new FeEmploymentOrder();
-            update.setId(order.getId());
+    private void bumpOrderCountersAndAdvanceToEnterpriseAudit(FeEmploymentOrder order, LocalDateTime now) {
+        int registered = order.getRegisteredCount() != null ? order.getRegisteredCount() : 0;
+        int pending = order.getPendingCount() != null ? order.getPendingCount() : 0;
+        FeEmploymentOrder update = new FeEmploymentOrder();
+        update.setId(order.getId());
+        update.setRegisteredCount(registered + 1);
+        update.setPendingCount(Math.max(0, pending - 1));
+        update.setUpdateTime(now);
+        if (shouldEnterEnterpriseAudit(order.getCurrentStepCode())) {
             update.setCurrentStepCode(STEP_ENTERPRISE_AUDIT);
-            update.setUpdateTime(now);
-            feEmploymentOrderMapper.updateById(update);
             order.setCurrentStepCode(STEP_ENTERPRISE_AUDIT);
         }
+        feEmploymentOrderMapper.updateById(update);
+        order.setRegisteredCount(registered + 1);
+        order.setPendingCount(Math.max(0, pending - 1));
+    }
+
+    private static boolean shouldEnterEnterpriseAudit(String step) {
+        if (!StringUtils.hasText(step)) {
+            return true;
+        }
+        String code = step.trim();
+        return STEP_REGISTRATION.equals(code)
+                || STEP_PLAN_CONFIRMED.equals(code)
+                || STEP_DRAFT_CREATED.equals(code);
     }
 
     /**
-     * 登记审核全部结束且通过人数达标时，订单进入 contract_signing。
-     * <p>
-     * 完成条件（同时满足）：
-     * <ol>
-     *   <li>批次内无 {@code under_review}</li>
-     *   <li>{@code completed_count >= expected_count}（expected&gt;0）；expected=0 时至少 1 人通过</li>
-     * </ol>
-     * </p>
+     * 有人审核通过后，订单进入 contract_signing（整单进入签约阶段；个人已是 contract_signing）。
+     * <p>不要求整批审完；已处于签约及之后步骤则不回退。</p>
      */
-    private void maybeAdvanceOrderAfterRegistrationAudit(FeRegistrationBatch batch,
-                                                         FeEmploymentOrder order,
-                                                         LocalDateTime now) {
-        if (batch == null || order == null || !isBatchRegistrationAuditComplete(batch.getId(), batch)) {
+    private void maybeAdvanceOrderToContractSigning(FeEmploymentOrder order, LocalDateTime now) {
+        if (order == null) {
             return;
         }
         String step = order.getCurrentStepCode();
         if (STEP_CONTRACT_SIGNING.equals(step) || isStepAfter(step, STEP_CONTRACT_SIGNING)) {
             return;
         }
-        if (!STEP_ENTERPRISE_AUDIT.equals(step) && !STEP_REGISTRATION.equals(step)) {
-            return;
-        }
         FeEmploymentOrder update = new FeEmploymentOrder();
         update.setId(order.getId());
         update.setCurrentStepCode(STEP_CONTRACT_SIGNING);
@@ -346,32 +347,10 @@ public class WorkerRegistrationService {
         order.setCurrentStepCode(STEP_CONTRACT_SIGNING);
     }
 
-    /**
-     * 批次登记审核是否已全部结束：无待审，且通过人数达到计划用工人数。
-     */
-    private boolean isBatchRegistrationAuditComplete(Long batchId, FeRegistrationBatch batch) {
-        Long underReview = feWorkerRegistrationMapper.selectCount(new LambdaQueryWrapper<FeWorkerRegistration>()
-                .eq(FeWorkerRegistration::getBatchId, batchId)
-                .eq(FeWorkerRegistration::getRegStatus, REG_UNDER_REVIEW));
-        if (underReview != null && underReview > 0) {
-            return false;
-        }
-        Long approved = feWorkerRegistrationMapper.selectCount(new LambdaQueryWrapper<FeWorkerRegistration>()
-                .eq(FeWorkerRegistration::getBatchId, batchId)
-                .eq(FeWorkerRegistration::getRegStatus, REG_COMPLETED));
-        int approvedCount = approved != null ? approved.intValue() : 0;
-        int expected = batch.getExpectedCount() != null ? batch.getExpectedCount() : 0;
-        if (expected > 0) {
-            return approvedCount >= expected;
-        }
-        return approvedCount > 0;
-    }
-
     private static boolean isStepAfter(String current, String target) {
         if (!StringUtils.hasText(current) || !StringUtils.hasText(target)) {
             return false;
         }
-        // 九步顺序中的粗略比较，避免重复推进
         String[] order = {
                 "draft_created", "plan_confirmed", "registration", "enterprise_audit",
                 "contract_signing", "work_started", "settlement_pending", "settlement_paid", "completed"
@@ -441,17 +420,6 @@ public class WorkerRegistrationService {
         feRegistrationBatchMapper.updateById(update);
     }
 
-    private void bumpOrderCounters(FeEmploymentOrder order, LocalDateTime now) {
-        int registered = order.getRegisteredCount() != null ? order.getRegisteredCount() : 0;
-        int pending = order.getPendingCount() != null ? order.getPendingCount() : 0;
-        FeEmploymentOrder update = new FeEmploymentOrder();
-        update.setId(order.getId());
-        update.setRegisteredCount(registered + 1);
-        update.setPendingCount(Math.max(0, pending - 1));
-        update.setUpdateTime(now);
-        feEmploymentOrderMapper.updateById(update);
-    }
-
     private static WorkerRegistrationApplyResponse toResponse(FeWorkerRegistration reg,
                                                               FeRegistrationBatch batch,
                                                               FeEmploymentOrder order,

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

@@ -25,15 +25,15 @@ public class RegistrationBatchWorkerItemResponse {
     private String mobileMask;
 
     @JsonProperty("reg_status")
-    @Schema(description = "登记状态：pending / registering / under_review / completed / verify_failed")
+    @Schema(description = "登记状态：pending / registering / under_review / contract_signing / completed / verify_failed / rejected")
     private String regStatus;
 
     @JsonProperty("status_tag")
-    @Schema(description = "前端状态样式标签：pending / registering / review / done / fail")
+    @Schema(description = "前端状态样式标签：pending / registering / review / contract / done / fail")
     private String statusTag;
 
     @JsonProperty("status_text")
-    @Schema(description = "状态中文", example = "已完成")
+    @Schema(description = "状态中文", example = "待签约")
     private String statusText;
 
     @JsonProperty("fail_reason")