流程待办任务修改

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

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

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

@@ -425,9 +425,9 @@ public class ActivitiServiceImpl implements ActivitiService {
      * @return
      */
     @Override
-    public IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId, FlowTaskTypeEnum flowTaskTypeEnum) {
+    public IPage<WorkTaskResult> getFlowTaskList(IPage<Map> iPage, Long userId, FlowTaskTypeEnum flowTaskTypeEnum) {
         Map<String, Object> map = new HashMap<>();
-        IPage<WorkTaskResult> workTaskResultIPage = sysUserService.getUnDoneFlowTaskList(iPage, userId, flowTaskTypeEnum);
+        IPage<WorkTaskResult> workTaskResultIPage = sysUserService.getFlowTaskList(iPage, userId, flowTaskTypeEnum);
         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/mapper/SysUserMapper.java

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

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

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

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

@@ -450,8 +450,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public IPage<WorkTaskResult> getUnDoneFlowTaskList(IPage<Map> iPage, Long userId, FlowTaskTypeEnum flowTaskTypeEnum) {
-        return this.baseMapper.getUnDoneFlowTaskList(iPage, userId, Objects.nonNull(flowTaskTypeEnum) ? flowTaskTypeEnum.name() : null);
+    public IPage<WorkTaskResult> getFlowTaskList(IPage<Map> iPage, Long userId, FlowTaskTypeEnum flowTaskTypeEnum) {
+        return this.baseMapper.getFlowTaskList(iPage, userId, Objects.nonNull(flowTaskTypeEnum) ? flowTaskTypeEnum.name() : null);
     }
 
     @Override

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

@@ -522,3 +522,11 @@ UPDATE sys_privilege
 SET name='获取流程待办', url='/api/admin/flow/task/list', `type`='URL', parent_id=64, `sequence`=19, property='SYS', related=NULL, enable=1, default_auth=1, front_display=0
 WHERE id=3006;
 
+INSERT INTO t_b_product
+(id, name, code, enable, create_id, create_time)
+VALUES(1, '教务处', 'OFFICE', 1, 1, NULL);
+INSERT INTO t_b_product
+(id, name, code, enable, create_id, create_time)
+VALUES(2, '云阅卷', 'CLOUD_MARK', 1, 1, NULL);
+
+

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="getUnDoneFlowTaskList" resultType="com.qmth.sop.business.bean.result.WorkTaskResult">
+    <select id="getFlowTaskList" resultType="com.qmth.sop.business.bean.result.WorkTaskResult">
         select
             t.*
         from

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

@@ -93,11 +93,11 @@ public class TFCustomFlowController {
     @ApiOperation(value = "获取流程待办接口")
     @RequestMapping(value = "/task/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkTaskResult.class)})
-    public Result getUnDoneFlowTaskList(@ApiParam(value = "用户id", required = true) @RequestParam Long userId,
+    public Result getFlowTaskList(@ApiParam(value = "用户id", required = true) @RequestParam Long userId,
                                         @ApiParam(value = "待办任务类型", required = true) @RequestParam FlowTaskTypeEnum flowTaskTypeEnum,
                                         @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, flowTaskTypeEnum));
+        return ResultUtil.ok(activitiService.getFlowTaskList(new Page<>(pageNumber, pageSize), userId, flowTaskTypeEnum));
     }
 
     @ApiOperation(value = "结束流程接口")