修改获取全部流程待办接口

sop-business/src/main/java/com/qmth/sop/business/activiti/service/ActivitiService.java

@@ -71,7 +71,7 @@ public interface ActivitiService {
      * @param userId
      * @return
      */
-    public IPage<WorkTaskResult> getTaskList(IPage<Map> iPage, Long userId);
+    public IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId);
 
     /**
      * 流程节点转他人审批

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -422,9 +422,9 @@ public class ActivitiServiceImpl implements ActivitiService {
      * @return
      */
     @Override
-    public IPage<WorkTaskResult> getTaskList(IPage<Map> iPage, Long userId) {
+    public IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId) {
         Map<String, Object> map = new HashMap<>();
-        IPage<WorkTaskResult> workTaskResultIPage = sysUserService.getWorkTaskList(iPage, userId);
+        IPage<WorkTaskResult> workTaskResultIPage = sysUserService.getUnDoneFlowTaskList(iPage, userId);
         if (Objects.nonNull(workTaskResultIPage) && !CollectionUtils.isEmpty(workTaskResultIPage.getRecords())) {
             for (WorkTaskResult w : workTaskResultIPage.getRecords()) {
                 List<Task> taskList = taskService.createTaskQuery().taskId(String.valueOf(w.getTaskId())).list();

sop-business/src/main/java/com/qmth/sop/business/bean/bean/FormPropertyBean.java

@@ -1,125 +0,0 @@
-package com.qmth.sop.business.bean.bean;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.sop.business.bean.result.FlowTaskResult;
-import com.qmth.sop.common.enums.FlowStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 流程表单属性bean
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2023/7/24
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class FormPropertyBean implements Serializable {
-
-    @ApiModelProperty(value = "流程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long flowId;
-
-    @ApiModelProperty(value = "流程状态")
-    FlowStatusEnum status;
-
-    @ApiModelProperty(value = "流程状态")
-    String statusStr;
-
-    @ApiModelProperty(value = "sop单号")
-    String sopNo;
-
-    @ApiModelProperty(value = "流程任务id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long taskId;
-
-    @ApiModelProperty(value = "用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long userId;
-
-    @ApiModelProperty(value = "动态表单")
-    FlowTaskResult setupMap;
-
-    public FormPropertyBean() {
-
-    }
-
-    public FormPropertyBean(Long flowId, Long taskId, FlowTaskResult setupMap) {
-        this.flowId = flowId;
-        this.taskId = taskId;
-        this.setupMap = setupMap;
-    }
-
-    public FormPropertyBean(Long flowId, Long taskId, Long userId, FlowTaskResult setupMap, FlowStatusEnum status, String sopNo) {
-        this.flowId = flowId;
-        this.taskId = taskId;
-        this.userId = userId;
-        this.setupMap = setupMap;
-        this.status = status;
-        this.sopNo = sopNo;
-    }
-
-    public String getStatusStr() {
-        if (Objects.nonNull(status)) {
-            return this.status.getTitle();
-        } else {
-            return statusStr;
-        }
-    }
-
-    public void setStatusStr(String statusStr) {
-        this.statusStr = statusStr;
-    }
-
-    public FlowStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(FlowStatusEnum status) {
-        this.status = status;
-    }
-
-    public String getSopNo() {
-        return sopNo;
-    }
-
-    public void setSopNo(String sopNo) {
-        this.sopNo = sopNo;
-    }
-
-    public Long getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(Long flowId) {
-        this.flowId = flowId;
-    }
-
-    public Long getTaskId() {
-        return taskId;
-    }
-
-    public void setTaskId(Long taskId) {
-        this.taskId = taskId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public FlowTaskResult getSetupMap() {
-        return setupMap;
-    }
-
-    public void setSetupMap(FlowTaskResult setupMap) {
-        this.setupMap = setupMap;
-    }
-}

sop-business/src/main/java/com/qmth/sop/business/mapper/SysUserMapper.java

@@ -39,7 +39,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param userId
      * @return
      */
-    IPage<WorkTaskResult> getWorkTaskList(IPage<Map> iPage, @Param("userId") Long userId);
+    IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, @Param("userId") Long userId);
 
     /**
      * 根据机构id查询用户

sop-business/src/main/java/com/qmth/sop/business/service/SysUserService.java

@@ -130,7 +130,7 @@ public interface SysUserService extends IService<SysUser> {
      * @param userId
      * @return
      */
-    IPage<WorkTaskResult> getWorkTaskList(IPage<Map> iPage, Long userId);
+    IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId);
 
     /**
      * 根据角色类型查询用户

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserServiceImpl.java

@@ -449,8 +449,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public IPage<WorkTaskResult> getWorkTaskList(IPage<Map> iPage, Long userId) {
-        return this.baseMapper.getWorkTaskList(iPage, userId);
+    public IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId) {
+        return this.baseMapper.getUnDoneFlowTaskList(iPage, userId);
     }
 
     @Override

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -492,6 +492,9 @@ WHERE id=138;
 UPDATE sys_privilege
 SET name='已审核-查询', url='Select', `type`='BUTTON', parent_id=27, `sequence`=3, property='AUTH', related='3017', enable=1, default_auth=0, front_display=1
 WHERE id=140;
+UPDATE sys_privilege
+SET name='获取全部流程待办', url='/api/admin/flow/task/un_done/list', `type`='URL', parent_id=64, `sequence`=19, property='SYS', related=NULL, enable=1, default_auth=1, front_display=0
+WHERE id=3006;
 
 ALTER TABLE t_b_quality_problem_apply ADD CONSTRAINT t_b_quality_problem_apply_UN_probem_no UNIQUE KEY (problem_no);
 

sop-business/src/main/resources/mapper/SysUserMapper.xml

@@ -6,7 +6,7 @@
         select ARP.ID_ from ACT_RE_PROCDEF ARP where ARP.DEPLOYMENT_ID_ = #{deploymentId}
     </select>
 
-    <select id="getWorkTaskList" resultType="com.qmth.sop.business.bean.result.WorkTaskResult">
+    <select id="getUnDoneFlowTaskList" resultType="com.qmth.sop.business.bean.result.WorkTaskResult">
         select
             t.*
         from

sop-server/src/main/java/com/qmth/sop/server/api/TFCustomFlowController.java

@@ -4,9 +4,9 @@ package com.qmth.sop.server.api;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.activiti.service.ActivitiService;
-import com.qmth.sop.business.bean.bean.FormPropertyBean;
 import com.qmth.sop.business.bean.params.FlowApproveParam;
 import com.qmth.sop.business.bean.result.FlowViewResult;
+import com.qmth.sop.business.bean.result.WorkTaskResult;
 import com.qmth.sop.business.entity.TFCustomFlow;
 import com.qmth.sop.business.service.TFCustomFlowService;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -89,13 +89,13 @@ public class TFCustomFlowController {
         return ResultUtil.ok(true);
     }
 
-    @ApiOperation(value = "获取待办接口")
-    @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = FormPropertyBean.class)})
-    public Result getTaskList(@ApiParam(value = "用户id", required = true) @RequestParam Long userId,
-                              @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                              @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(activitiService.getTaskList(new Page<>(pageNumber, pageSize), userId));
+    @ApiOperation(value = "获取全部流程待办接口")
+    @RequestMapping(value = "/task/un_done/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkTaskResult.class)})
+    public Result getUnDoneFlowTaskList(@ApiParam(value = "用户id", required = true) @RequestParam Long userId,
+                                        @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                        @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(activitiService.getUnDoneFlowTaskList(new Page<>(pageNumber, pageSize), userId));
     }
 
     @ApiOperation(value = "结束流程接口")