新增了放心签111

sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/FxqTask.java

@@ -85,4 +85,30 @@ public class FxqTask extends Base {
 
         return result;
     }
+
+    /**
+     * 获取签署链接
+     */
+    public GetTaskLinkResponse getTaskDetail(String taskNo, String unionId){
+        String url = getClientUrl() + "sign/task/detail";
+
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("taskNo", taskNo); // 签署任务编号，创建签署任务时生成
+        requestData.put("unionId", unionId); // 个人/企业在放心签平台的唯一性标识（签署方账号）
+
+        String jsonBody = JSONUtil.toJsonStr(requestData);
+        log.info("获取app数据参数:{}",jsonBody);
+
+        String response =  postJson(url,jsonBody,null);
+        GetTaskLinkResponse result = JSONUtil.toBean(response, GetTaskLinkResponse.class);
+        if (result.getCode() != 10000){
+            if (!Objects.equals(result.getMessage(), "")){
+                throw new BusinessException(result.getMessage());
+            }else{
+                throw new BusinessException("失败");
+            }
+        }
+
+        return result;
+    }
 }

sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/GetTaskDetailResponse.java

@@ -0,0 +1,54 @@
+package net.lab1024.sa.admin.extend.fangxinqian.task;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetTaskDetailResponse {
+    private int code;
+
+    private String message;
+
+    private GetTaskDetailData data;
+
+    private String requestId;
+
+    /**
+     *  详细数据
+     */
+    @Data
+    public static class GetTaskDetailData {
+
+        /**
+         * 签署详情
+         */
+        private List<contractsData> contracts;
+
+        /**
+         * 签署任务编号，创建签署任务时接口返回
+         */
+        private String taskNo;
+
+        /**
+         * 签署任务状态：
+         * -30：已过期
+         * -20：已撤销
+         * -10：已拒签
+         * 0：发起签署
+         * 5：待编辑
+         * 10：待签署
+         * 20：已完成
+         */
+        private Integer taskStatus;
+    }
+
+    /**
+     * 详细数据-合同文件信息
+     */
+    @Data
+    public static class contractsData {
+
+    }
+}

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java

@@ -87,7 +87,7 @@ public class ExpertFxqController {
         GetExpertSignVo g = new GetExpertSignVo();
         g.setTaskStatus(2);
 
-        // 获取协议签署情况
+        // 获取签署任务数据
         LambdaQueryWrapper<FxqExpertTaskEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(FxqExpertTaskEntity::getExpertId, expertId);
         FxqExpertTaskEntity fxqExpertTask = fxqExpertTaskDao.selectOne(queryWrapper);
@@ -97,9 +97,12 @@ public class ExpertFxqController {
 
         if (fxqExpertTask.getTaskStatus() == 20){
             g.setTaskStatus(1);
-            g.setTaskFileUrl(fxqExpertTask.getTaskFileUrl());
+            g.setTaskFileUrl(fxqExpertTask.getTaskLink());
         }
 
+        // 获取协议签署情况
+
+
         return ResponseDTO.app_ok(g);
     }
 

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertSignController.java

@@ -31,7 +31,6 @@ public class ExpertSignController {
 
     /**
      * 获取专家 签名
-     * @return
      */
     @ApiOperation(value = "获取专家 签名")
     @GetMapping("/user/getSign")

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqExpertTaskEntity.java

@@ -60,8 +60,8 @@ public class FxqExpertTaskEntity {
     /**
      * 签署协议的预览地址（只有签署成功后才存在）
      */
-    @TableField("task_file_url")
+    @TableField("task_link")
-    private String taskFileUrl;
+    private String taskLink;
 
     /**
      * 创建时间

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java

@@ -302,6 +302,7 @@ public class ExpertFxqService {
                 // 已完成
                 if (fxqExpertTask.getTaskStatus() == 20) {
                     g.setTaskStatus(1);
+                    g.setLinkUrl(fxqExpertTask.getTaskLink());
                     return g;
                 }