任务确认流程。

This commit is contained in:
wangzhijiang
2022-04-25 17:14:59 +08:00
parent aa520f0278
commit 7883e63817
4 changed files with 17 additions and 0 deletions
@@ -140,6 +140,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/opensso/**", "anon"); //单点登录
filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
// 添加自己的过滤器并且取名为jwt
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
@@ -1566,4 +1566,13 @@ public class SysUserController {
}
return result;
}
@RequestMapping(value = "/querySysUserListByIdList", method = RequestMethod.GET)
public List<SysUser> querySysUserListByIdList(@RequestParam String json){
JSONObject jsonObject = JSONObject.parseObject(json);
String userIds = jsonObject.getJSONArray("userIdList").toString();
List<String> userIdList = JSONObject.parseArray(userIds, String.class);
List<SysUser> sysUserList = sysUserService.querySysUserListByIdList(userIdList);
return sysUserList;
}
}
@@ -3,6 +3,7 @@ package com.jero.modules.wkflow.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.wkflow.entity.BusMes;
import com.jero.modules.wkflow.entity.BusProcessName;
import com.jero.modules.wkflow.entity.BusProcessNew;
@@ -13,6 +14,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.utils.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,8 @@ public class TaskController {
@ApiOperation(value="我的待办任务列表", notes="我的待办任务列表")
@PostMapping("/todoTaskList")
public Page todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
taskCommonQuery.setUserId(sysUser.getId());
List<BusProcessName> busProcessNames = taskFeignClient.todoTaskListByUserId(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
Page pageInfo = new Page();
@@ -117,6 +121,8 @@ public class TaskController {
@ApiOperation(value="已发流程", notes="已发流程")
@PostMapping("/IssuedProcess")
public Page IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
taskCommonQuery.setUserId(sysUser.getId());
return taskFeignClient.issuedProcess(taskCommonQuery);
}
@@ -41,6 +41,7 @@ public class workFlowController {
if(type.equals("1")){
jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id
jsonObject.put("loginUserId", currentUser.getId());
jsonObject.put("loginUserName", currentUser.getUsername());
return this.activiti_define_start(jsonObject);
}else{
return null;