diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java index 31628c8c..652a71e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java @@ -40,11 +40,12 @@ public class ProcessFbStandardConsultationController extends JeroController> queryProcessInfoVO(String draftId, String processInstanceId){ - ProcessInfoVO processInfoVO = processFbStandardConsultationService.queryProcessInfoVO(draftId, processInstanceId); + public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){ + ProcessInfoVO processInfoVO = processFbStandardConsultationService.queryProcessInfoVO(draftId, processInstanceId, taskId); return Result.OK(processInfoVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java index ec55bf67..2fce12e4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java @@ -73,6 +73,10 @@ public class ProcessFbStandardConsultation implements Serializable { @Excel(name = "标准文本", width = 15) @ApiModelProperty(value = "标准文本") private java.lang.String standardText; + /**标准文本文件*/ + @Excel(name = "标准文本文件", width = 15) + @ApiModelProperty(value = "标准文本文件") + private java.lang.String standardTextFileId; /**相关文件*/ @Excel(name = "相关文件", width = 15) @ApiModelProperty(value = "相关文件") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java index d2a31c81..5607e489 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java @@ -53,5 +53,5 @@ public interface IProcessFbStandardConsultationService extends IService queryProcessInfoVO(String draftId, String processInstanceId); + ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index a4e3bc79..174a6d20 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -140,7 +140,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId) { + public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); ProcessFbStandardConsultationVO processFbStandardConsultationVO = new ProcessFbStandardConsultationVO();