From aa3d6d91cf67bd68ba60f05ae455ffa0cbbf7666 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 8 Jul 2025 11:14:55 +0800
Subject: [PATCH] 66666

---
 .../controller/ExpertFxqController.java       | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java
index 72873fe..6cea761 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java
@@ -148,8 +148,29 @@ public class ExpertFxqController {
         signQueryWrapper.eq(FxqSignEntity::getExpertId,expertId);
         signQueryWrapper.last("LIMIT 1");
         FxqSignEntity fxqSign = fxqSignDao.selectOne(signQueryWrapper);
-        if (fxqSign != null && fxqSign.getSignStatus() == 1) {
-            return ResponseDTO.userErrorParam("您已签订协议，无需再次签订");
+        if (fxqSign != null) {
+            if (fxqSign.getSignStatus() == 1) {
+                return ResponseDTO.userErrorParam("您已签订协议，无需再次签订");
+            }
+
+            // 其余状态下去查询签署任务详情获取状态
+            // 签署任务详情查询
+            FxqExpertTaskEntity fxqExpertTask = expertFxqService.getTaskDetail(fxqSign.getTaskId());
+            if (fxqExpertTask != null) {
+                if (Objects.equals(fxqExpertTask.getTaskStatus(), "20")) {
+                    // 已签署
+                    return ResponseDTO.userErrorParam("您已签订协议，无需再次签订");
+                }
+
+                if (Objects.equals(fxqExpertTask.getTaskStatus(), "10")) {
+                    AddFxqVo g = new AddFxqVo();
+                    g.setTaskStatus(2);
+                    g.setLinkUrl(fxqSign.getSignLinkH5());
+                    return ResponseDTO.app_ok(g);
+                }
+            }
+
+
         }
 
         // 获取企业放心签实名认证数据
@@ -158,14 +179,6 @@ public class ExpertFxqController {
         // 获取个人放心签实名认证数据
         FxqUserEntity fxqUser = expertFxqService.getPersonal(expertId);
 
-        // 签署任务详情查询
-        FxqExpertTaskEntity fxqExpertTask = expertFxqService.getTaskDetail(expertId);
-        if (fxqExpertTask != null) {
-            if (Objects.equals(fxqExpertTask.getTaskStatus(), "20")) {
-                // 已签署
-                return ResponseDTO.userErrorParam("您已签订协议，无需再次签订");
-            }
-        }
 
         // 获取签署的模版数据
         FxqTemplateEntity fxqTemplate = expertFxqService.getTemplate(company.getId());