查询已签署协议接口

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysUserContractRecordController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.teacher.controller;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.ContractTemplate;
+import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
 import com.yonge.cooleshow.biz.dal.service.ContractService;
 import com.yonge.cooleshow.biz.dal.service.ContractTemplateService;
 import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
@@ -80,6 +81,26 @@ public class SysUserContractRecordController extends BaseController {
         return contractService.queryProductContract(user.getId(),SysUserType.TEACHER,contractType);
     }
 
+
+    @ApiOperation("查看协议-获取协议内容")
+    @GetMapping(value = "/querySignContract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public HttpResponseResult<String> querySignContract(
+        @ApiParam(value = "协议类型", required = true) @RequestParam("contractType") ContractTemplateTypeEnum contractType) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        SysUserContractRecord sysUserContractRecord = sysUserContractRecordService.queryLatestContract(user.getId(), SysUserType.TEACHER, contractType);
+        if (sysUserContractRecord == null) {
+            return failed(HttpStatus.FORBIDDEN, "请先签署协议");
+        }
+        if ("DOING".equals(sysUserContractRecord.getStatus())) {
+            return failed(HttpStatus.FORBIDDEN, "协议签署中");
+        }
+        return HttpResponseResult.succeed(sysUserContractRecord.getUrl());
+    }
+
+
     @ApiOperation("签署协议")
     @GetMapping(value = "/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public HttpResponseResult<Boolean> sign(

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysUserContractRecord.java

@@ -43,7 +43,7 @@ public class SysUserContractRecord implements Serializable {
     private String contractNo;
 
     @TableField("status_")
-    @ApiModelProperty(value = "签署状态 NOT_SIGN 未签署  DONG 签署中 SUCCESS 签署完成 FAILED 签署失败")
+    @ApiModelProperty(value = "签署状态 NOT_SIGN 未签署  DOING 签署中 SUCCESS 签署完成 FAILED 签署失败")
     private String status;
 
     @TableField("err_msg_")

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserContractRecordMapper.xml

@@ -103,7 +103,7 @@
             group by source_,type_
         ) a
         left join contract_template b on a.source_ = b.source_ and a.type_ = b.type_ and a.version_ = b.version_
-        left join sys_user_contract_record t on b.id_ = t.contract_id_ and t.status_ in ('SUCCESS','DONG ')
+        left join sys_user_contract_record t on b.id_ = t.contract_id_ and t.status_ in ('SUCCESS','DOING ')
         where t.user_id_ = #{userId} and t.user_type_ = #{userType}
     </select>