+ * 业务工作流程 + *
+ * + * @author JiangYuQi + * @date 2024-04-03 + */ +@Slf4j +@Api(tags = "业务工作流程") +@RestController +@RequestMapping("/flowable/businessKey") +public class FlowBusinessKeyController extends BaseController { + + @Autowired + private ISysDeptService sysDeptService; + + @Autowired + private IFlowBusinessKeyService flowBusinessKeyService; + + /** + * 根据条件查询所有流任务 + * @param flowTaskEntity + * @return + */ + @GetMapping(value = "/allList") + public TableDataInfo allList(FlowTaskEntity flowTaskEntity) { + startPage(); + //超管查询所有数据 + if(!SysUser.isAdmin(super.getUserId())){ + flowTaskEntity.setDeptAncestors(super.getLoginUser().getUser().getDept().getAncestors()); + } + return getDataTable(flowBusinessKeyService.selectAllFlowTaskByParams(flowTaskEntity)); + } + + /** + * 根据条件统计所有流任务 + * @param flowTaskEntity + * @return + */ + @GetMapping(value = "/queryCount") + public AjaxResult queryCount(FlowTaskEntity flowTaskEntity) { + //超管查询所有数据 + if(!SysUser.isAdmin(super.getUserId())){ + flowTaskEntity.setDeptAncestors(super.getLoginUser().getUser().getDept().getAncestors()); + } + return success(flowBusinessKeyService.quueryCount(flowTaskEntity)); + } + + /** + * 根据流程Id查询操作日志 + * @param procInsId + * @return + */ + @GetMapping(value = "/findCommentByProcInsId") + public AjaxResult findCommentByProcInsId(String procInsId) { + return success(flowBusinessKeyService.selectCommentByProcInsId(procInsId)); + } + + /** + * 根据流程Id查询表单数据 + * @param procInsId + * @return + */ + @GetMapping(value = "/findFormDatasByProcInsId") + public AjaxResult findFormDatasByProcInsId(String procInsId) { + return success(flowBusinessKeyService.selectFormDatasByProcInsId(procInsId)); + } + + /** + * 根据条件查询我的代办任务 + * @param flowTaskEntity + * @return + */ + @GetMapping(value = "/myAwaitFlowTaskList") + public TableDataInfo myAwaitFlowTaskList(FlowTaskEntity flowTaskEntity) { + startPage(); + //超管查询所有数据 + if(!SysUser.isAdmin(super.getUserId())){ + SysUser sysUser = super.getLoginUser().getUser(); + flowTaskEntity.setDeptAncestors(sysUser.getDept().getAncestors()); + flowTaskEntity.setRoleIds(sysUser.getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList())); + } + return getDataTable(flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity)); + } + + /** + * 根据条件查询我的已办任务 + * @param flowTaskEntity + * @return + */ + @GetMapping(value = "/myFinishedFlowTaskList") + public TableDataInfo myFinishedFlowTaskList(FlowTaskEntity flowTaskEntity) { + startPage(); + flowTaskEntity.setAssigneeId(super.getUserId()); + return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity)); + } +} diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java index c4015ee..f81d100 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java @@ -4,6 +4,7 @@ import com.yanzhu.common.core.controller.BaseController; import com.yanzhu.common.core.domain.AjaxResult; import com.yanzhu.common.core.domain.entity.SysRole; import com.yanzhu.common.core.domain.entity.SysUser; +import com.yanzhu.common.core.text.Convert; import com.yanzhu.flowable.domain.FlowSaveXmlVo; import com.yanzhu.system.domain.flowable.FlowQueryVo; import com.yanzhu.flowable.service.IFlowDefinitionService; @@ -66,6 +67,9 @@ public class FlowDefinitionController extends BaseController { @GetMapping(value = "/list") @ApiOperation(value = "流程定义列表", response = FlowProcDefDto.class) public AjaxResult list(FlowQueryVo flowQueryVo) { + if(!SysUser.isAdmin(super.getUserId())){ + flowQueryVo.setDeptId(Convert.toLong(super.getLoginUser().getUser().getDept().getAncestors().split(",")[2])); + } return AjaxResult.success(flowDefinitionService.list(flowQueryVo)); } diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java index aab3e99..86f7cc5 100644 --- a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java @@ -1,7 +1,7 @@ package com.yanzhu.flowable.controller; import com.yanzhu.common.core.domain.AjaxResult; -import com.yanzhu.system.domain.flowable.dto.FlowTaskDto; +import com.yanzhu.flowable.domain.FlowTaskDto; import com.yanzhu.system.domain.flowable.FlowQueryVo; import com.yanzhu.system.domain.flowable.FlowTaskVo; import com.yanzhu.flowable.service.IFlowTaskService; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowCommentDto.java similarity index 88% rename from yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowCommentDto.java index 7f8f552..4b9d597 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowCommentDto.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowCommentDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.domain.flowable.dto; +package com.yanzhu.flowable.domain; import lombok.Builder; import lombok.Data; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowFromFieldDTO.java similarity index 80% rename from yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowFromFieldDTO.java index 372cb98..e591207 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowFromFieldDTO.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowFromFieldDTO.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.domain.flowable.dto; +package com.yanzhu.flowable.domain; import lombok.Data; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowNextDto.java similarity index 84% rename from yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowNextDto.java index f46826c..70b506a 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowNextDto.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowNextDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.domain.flowable.dto; +package com.yanzhu.flowable.domain; import lombok.Data; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowTaskDto.java similarity index 98% rename from yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowTaskDto.java index 89fa539..5db80e9 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowTaskDto.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowTaskDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.domain.flowable.dto; +package com.yanzhu.flowable.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowViewerDto.java similarity index 86% rename from yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java rename to yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowViewerDto.java index efd1539..60b221f 100644 --- a/yanzhu-system/src/main/java/com/yanzhu/system/domain/flowable/dto/FlowViewerDto.java +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/domain/FlowViewerDto.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.domain.flowable.dto; +package com.yanzhu.flowable.domain; import lombok.Data; diff --git a/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java new file mode 100644 index 0000000..11f7385 --- /dev/null +++ b/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java @@ -0,0 +1,56 @@ +package com.yanzhu.flowable.service; + +import com.yanzhu.system.domain.flowable.FlowTaskEntity; + +import java.util.List; +import java.util.Map; + +/** + * @author JiangYuQi + * @date 2021-04-03 14:41 + */ +public interface IFlowBusinessKeyService { + + /** + * 根据条件查询所有流任务 + * @param flowTaskEntity + * @return + */ + public List工作流任务
+ *
+ * @author JiangYuQi
+ * @date 2021-04-03
+ */
+public class FlowTaskEntity extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ private String businessKey;
+
+ @ApiModelProperty("业务名称")
+ private String businessKeyName;
+
+ @ApiModelProperty("任务编号")
+ private String taskId;
+
+ @ApiModelProperty("任务执行编号")
+ private String executionId;
+
+ @ApiModelProperty("任务名称")
+ private String taskName;
+
+ @ApiModelProperty("任务Key")
+ private String taskDefKey;
+
+ @ApiModelProperty("部门名称")
+ private String deptName;
+
+ @ApiModelProperty("流程发起人部门名称")
+ private String startDeptName;
+
+ @ApiModelProperty("任务执行人Id")
+ private Long assigneeId;
+
+ @ApiModelProperty("任务执行人名称")
+ private String assigneeName;
+
+ @ApiModelProperty("任务执行人部门")
+ private String assigneeDeptName;;
+
+ @ApiModelProperty("流程发起人Id")
+ private String startUserId;
+
+ @ApiModelProperty("流程发起人名称")
+ private String startUserName;
+
+ @ApiModelProperty("流程类型")
+ private String category;
+
+ @ApiModelProperty("流程变量信息")
+ private Object procVars;
+
+ @ApiModelProperty("局部变量信息")
+ private Object taskLocalVars;
+
+ @ApiModelProperty("流程部署编号")
+ private String deployId;
+
+ @ApiModelProperty("流程ID")
+ private String procDefId;
+
+ @ApiModelProperty("流程key")
+ private String procDefKey;
+
+ @ApiModelProperty("流程定义名称")
+ private String procDefName;
+
+ @ApiModelProperty("流程定义内置使用版本")
+ private int procDefVersion;
+
+ @ApiModelProperty("流程实例ID")
+ private String procInsId;
+
+ @ApiModelProperty("历史流程实例ID")
+ private String hisProcInsId;
+
+ @ApiModelProperty("任务耗时")
+ private String duration;
+
+ @ApiModelProperty("候选执行人")
+ private String candidate;
+
+ @ApiModelProperty("任务完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finishTime;
+
+ @ApiModelProperty("单位祖籍列表")
+ private String deptAncestors;
+
+ public String getBusinessKeyName() {
+ return businessKeyName;
+ }
+
+ public void setBusinessKeyName(String businessKeyName) {
+ this.businessKeyName = businessKeyName;
+ }
+
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getExecutionId() {
+ return executionId;
+ }
+
+ public void setExecutionId(String executionId) {
+ this.executionId = executionId;
+ }
+
+ public String getTaskName() {
+ return taskName;
+ }
+
+ public void setTaskName(String taskName) {
+ this.taskName = taskName;
+ }
+
+ public String getTaskDefKey() {
+ return taskDefKey;
+ }
+
+ public void setTaskDefKey(String taskDefKey) {
+ this.taskDefKey = taskDefKey;
+ }
+
+ public Long getAssigneeId() {
+ return assigneeId;
+ }
+
+ public void setAssigneeId(Long assigneeId) {
+ this.assigneeId = assigneeId;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getStartDeptName() {
+ return startDeptName;
+ }
+
+ public void setStartDeptName(String startDeptName) {
+ this.startDeptName = startDeptName;
+ }
+
+ public String getAssigneeName() {
+ return assigneeName;
+ }
+
+ public void setAssigneeName(String assigneeName) {
+ this.assigneeName = assigneeName;
+ }
+
+ public String getAssigneeDeptName() {
+ return assigneeDeptName;
+ }
+
+ public void setAssigneeDeptName(String assigneeDeptName) {
+ this.assigneeDeptName = assigneeDeptName;
+ }
+
+ public String getStartUserId() {
+ return startUserId;
+ }
+
+ public void setStartUserId(String startUserId) {
+ this.startUserId = startUserId;
+ }
+
+ public String getStartUserName() {
+ return startUserName;
+ }
+
+ public void setStartUserName(String startUserName) {
+ this.startUserName = startUserName;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ public Object getProcVars() {
+ return procVars;
+ }
+
+ public void setProcVars(Object procVars) {
+ this.procVars = procVars;
+ }
+
+ public Object getTaskLocalVars() {
+ return taskLocalVars;
+ }
+
+ public void setTaskLocalVars(Object taskLocalVars) {
+ this.taskLocalVars = taskLocalVars;
+ }
+
+ public String getDeployId() {
+ return deployId;
+ }
+
+ public void setDeployId(String deployId) {
+ this.deployId = deployId;
+ }
+
+ public String getProcDefId() {
+ return procDefId;
+ }
+
+ public void setProcDefId(String procDefId) {
+ this.procDefId = procDefId;
+ }
+
+ public String getProcDefKey() {
+ return procDefKey;
+ }
+
+ public void setProcDefKey(String procDefKey) {
+ this.procDefKey = procDefKey;
+ }
+
+ public String getProcDefName() {
+ return procDefName;
+ }
+
+ public void setProcDefName(String procDefName) {
+ this.procDefName = procDefName;
+ }
+
+ public int getProcDefVersion() {
+ return procDefVersion;
+ }
+
+ public void setProcDefVersion(int procDefVersion) {
+ this.procDefVersion = procDefVersion;
+ }
+
+ public String getProcInsId() {
+ return procInsId;
+ }
+
+ public void setProcInsId(String procInsId) {
+ this.procInsId = procInsId;
+ }
+
+ public String getHisProcInsId() {
+ return hisProcInsId;
+ }
+
+ public void setHisProcInsId(String hisProcInsId) {
+ this.hisProcInsId = hisProcInsId;
+ }
+
+ public String getDuration() {
+ return duration;
+ }
+
+ public void setDuration(String duration) {
+ this.duration = duration;
+ }
+
+ public String getCandidate() {
+ return candidate;
+ }
+
+ public void setCandidate(String candidate) {
+ this.candidate = candidate;
+ }
+
+ public Date getFinishTime() {
+ return finishTime;
+ }
+
+ public void setFinishTime(Date finishTime) {
+ this.finishTime = finishTime;
+ }
+
+ public String getBusinessKey() {
+ return businessKey;
+ }
+
+ public void setBusinessKey(String businessKey) {
+ this.businessKey = businessKey;
+ }
+
+ public String getDeptAncestors() {
+ return deptAncestors;
+ }
+
+ public void setDeptAncestors(String deptAncestors) {
+ this.deptAncestors = deptAncestors;
+ }
+
+ private List