放心签新增了签署状态

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/dao/FxqSignDao.java

@@ -0,0 +1,13 @@
+package net.lab1024.sa.admin.module.app.expert.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqCompanyEntity;
+import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqSignEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface FxqSignDao extends BaseMapper<FxqSignEntity> {
+
+}

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

@@ -51,6 +51,12 @@ public class FxqExpertTaskEntity {
     @TableField("task_status")
     private String taskStatus;
 
+    /**
+     * 签署状态（1:已签署 2:未签署）
+     */
+    @TableField("sign_status")
+    private Integer signStatus;
+
     /**
      * 签署完成时间
      */

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

@@ -0,0 +1,52 @@
+package net.lab1024.sa.admin.module.app.expert.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 病例-放心签-签署实体类
+ */
+@TableName("`t_caseplatform_fxq_sign`")
+@Data
+public class FxqSignEntity {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 专家id
+     */
+    @TableField("expert_id")
+    private Long expertId;
+
+    /**
+     * 任务编号
+     */
+    @TableField("task_id")
+    private Long taskId;
+
+    /**
+     * 签署状态（1:已签署 2:未签署）
+     */
+    @TableField("sign_status")
+    private Integer signStatus;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/vo/FxqExpertTaskVo.java

@@ -26,6 +26,9 @@ public class FxqExpertTaskVo {
     @ApiModelProperty(value = "签署任务状态：-30已过期，-20已撤销，-10已拒签，0发起签署，5待编辑，10待签署，20已完成")
     private Integer taskStatus;
 
+    @ApiModelProperty(value = "签署状态（1:已签署 2:未签署）")
+    private String signStatus;
+
     @ApiModelProperty(value = "签署完成时间")
     private LocalDateTime signTime;
 

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

@@ -38,6 +38,9 @@ public class ExpertFxqService {
     @Resource
     private FxqUserDao fxqUserDao;
 
+    @Resource
+    private FxqSignDao fxqSignDao;
+
     @Resource
     private Company company;
 
@@ -368,12 +371,13 @@ public class ExpertFxqService {
                 throw new BusinessException("签署状态错误");
             }
 
-            // 添加数据库
+            // 添加数据库-签署任务
             FxqExpertTaskEntity fxqExpertTaskData = new FxqExpertTaskEntity();
             fxqExpertTaskData.setExpertId(fxqUser.getExpertId());
             fxqExpertTaskData.setTaskNo(templateTask.getData().getTaskNo());
             fxqExpertTaskData.setTemplateId(fxqTemplate.getId());
             fxqExpertTaskData.setTaskStatus("10");
+            fxqExpertTaskData.setSignStatus(2);
             fxqExpertTaskData.setTaskLink(fxqLink.getSignH5Url());
             fxqExpertTaskData.setCreateTime(LocalDateTime.now());
             int res = fxqExpertTaskDao.insert(fxqExpertTaskData);
@@ -435,8 +439,12 @@ public class ExpertFxqService {
             throw new BusinessException("操作失败");
         }
 
-        // 修改状态
+        // 修改状态-签署任务
         fxqExpertTask.setTaskStatus(String.valueOf(taskLink.getData().getTaskStatus()));
+        if (taskLink.getData().getTaskStatus() == 20){
+            fxqExpertTask.setSignStatus(1);
+        }
+
         fxqExpertTaskDao.updateById(fxqExpertTask);
 
         return fxqExpertTask;