From c9708f03f58414014cb463f93ee52c186597ad0e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 23:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 2 ++ .../workFlowFeignClientImpl.java | 4 +++ .../controller/WorkFlowController.java | 6 +++++ .../workFlow/entity/BusProcessModelHis.java | 27 ------------------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index f1ef1500..c67ed07e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -481,4 +481,6 @@ public interface workFlowFeignClient { List deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET) String selectAskId(@RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessModel/selectOnlineFile",method = RequestMethod.POST) + List selectOnlineFile(@RequestParam("taskId") String taskId); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 9b46d828..125e8ea5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -434,4 +434,8 @@ public class workFlowFeignClientImpl { public String selectAskId(@RequestParam("taskId") String taskId) { return workFlowFeignClient.selectAskId(taskId); } + + public List selectOnlineFile(@RequestParam("taskId") String taskId) { + return workFlowFeignClient.selectOnlineFile(taskId); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 30cc6c3b..60587887 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -990,4 +990,10 @@ public class WorkFlowController { return workFlowFeignClient.selectAskId(taskId); } + @ApiOperation(value = "查找在线编辑文件") + @GetMapping("/selectOnlineFile") + public List selectOnlineFile(@RequestParam("taskId") String taskId) { + return workFlowFeignClient.selectOnlineFile(taskId); + } + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java index 3435eca4..144dfb47 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -21,69 +21,42 @@ import java.io.Serializable; * @since 2021-09-17 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") public class BusProcessModelHis implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "主键") - @TableId(value = "ID", type = IdType.UUID) private String id; - @ApiModelProperty(value = "标准id") - @TableField("STAND_ID") private String standId; - @ApiModelProperty(value = "处理人") - @TableField("USER_ID") private String userId; - @ApiModelProperty(value = "信息") - @TableField("MESG") private String mesg; - @ApiModelProperty(value = "节点信息") - @TableField("TASK_INFO") private String taskInfo; - @ApiModelProperty(value = "任务id") - @TableField("TASK_ID") private String taskId; - @ApiModelProperty(value = "流程实例id") - @TableField("P_ID") private String pId; - @ApiModelProperty(value = "流程名称") - @TableField("PRC_NAME") private String prcName; - @ApiModelProperty(value = "创建时间") - @TableField("CREATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; - @ApiModelProperty(value = "更新时间") - @TableField("UPDATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") - @TableField("EDIT_STATUS") private String editStatus; @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") - @TableField("EDIT_FILE_PATH") private String editFilePath; @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") - @TableField("EDIT_TYPE") private String editType; @ApiModelProperty(value = "逻辑状态") - @TableField("FLAG") private String flag; @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")