增加与ai大模型对话

huimv-employment/fe-api/src/main/java/com/huimv/employment/ApiSignUtil.java

@@ -0,0 +1,77 @@
+package com.huimv.employment;
+
+import java.security.MessageDigest;
+import java.util.*;
+
+public class ApiSignUtil {
+
+    /**
+     * 构建请求签名
+     *
+     * @param params    请求参数 Map（query 参数，key=参数名，value=参数值）
+     * @param timestamp 时间戳（毫秒）
+     * @param secret    平台分配的 appPublicKey
+     * @return 32位小写MD5签名字符串
+     */
+    public static String buildSign(Map<String, String> params, long timestamp, String secret) {
+        // 1. 参数字典序排列（TreeMap 自动排序）
+        TreeMap<String, String> sorted = new TreeMap<>(params);
+
+        // 2. 拼接签名原串：k1=v1&k2=v2...&timestamp=xxx&key=secret
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : sorted.entrySet()) {
+            if (entry.getValue() != null && !entry.getValue().isEmpty()) {
+                sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
+            }
+        }
+        sb.append("timestamp=").append(timestamp);
+        sb.append("&key=").append(secret);
+
+        // 3. MD5 → 32位小写十六进制
+        return md5(sb.toString());
+    }
+
+    private static String md5(String input) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.reset();
+            md.update(input.getBytes("UTF-8"));
+            byte[] digest = md.digest();
+            StringBuilder sb = new StringBuilder(digest.length * 2);
+            for (byte b : digest) {
+                sb.append(String.format("%02x", b & 0xff));
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            throw new RuntimeException("MD5 error", e);
+        }
+    }
+
+    // ────────── 使用示例 ──────────
+
+    public static void main(String[] args) {
+        String appKey = "AK_eaf449b6fb9f21";
+        String secret = "70c1b93ae1df463809ed3b41156e4791";
+
+        // 示例1：任务大厅列表
+        Map<String, String> hallParams = new LinkedHashMap<>();
+        hallParams.put("current", "1");
+        hallParams.put("size", "108");
+//        hallParams.put("occupationCode", "OCC001");
+
+        long ts = System.currentTimeMillis();
+        String sign = buildSign(hallParams, ts, secret);
+
+        System.out.println("X-App-Key   : " + appKey);
+        System.out.println("X-Timestamp : " + ts);
+        System.out.println("X-Sign      : " + sign);
+
+        // 示例2：任务详情（无Query参数）
+        Map<String, String> emptyParams = new LinkedHashMap<>();
+        long ts2 = System.currentTimeMillis();
+        String sign2 = buildSign(emptyParams, ts2, secret);
+
+        System.out.println("\n[任务详情] X-Timestamp: " + ts2);
+        System.out.println("[任务详情] X-Sign     : " + sign2);
+    }
+}

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

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * 智能体网关代理（小程序 JWT 鉴权；上游暂不需要 api-key）。
+ * 智能体网关代理（小程序 JWT 鉴权；上游 Authorization 使用 fe.kb.api-key）。
  */
 @RestController
 @RequestMapping("/api/v1/mp/ai")

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

@@ -63,7 +63,8 @@ public class ContractController {
     @PostMapping("/{id}/confirm-sign")
     @Operation(summary = "确认签署完成",
             description = "临时工确认签署（Mock 闭环）。sign_status→signed，登记 contract_signing→completed。"
-                    + "订单不自动开工，须企业调用 POST /orders/{orderId}/start-work。已签署幂等返回。",
+                    + "期望用工人数全部签署后订单自动 contract_signing→work_started；"
+                    + "未招满须企业 POST /orders/{orderId}/start-work 缺编确认。已签署幂等返回。",
             parameters = {
                     @Parameter(name = "id", in = ParameterIn.PATH, required = true, description = "fe_contract.id")
             })

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

@@ -0,0 +1,54 @@
+package com.huimv.employment.controller.mp;
+
+import com.huimv.employment.common.web.R;
+import com.huimv.employment.security.LoginUserHolder;
+import com.huimv.employment.service.notification.NotificationService;
+import com.huimv.employment.service.notification.dto.NotificationPageResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 消息与待办中心：当前登录用户查询本人通知。
+ */
+@RestController
+@RequestMapping("/api/v1/mp/notifications")
+@Tag(name = "消息与待办", description = "查询当前用户消息与待办")
+@SecurityRequirement(name = "Authorization")
+public class NotificationController {
+
+    private final NotificationService notificationService;
+
+    public NotificationController(NotificationService notificationService) {
+        this.notificationService = notificationService;
+    }
+
+    @GetMapping
+    @Operation(summary = "我的消息与待办",
+            description = "按当前 JWT 用户 user_id 分页查询。可选 notify_type / category / read_flag / handled_flag 过滤。"
+                    + "返回 unread_count、pending_count 便于角标展示。")
+    public R<NotificationPageResponse> listMine(
+            @Parameter(name = "notify_type", in = ParameterIn.QUERY,
+                    description = "pending / error / info / success")
+            @RequestParam(value = "notify_type", required = false) String notifyType,
+            @Parameter(name = "category", in = ParameterIn.QUERY,
+                    description = "settlement / registration / verify / workflow")
+            @RequestParam(value = "category", required = false) String category,
+            @Parameter(name = "read_flag", in = ParameterIn.QUERY, description = "是否已读")
+            @RequestParam(value = "read_flag", required = false) Boolean readFlag,
+            @Parameter(name = "handled_flag", in = ParameterIn.QUERY, description = "待办是否已处理")
+            @RequestParam(value = "handled_flag", required = false) Boolean handledFlag,
+            @Parameter(name = "page", in = ParameterIn.QUERY, description = "页码，从 1 开始")
+            @RequestParam(value = "page", required = false) Integer page,
+            @Parameter(name = "size", in = ParameterIn.QUERY, description = "每页条数，默认 20，最大 100")
+            @RequestParam(value = "size", required = false) Integer size) {
+        Long userId = LoginUserHolder.require().getUserId();
+        return R.ok(notificationService.listByUser(userId, notifyType, category, readFlag, handledFlag, page, size));
+    }
+}

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

@@ -70,6 +70,9 @@ fe:
     scheme: http
     host: harrison1.iask.in
     port: 9188
+    # 上游 /api/console/chat 鉴权：Authorization: Bearer {api-key}
+    api-key: eyJzdWIiOiAiYWRtaW4iLCAiZXhwIjogNDkzODQ5NTQxMywgImlhdCI6IDE3ODQ4OTU0MTMsICJqdGkiOiAiYjdiMjQ4M2ZhYmQwOWM0NWEwNzQ1NThhNTJiZjBjYjkifQ==.bbab9a6fa67f5f8ec3e14e6e017b17f0ad193d8eca42b6591175861918598884
+    auth-header-name: Authorization
     default-model: default
     default-agent-id: default
     default-knowledge-base: default

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

@@ -0,0 +1,179 @@
+package com.huimv.employment.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.time.LocalDateTime;
+
+/**
+ * 消息与待办中心 {@code fe_notification}。
+ * <p>推送结算待确认、实名失败、登记进度等；通过 {@code read_flag}/{@code handled_flag} 区分已读与已办。</p>
+ */
+@TableName("fe_notification")
+public class FeNotification {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long enterpriseId;
+
+    private Long userId;
+
+    /** pending / error / info / success */
+    private String notifyType;
+
+    /** settlement / registration / verify / workflow */
+    private String category;
+
+    private String title;
+
+    private String content;
+
+    /** settlement / registration / order 等 */
+    private String bizType;
+
+    private Long bizId;
+
+    private String bizNo;
+
+    private String actionUrl;
+
+    private Boolean readFlag;
+
+    private Boolean handledFlag;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime readTime;
+
+    private LocalDateTime handledTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getNotifyType() {
+        return notifyType;
+    }
+
+    public void setNotifyType(String notifyType) {
+        this.notifyType = notifyType;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(String bizType) {
+        this.bizType = bizType;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public String getBizNo() {
+        return bizNo;
+    }
+
+    public void setBizNo(String bizNo) {
+        this.bizNo = bizNo;
+    }
+
+    public String getActionUrl() {
+        return actionUrl;
+    }
+
+    public void setActionUrl(String actionUrl) {
+        this.actionUrl = actionUrl;
+    }
+
+    public Boolean getReadFlag() {
+        return readFlag;
+    }
+
+    public void setReadFlag(Boolean readFlag) {
+        this.readFlag = readFlag;
+    }
+
+    public Boolean getHandledFlag() {
+        return handledFlag;
+    }
+
+    public void setHandledFlag(Boolean handledFlag) {
+        this.handledFlag = handledFlag;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public LocalDateTime getReadTime() {
+        return readTime;
+    }
+
+    public void setReadTime(LocalDateTime readTime) {
+        this.readTime = readTime;
+    }
+
+    public LocalDateTime getHandledTime() {
+        return handledTime;
+    }
+
+    public void setHandledTime(LocalDateTime handledTime) {
+        this.handledTime = handledTime;
+    }
+}

huimv-employment/fe-dao/src/main/java/com/huimv/employment/dao/mapper/FeNotificationMapper.java

@@ -0,0 +1,9 @@
+package com.huimv.employment.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.employment.dao.entity.FeNotification;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FeNotificationMapper extends BaseMapper<FeNotification> {
+}

huimv-employment/fe-integration/src/main/java/com/huimv/employment/integration/kb/KbApiProperties.java

@@ -18,7 +18,7 @@ public class KbApiProperties {
 
     private int port = 9188;
 
-    /** 访问令牌（暂不需要；外网远程访问时再配置 fe.kb.api-key） */
+    /** 访问令牌；配置后上游请求带 Authorization: Bearer {apiKey} */
     private String apiKey = "";
 
     private String authHeaderName = "Authorization";

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/contract/ContractService.java

@@ -17,9 +17,11 @@ import com.huimv.employment.dao.mapper.FeWorkerRegistrationMapper;
 import com.huimv.employment.service.contract.dto.ContractItemResponse;
 import com.huimv.employment.service.contract.dto.ContractSummaryResponse;
 import com.huimv.employment.service.enterprise.EnterpriseService;
+import com.huimv.employment.service.order.EmploymentOrderService;
 import com.huimv.employment.service.worker.WorkerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +64,7 @@ public class ContractService {
     private final EnterpriseService enterpriseService;
     private final WorkerService workerService;
     private final ESignClient eSignClient;
+    private final EmploymentOrderService employmentOrderService;
 
     public ContractService(FeContractMapper feContractMapper,
                            FeEmploymentOrderMapper feEmploymentOrderMapper,
@@ -70,7 +73,8 @@ public class ContractService {
                            FeEnterpriseMapper feEnterpriseMapper,
                            EnterpriseService enterpriseService,
                            WorkerService workerService,
-                           ESignClient eSignClient) {
+                           ESignClient eSignClient,
+                           @Lazy EmploymentOrderService employmentOrderService) {
         this.feContractMapper = feContractMapper;
         this.feEmploymentOrderMapper = feEmploymentOrderMapper;
         this.feWorkerRegistrationMapper = feWorkerRegistrationMapper;
@@ -79,6 +83,7 @@ public class ContractService {
         this.enterpriseService = enterpriseService;
         this.workerService = workerService;
         this.eSignClient = eSignClient;
+        this.employmentOrderService = employmentOrderService;
     }
 
     /**
@@ -238,7 +243,8 @@ public class ContractService {
     /**
      * 临时工确认签署完成（Mock 电子签闭环；真实电子签可改为回调驱动）。
      * <p>将合同置为 {@code signed}，登记 {@code contract_signing → completed}。
-     * 订单不自动开工，须企业调用确认开工接口。</p>
+     * 当订单期望人数全部签署完成后，自动推进订单到 {@code work_started}；
+     * 未招满（缺编）不自动开工，仍须企业确认。</p>
      */
     @Transactional(rollbackFor = Exception.class)
     public ContractItemResponse confirmSign(Long userId, Long contractId) {
@@ -246,6 +252,7 @@ public class ContractService {
         FeContract contract = requireOwnedContract(worker.getId(), contractId);
 
         if (SIGN_SIGNED.equals(contract.getSignStatus())) {
+            employmentOrderService.tryAutoStartWorkWhenFullySigned(contract.getOrderId());
             return getMyContract(userId, contractId);
         }
         if (SIGN_VOIDED.equals(contract.getSignStatus())) {
@@ -263,8 +270,9 @@ public class ContractService {
         update.setUpdateTime(now);
         feContractMapper.updateById(update);
 
-        // 个人登记推进为 completed；订单不自动开工/结算，须企业另行确认
         markRegistrationCompleted(contract.getRegistrationId(), now);
+        // 期望人数齐签 → 自动进入开始用工
+        employmentOrderService.tryAutoStartWorkWhenFullySigned(contract.getOrderId());
         log.info("合同签署完成 contractId={} workerId={} registrationId={} orderId={}",
                 contract.getId(), worker.getId(), contract.getRegistrationId(), contract.getOrderId());
         return getMyContract(userId, contractId);
@@ -272,7 +280,6 @@ public class ContractService {
 
     /**
      * 签署完成后将登记从 {@code contract_signing} 置为 {@code completed}。
-     * <p>订单步骤不变：开工见 {@code EmploymentOrderService#startWork}，结算见 {@code SettlementService#startSettlement}。</p>
      */
     private void markRegistrationCompleted(Long registrationId, LocalDateTime now) {
         if (registrationId == null) {

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/notification/NotificationService.java

@@ -0,0 +1,226 @@
+package com.huimv.employment.service.notification;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.employment.dao.entity.FeEmploymentOrder;
+import com.huimv.employment.dao.entity.FeNotification;
+import com.huimv.employment.dao.entity.FeSettlementOrder;
+import com.huimv.employment.dao.mapper.FeNotificationMapper;
+import com.huimv.employment.service.notification.dto.NotificationItemResponse;
+import com.huimv.employment.service.notification.dto.NotificationPageResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 消息与待办中心：写入与查询 {@code fe_notification}。
+ */
+@Service
+public class NotificationService {
+
+    private static final Logger log = LoggerFactory.getLogger(NotificationService.class);
+
+    private static final String TYPE_PENDING = "pending";
+    private static final String CATEGORY_SETTLEMENT = "settlement";
+    private static final String BIZ_SETTLEMENT = "settlement";
+
+    private static final int MIN_PAGE = 1;
+    private static final int MIN_SIZE = 1;
+    private static final int MAX_SIZE = 100;
+    private static final int DEFAULT_SIZE = 20;
+
+    private final FeNotificationMapper feNotificationMapper;
+
+    public NotificationService(FeNotificationMapper feNotificationMapper) {
+        this.feNotificationMapper = feNotificationMapper;
+    }
+
+    /**
+     * 分页查询当前用户消息与待办（按 create_time 倒序）。
+     */
+    public NotificationPageResponse listByUser(Long userId,
+                                               String notifyType,
+                                               String category,
+                                               Boolean readFlag,
+                                               Boolean handledFlag,
+                                               Integer page,
+                                               Integer size) {
+        if (userId == null) {
+            NotificationPageResponse empty = new NotificationPageResponse();
+            empty.setItems(Collections.emptyList());
+            empty.setTotal(0);
+            empty.setPage(MIN_PAGE);
+            empty.setSize(DEFAULT_SIZE);
+            empty.setHasMore(false);
+            empty.setUnreadCount(0);
+            empty.setPendingCount(0);
+            return empty;
+        }
+
+        int resolvedPage = page == null || page < MIN_PAGE ? MIN_PAGE : page;
+        int resolvedSize = size == null || size < MIN_SIZE ? DEFAULT_SIZE : Math.min(size, MAX_SIZE);
+
+        LambdaQueryWrapper<FeNotification> wrapper = new LambdaQueryWrapper<FeNotification>()
+                .eq(FeNotification::getUserId, userId);
+        if (StringUtils.hasText(notifyType)) {
+            wrapper.eq(FeNotification::getNotifyType, notifyType.trim());
+        }
+        if (StringUtils.hasText(category)) {
+            wrapper.eq(FeNotification::getCategory, category.trim());
+        }
+        if (readFlag != null) {
+            wrapper.eq(FeNotification::getReadFlag, readFlag);
+        }
+        if (handledFlag != null) {
+            wrapper.eq(FeNotification::getHandledFlag, handledFlag);
+        }
+        wrapper.orderByDesc(FeNotification::getCreateTime).orderByDesc(FeNotification::getId);
+
+        Page<FeNotification> result = feNotificationMapper.selectPage(
+                new Page<>(resolvedPage, resolvedSize), wrapper);
+
+        NotificationPageResponse response = new NotificationPageResponse();
+        response.setItems(result.getRecords().stream().map(this::toItem).collect(Collectors.toList()));
+        response.setTotal(result.getTotal());
+        response.setPage(resolvedPage);
+        response.setSize(resolvedSize);
+        response.setHasMore((long) resolvedPage * resolvedSize < result.getTotal());
+        response.setUnreadCount(countUnread(userId));
+        response.setPendingCount(countPendingUnhandled(userId));
+        return response;
+    }
+
+    private long countUnread(Long userId) {
+        Long count = feNotificationMapper.selectCount(new LambdaQueryWrapper<FeNotification>()
+                .eq(FeNotification::getUserId, userId)
+                .eq(FeNotification::getReadFlag, Boolean.FALSE));
+        return count == null ? 0L : count;
+    }
+
+    private long countPendingUnhandled(Long userId) {
+        Long count = feNotificationMapper.selectCount(new LambdaQueryWrapper<FeNotification>()
+                .eq(FeNotification::getUserId, userId)
+                .eq(FeNotification::getNotifyType, TYPE_PENDING)
+                .eq(FeNotification::getHandledFlag, Boolean.FALSE));
+        return count == null ? 0L : count;
+    }
+
+    private NotificationItemResponse toItem(FeNotification n) {
+        NotificationItemResponse item = new NotificationItemResponse();
+        item.setId(n.getId());
+        item.setEnterpriseId(n.getEnterpriseId());
+        item.setNotifyType(n.getNotifyType());
+        item.setCategory(n.getCategory());
+        item.setTitle(n.getTitle());
+        item.setContent(n.getContent());
+        item.setBizType(n.getBizType());
+        item.setBizId(n.getBizId());
+        item.setBizNo(n.getBizNo());
+        item.setActionUrl(n.getActionUrl());
+        item.setReadFlag(n.getReadFlag());
+        item.setHandledFlag(n.getHandledFlag());
+        item.setCreateTime(n.getCreateTime());
+        item.setReadTime(n.getReadTime());
+        item.setHandledTime(n.getHandledTime());
+        return item;
+    }
+
+    /**
+     * 发起结算后推送「结算待确认」待办（幂等：同一结算单未办结待办已存在则不重复写）。
+     *
+     * @param recipientUserId 接收人；优先订单下单人，缺省为发起结算的企业用户
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void pushSettlementPendingConfirm(FeEmploymentOrder order,
+                                             FeSettlementOrder settlement,
+                                             Long recipientUserId) {
+        if (order == null || settlement == null || settlement.getId() == null) {
+            return;
+        }
+        if (findUnhandledSettlementTodo(settlement.getId()) != null) {
+            log.info("结算待确认待办已存在，跳过重复推送 settlementId={}", settlement.getId());
+            return;
+        }
+
+        Long userId = recipientUserId;
+        if (userId == null && order.getUserId() != null) {
+            userId = order.getUserId();
+        }
+
+        String orderTitle = StringUtils.hasText(order.getTitle()) ? order.getTitle().trim() : "用工订单";
+        String settlementNo = settlement.getSettlementNo() != null ? settlement.getSettlementNo() : "";
+        int workerCount = settlement.getWorkerCount() != null ? settlement.getWorkerCount() : 0;
+        BigDecimal total = settlement.getTotalOutflow() != null ? settlement.getTotalOutflow() : BigDecimal.ZERO;
+
+        FeNotification n = new FeNotification();
+        n.setEnterpriseId(order.getEnterpriseId());
+        n.setUserId(userId);
+        n.setNotifyType(TYPE_PENDING);
+        n.setCategory(CATEGORY_SETTLEMENT);
+        n.setTitle("结算待确认");
+        n.setContent(String.format("%s（%s）已生成结算单，共 %d 人，应付 ¥%s，请确认并支付。",
+                orderTitle,
+                StringUtils.hasText(order.getOrderNo()) ? order.getOrderNo() : ("#" + order.getId()),
+                workerCount,
+                total.toPlainString()));
+        n.setBizType(BIZ_SETTLEMENT);
+        n.setBizId(settlement.getId());
+        n.setBizNo(settlementNo);
+        n.setActionUrl("/packageA/home/index?open=settlement&order_id=" + order.getId()
+                + "&settlement_id=" + settlement.getId());
+        n.setReadFlag(Boolean.FALSE);
+        n.setHandledFlag(Boolean.FALSE);
+        n.setCreateTime(LocalDateTime.now());
+        feNotificationMapper.insert(n);
+        log.info("已推送结算待确认待办 notificationId={} settlementId={} userId={} enterpriseId={}",
+                n.getId(), settlement.getId(), userId, order.getEnterpriseId());
+    }
+
+    /**
+     * 结算确认支付后，将对应「结算待确认」待办标记为已处理。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void markSettlementTodoHandled(Long settlementId) {
+        if (settlementId == null) {
+            return;
+        }
+        List<FeNotification> list = feNotificationMapper.selectList(
+                new LambdaQueryWrapper<FeNotification>()
+                        .eq(FeNotification::getBizType, BIZ_SETTLEMENT)
+                        .eq(FeNotification::getBizId, settlementId)
+                        .eq(FeNotification::getHandledFlag, Boolean.FALSE));
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        LocalDateTime now = LocalDateTime.now();
+        for (FeNotification n : list) {
+            FeNotification update = new FeNotification();
+            update.setId(n.getId());
+            update.setHandledFlag(Boolean.TRUE);
+            update.setHandledTime(now);
+            if (!Boolean.TRUE.equals(n.getReadFlag())) {
+                update.setReadFlag(Boolean.TRUE);
+                update.setReadTime(now);
+            }
+            feNotificationMapper.updateById(update);
+        }
+        log.info("结算待办已标记处理 settlementId={} count={}", settlementId, list.size());
+    }
+
+    private FeNotification findUnhandledSettlementTodo(Long settlementId) {
+        return feNotificationMapper.selectOne(new LambdaQueryWrapper<FeNotification>()
+                .eq(FeNotification::getBizType, BIZ_SETTLEMENT)
+                .eq(FeNotification::getBizId, settlementId)
+                .eq(FeNotification::getHandledFlag, Boolean.FALSE)
+                .orderByDesc(FeNotification::getId)
+                .last("LIMIT 1"));
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/notification/dto/NotificationItemResponse.java

@@ -0,0 +1,177 @@
+package com.huimv.employment.service.notification.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "消息与待办列表项")
+public class NotificationItemResponse {
+
+    @JsonProperty("id")
+    private Long id;
+
+    @JsonProperty("enterprise_id")
+    private Long enterpriseId;
+
+    @JsonProperty("notify_type")
+    @Schema(description = "pending / error / info / success", example = "pending")
+    private String notifyType;
+
+    @JsonProperty("category")
+    @Schema(description = "settlement / registration / verify / workflow", example = "settlement")
+    private String category;
+
+    @JsonProperty("title")
+    private String title;
+
+    @JsonProperty("content")
+    private String content;
+
+    @JsonProperty("biz_type")
+    private String bizType;
+
+    @JsonProperty("biz_id")
+    private Long bizId;
+
+    @JsonProperty("biz_no")
+    private String bizNo;
+
+    @JsonProperty("action_url")
+    private String actionUrl;
+
+    @JsonProperty("read_flag")
+    private Boolean readFlag;
+
+    @JsonProperty("handled_flag")
+    private Boolean handledFlag;
+
+    @JsonProperty("create_time")
+    private LocalDateTime createTime;
+
+    @JsonProperty("read_time")
+    private LocalDateTime readTime;
+
+    @JsonProperty("handled_time")
+    private LocalDateTime handledTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getNotifyType() {
+        return notifyType;
+    }
+
+    public void setNotifyType(String notifyType) {
+        this.notifyType = notifyType;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(String bizType) {
+        this.bizType = bizType;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public String getBizNo() {
+        return bizNo;
+    }
+
+    public void setBizNo(String bizNo) {
+        this.bizNo = bizNo;
+    }
+
+    public String getActionUrl() {
+        return actionUrl;
+    }
+
+    public void setActionUrl(String actionUrl) {
+        this.actionUrl = actionUrl;
+    }
+
+    public Boolean getReadFlag() {
+        return readFlag;
+    }
+
+    public void setReadFlag(Boolean readFlag) {
+        this.readFlag = readFlag;
+    }
+
+    public Boolean getHandledFlag() {
+        return handledFlag;
+    }
+
+    public void setHandledFlag(Boolean handledFlag) {
+        this.handledFlag = handledFlag;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public LocalDateTime getReadTime() {
+        return readTime;
+    }
+
+    public void setReadTime(LocalDateTime readTime) {
+        this.readTime = readTime;
+    }
+
+    public LocalDateTime getHandledTime() {
+        return handledTime;
+    }
+
+    public void setHandledTime(LocalDateTime handledTime) {
+        this.handledTime = handledTime;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/notification/dto/NotificationPageResponse.java

@@ -0,0 +1,89 @@
+package com.huimv.employment.service.notification.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.List;
+
+@Schema(description = "消息与待办分页结果")
+public class NotificationPageResponse {
+
+    @JsonProperty("items")
+    private List<NotificationItemResponse> items;
+
+    @JsonProperty("total")
+    private long total;
+
+    @JsonProperty("page")
+    private int page;
+
+    @JsonProperty("size")
+    private int size;
+
+    @JsonProperty("has_more")
+    private boolean hasMore;
+
+    @JsonProperty("unread_count")
+    @Schema(description = "当前用户未读总数（不受本页筛选影响）")
+    private long unreadCount;
+
+    @JsonProperty("pending_count")
+    @Schema(description = "当前用户未办结待办数（notify_type=pending 且 handled_flag=false）")
+    private long pendingCount;
+
+    public List<NotificationItemResponse> getItems() {
+        return items;
+    }
+
+    public void setItems(List<NotificationItemResponse> items) {
+        this.items = items;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public boolean isHasMore() {
+        return hasMore;
+    }
+
+    public void setHasMore(boolean hasMore) {
+        this.hasMore = hasMore;
+    }
+
+    public long getUnreadCount() {
+        return unreadCount;
+    }
+
+    public void setUnreadCount(long unreadCount) {
+        this.unreadCount = unreadCount;
+    }
+
+    public long getPendingCount() {
+        return pendingCount;
+    }
+
+    public void setPendingCount(long pendingCount) {
+        this.pendingCount = pendingCount;
+    }
+}

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

@@ -17,6 +17,8 @@ import com.huimv.employment.service.enterprise.EnterpriseService;
 import com.huimv.employment.service.order.dto.EmploymentOrderItemResponse;
 import com.huimv.employment.service.order.dto.OrderStartWorkRequest;
 import com.huimv.employment.service.order.dto.OrderStartWorkResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -30,12 +32,15 @@ import java.util.List;
  * 企业端用工订单：会话下订单列表、开工就绪查询与确认开工。
  * <p>
  * 确认开工规则：已过审工人须全部签完合同；已签人数 &lt; 计划人数时须显式缺编确认；
- * 成功后订单 {@code contract_signing → work_started}。齐签不自动开工。
+ * 成功后订单 {@code contract_signing → work_started}。
+ * 期望人数全部签署完成后会自动进入开始用工；缺编须企业手动确认。
  * </p>
  */
 @Service
 public class EmploymentOrderService {
 
+    private static final Logger log = LoggerFactory.getLogger(EmploymentOrderService.class);
+
     /** 订单步骤：合同签署中（可确认开工的前置步骤） */
     private static final String STEP_CONTRACT_SIGNING = "contract_signing";
     /** 订单步骤：开始用工 */
@@ -175,6 +180,55 @@ public class EmploymentOrderService {
         return result;
     }
 
+    /**
+     * 合同签署后尝试自动进入「开始用工」。
+     * <p>条件：订单处于 {@code contract_signing}；已过审工人全部已签；
+     * 已签人数 ≥ 计划人数（招满）。缺编不自动推进，仍须企业 {@link #startWork}。</p>
+     *
+     * @return true 表示本次已自动推进到 {@code work_started}
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean tryAutoStartWorkWhenFullySigned(Long orderId) {
+        if (orderId == null) {
+            return false;
+        }
+        FeEmploymentOrder order = feEmploymentOrderMapper.selectById(orderId);
+        if (order == null) {
+            return false;
+        }
+        if (STEP_WORK_STARTED.equals(order.getCurrentStepCode())
+                || isStepAfter(order.getCurrentStepCode(), STEP_WORK_STARTED)) {
+            return false;
+        }
+        if (!STEP_CONTRACT_SIGNING.equals(order.getCurrentStepCode())) {
+            return false;
+        }
+
+        OrderStartWorkResponse status = buildStartWorkStatus(order, true);
+        if (status.getApprovedCount() == null || status.getApprovedCount() <= 0) {
+            return false;
+        }
+        if (!Boolean.TRUE.equals(status.getAllApprovedSigned())) {
+            return false;
+        }
+        // 未招满：不自动开工，留给企业缺编确认
+        if (Boolean.TRUE.equals(status.getUnderstaffed())) {
+            log.info("已齐签但未达期望人数，不自动开工 orderId={} signed={}/{}",
+                    orderId, status.getSignedCount(), status.getPlannedCount());
+            return false;
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        FeEmploymentOrder update = new FeEmploymentOrder();
+        update.setId(order.getId());
+        update.setCurrentStepCode(STEP_WORK_STARTED);
+        update.setUpdateTime(now);
+        feEmploymentOrderMapper.updateById(update);
+        log.info("期望用工人员均已签署，自动进入开始用工 orderId={} signed={}/{}",
+                orderId, status.getSignedCount(), status.getPlannedCount());
+        return true;
+    }
+
     /** 校验企业身份且订单归属当前企业。 */
     private FeEmploymentOrder requireOwnedOrder(Long userId, Long orderId) {
         enterpriseService.requireEnterpriseUser(userId);

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

@@ -23,6 +23,7 @@ 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.enterprise.EnterpriseService;
+import com.huimv.employment.service.notification.NotificationService;
 import com.huimv.employment.service.order.dto.OrderCompleteRequest;
 import com.huimv.employment.service.order.dto.OrderCompleteResponse;
 import com.huimv.employment.service.settlement.dto.OrderStartSettlementRequest;
@@ -104,6 +105,7 @@ public class SettlementService {
     private final FeDraftCostSnapshotMapper feDraftCostSnapshotMapper;
     private final FeServicePlanMapper feServicePlanMapper;
     private final EnterpriseService enterpriseService;
+    private final NotificationService notificationService;
 
     public SettlementService(FeSettlementOrderMapper feSettlementOrderMapper,
                              FeSettlementItemMapper feSettlementItemMapper,
@@ -114,7 +116,8 @@ public class SettlementService {
                              FeWorkerRegistrationMapper feWorkerRegistrationMapper,
                              FeDraftCostSnapshotMapper feDraftCostSnapshotMapper,
                              FeServicePlanMapper feServicePlanMapper,
-                             EnterpriseService enterpriseService) {
+                             EnterpriseService enterpriseService,
+                             NotificationService notificationService) {
         this.feSettlementOrderMapper = feSettlementOrderMapper;
         this.feSettlementItemMapper = feSettlementItemMapper;
         this.feSettlementFeeMapper = feSettlementFeeMapper;
@@ -125,6 +128,7 @@ public class SettlementService {
         this.feDraftCostSnapshotMapper = feDraftCostSnapshotMapper;
         this.feServicePlanMapper = feServicePlanMapper;
         this.enterpriseService = enterpriseService;
+        this.notificationService = notificationService;
     }
 
     /**
@@ -151,10 +155,12 @@ public class SettlementService {
     public SettlementSummaryResponse startSettlement(Long userId, Long orderId, OrderStartSettlementRequest request) {
         FeEmploymentOrder order = requireOwnedOrder(userId, orderId);
 
-        // 幂等：重复发起不新建结算单
+        // 幂等：重复发起不新建结算单；仍确保有「结算待确认」待办
         FeSettlementOrder existing = findActiveByOrderId(orderId);
         if (existing != null) {
             ensureOrderAtSettlementPending(order, LocalDateTime.now());
+            Long recipient = order.getUserId() != null ? order.getUserId() : userId;
+            notificationService.pushSettlementPendingConfirm(order, existing, recipient);
             return toSummary(order, existing, false, "结算单已存在");
         }
 
@@ -246,6 +252,10 @@ public class SettlementService {
         order.setCurrentStepCode(STEP_SETTLEMENT_PENDING);
         order.setOrderStatus(ORDER_STATUS_SETTLING);
 
+        // 5) 消息与待办中心：结算待确认
+        Long recipient = order.getUserId() != null ? order.getUserId() : userId;
+        notificationService.pushSettlementPendingConfirm(order, settlement, recipient);
+
         log.info("发起结算成功 orderId={} settlementId={} settlementNo={} workers={}",
                 orderId, settlement.getId(), settlement.getSettlementNo(), workers.size());
 
@@ -358,6 +368,9 @@ public class SettlementService {
         order.setCurrentStepCode(STEP_SETTLEMENT_PAID);
         order.setOrderStatus(ORDER_STATUS_PAID);
 
+        // 5) 关闭「结算待确认」待办
+        notificationService.markSettlementTodoHandled(settlement.getId());
+
         log.info("结算确认支付成功 orderId={} settlementId={} paymentNo={} channel={} amount={}",
                 orderId, settlement.getId(), payment.getPaymentNo(), channel, payAmount);
         return toSummary(order, settlement, false, "结算已确认并支付成功");