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 cb3af1b..b9893d8 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 @@ -105,7 +105,7 @@ public class ExpertFxqController { // 已签署 if (fxqSign.getSignStatus() == 1) { g.setTaskStatus(1); - g.setTaskFileUrl(fxqSign.getSignLink()); + g.setTaskFileUrl(fxqSign.getSignLinkH5()); return ResponseDTO.app_ok(g); } @@ -118,7 +118,7 @@ public class ExpertFxqController { // 已签署 if (Objects.equals(fxqExpertTask.getTaskStatus(), "20")) { g.setTaskStatus(1); - g.setTaskFileUrl(fxqExpertTask.getTaskLink()); + g.setTaskFileUrl(fxqExpertTask.getTaskLinkH5()); return ResponseDTO.app_ok(g); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqExpertTaskEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqExpertTaskEntity.java index d715e2b..3190f8a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqExpertTaskEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqExpertTaskEntity.java @@ -64,10 +64,16 @@ public class FxqExpertTaskEntity { private LocalDateTime signTime; /** - * 签署协议的预览地址（只有签署成功后才存在） + * 协议地址-h5 */ - @TableField("task_link") - private String taskLink; + @TableField("task_link_h5") + private String taskLinkH5; + + /** + * 协议地址-pc + */ + @TableField("task_link_pc") + private String taskLinkPc; /** * 创建时间 diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqSignEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqSignEntity.java index 1fa02df..6ebbda3 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqSignEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/domain/entity/FxqSignEntity.java @@ -39,10 +39,16 @@ public class FxqSignEntity { private Integer signStatus; /** - * 协议地址 + * 协议地址-h5 */ - @TableField("sign_link") - private String signLink; + @TableField("sign_link_h5") + private String signLinkH5; + + /** + * 协议地址-pc + */ + @TableField("sign_link_pc") + private String signLinkPc; /** * 创建时间 diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java index 448182e..624aa18 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java @@ -378,7 +378,8 @@ public class ExpertFxqService { fxqExpertTaskData.setTemplateId(fxqTemplate.getId()); fxqExpertTaskData.setTaskStatus("10"); fxqExpertTaskData.setSignStatus(2); - fxqExpertTaskData.setTaskLink(fxqLink.getSignH5Url()); + fxqExpertTaskData.setTaskLinkH5(fxqLink.getSignH5Url()); + fxqExpertTaskData.setTaskLinkPc(fxqLink.getSignPCUrl()); fxqExpertTaskData.setCreateTime(LocalDateTime.now()); int res = fxqExpertTaskDao.insert(fxqExpertTaskData); if (res <= 0){ @@ -390,7 +391,8 @@ public class ExpertFxqService { fxqSignData.setExpertId(fxqUser.getExpertId()); fxqSignData.setTaskId(fxqExpertTaskData.getId()); fxqSignData.setSignStatus(2); - fxqSignData.setSignLink(fxqLink.getSignH5Url()); + fxqSignData.setSignLinkH5(fxqLink.getSignH5Url()); + fxqSignData.setSignLinkPc(fxqLink.getSignPCUrl()); fxqSignData.setCreateTime(LocalDateTime.now()); res = fxqSignDao.insert(fxqSignData); if (res <= 0){ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java index 8ed141d..f9e0a1c 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java @@ -38,7 +38,6 @@ public class CaseplatformCaseQueryForm extends PageParam{ @CheckEnum(value = CaseStatusEnum.class, message = "0待审核 1审核通过 2审核不通过 错误") private Integer status; - @ApiModelProperty(value = "审核时间") private List examineTime; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java index 7764d5a..fd296a7 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java @@ -69,11 +69,8 @@ public class CaseplatformCaseVO { private LocalDateTime updateTime; @ApiModelProperty(value = "签署状态（1:已签署 2:未签署）") - private String signStatus; + private Integer signStatus = 2; @ApiModelProperty(value = "协议地址") - private String signLink; - - @ApiModelProperty(value = "签署完成时间") - private LocalDateTime signTime; + private String signLinkPc = ""; } \ No newline at end of file diff --git a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml index a7255cc..bf60e46 100644 --- a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml @@ -11,11 +11,11 @@ (select name from t_area where id=t_caseplatform_expert.city_id) expertCityName, t_caseplatform_expert.hospital_name expertHospitalName, t_caseplatform_fxq_sign.sign_status signStatus, - t_caseplatform_fxq_sign.sign_link signLink + t_caseplatform_fxq_sign.sign_link_pc signLinkPc FROM t_caseplatform_case left join t_caseplatform_user on t_caseplatform_case.user_id = t_caseplatform_user.id left join t_caseplatform_expert on t_caseplatform_case.expert_id = t_caseplatform_expert.id - left join t_caseplatform_fxq_sign on t_caseplatform_fxq_sign.expert_id = t_caseplatform_expert.id + left join t_caseplatform_fxq_sign on t_caseplatform_fxq_sign.expert_id = t_caseplatform_case.expert_id @@ -73,9 +73,13 @@ (select name from t_area where id=t_caseplatform_expert.prov_id) expertProvName, (select name from t_area where id=t_caseplatform_expert.city_id) expertCityName, t_caseplatform_expert.name expertName,t_caseplatform_expert.hospital_name expertHospitalName + t_caseplatform_fxq_sign.sign_status signStatus, + t_caseplatform_fxq_sign.sign_link_pc signLinkPc FROM t_caseplatform_case left join t_caseplatform_user on t_caseplatform_case.user_id = t_caseplatform_user.id left join t_caseplatform_expert on t_caseplatform_case.expert_id = t_caseplatform_expert.id + left join t_caseplatform_fxq_sign on t_caseplatform_fxq_sign.expert_id = t_caseplatform_case.expert_id + @@ -116,6 +120,10 @@ AND t_caseplatform_expert.hospital_uuid =#{queryForm.hospitalUuid} + + + AND t_caseplatform_case.examine_time BETWEEN #{queryForm.examineTime[0]} AND #{queryForm.examineTime[1]} +