Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, buss process

See merge request LiuChao/foton-slrs-system-rest!280

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -4,6 +4,7 @@ import com.adc.da.common.*;
 import com.adc.da.common.Category;
 import com.adc.da.common.Page;
 import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
+import com.adc.da.workFlow.entity.BusProcessModelHis;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,9 @@ import java.util.Set;
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
+    @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET)
+    BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId);
+
     @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET)
     List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
 

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -9,6 +9,7 @@ import com.adc.da.common.Page;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
+import com.adc.da.workFlow.entity.BusProcessModelHis;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +27,11 @@ public class workFlowFeignClientImpl {
     @Autowired
     private IUserEOService userEOService;
 
+    public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
+        BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId);
+        return stringWrapper;
+    }
+
     public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
         List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
         return stringWrapper;

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -17,10 +17,7 @@ import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.util.LoginUserUtil;
 import com.adc.da.workFlow.dao.ExportExcelMapper;
-import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
-import com.adc.da.workFlow.entity.ExportExcel;
-import com.adc.da.workFlow.entity.ExportExcelEO;
-import com.adc.da.workFlow.entity.ProcessDetailExport;
+import com.adc.da.workFlow.entity.*;
 import com.adc.da.workFlow.service.WorkFlowService;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
@@ -50,6 +47,12 @@ public class WorkFlowController {
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
+    @ApiOperation(value = "查询在线编辑流程当前节点编辑对象")
+    @GetMapping("/processModelHisOne")
+    public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
+        return  workFlowFeignClient.processModelHisOne(pid);
+    }
+
     @ApiOperation(value = "查询流程父节点所有评分")
     @GetMapping("/evaluationHisList")
     public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){

adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java

@@ -0,0 +1,88 @@
+package com.adc.da.workFlow.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 流程模块历史表
+ * </p>
+ *
+ * @author super_liu
+ * @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 = "逻辑状态")
+    @TableField("FLAG")
+    private String flag;
+
+    @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")
+    @TableField(exist = false)
+    private String downLoadUrl;
+}