sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

dev_xds
姜玉琦 2023-11-27 13:42:14 +08:00
parent e546f71cce
commit a4683015f7
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
View File

@ -6,7 +6,9 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.flowable.domain.dto.FlowTaskDto;
import com.ruoyi.flowable.domain.vo.FlowTaskVo;
import com.ruoyi.flowable.domain.vo.StartTaskVO;
@ -15,6 +17,7 @@ import com.ruoyi.flowable.service.IFlowDefinitionService;
import com.ruoyi.flowable.service.IFlowInstanceService;
import com.ruoyi.flowable.service.IFlowTaskService;
import com.ruoyi.system.domain.FlowTaskEntity;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.yanzhu.jh.project.service.ISurProjectAuditinfoService;
import io.swagger.annotations.ApiOperation;
@ -22,6 +25,8 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@ -39,6 +44,9 @@ public class WcFlowableController extends BaseController {
@Autowired
private RedisCache redisCache;
@Autowired
private ISysDeptService sysDeptService;
@Autowired
private ISysUserService sysUserService;
@ -201,6 +209,10 @@ public class WcFlowableController extends BaseController {
public TableDataInfo myAwaitFlowTaskList(@RequestBody FlowTaskEntity flowTaskEntity) {
//这里不分页，这里实时查询用户角色
flowTaskEntity.setRoleIds(sysUserService.selectUserRoles(flowTaskEntity.getNowUserName()));
String nowDept = flowTaskEntity.getNowDept();
if(flowTaskEntity.getRoleIds().contains(Convert.toLong(SysRoleEnum.ZGS.getCode()))){
flowTaskEntity.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(Convert.toLong(nowDept))));
}
return getDataTable(flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity));
}
@ -212,18 +224,23 @@ public class WcFlowableController extends BaseController {
@PostMapping(value = "/myAwaitFlowTaskListCount")
public AjaxResult myAwaitFlowTaskListCount(@RequestBody FlowTaskEntity flowTaskEntity) {
//设置缓存
String key="wechat_flowTask_myAwaitFlowTaskListCount-nowRole="+flowTaskEntity.getNowRole()+"-nowDept="+flowTaskEntity.getNowDept()+"-nowUserName="+flowTaskEntity.getNowUserName()+"-nowUser="+flowTaskEntity.getNowUser();
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return success(obj);
}
//String key="wechat_flowTask_myAwaitFlowTaskListCount-nowRole="+flowTaskEntity.getNowRole()+"-nowDept="+flowTaskEntity.getNowDept()+"-nowUserName="+flowTaskEntity.getNowUserName()+"-nowUser="+flowTaskEntity.getNowUser();
//Object obj=redisCache.getCacheObject(key);
//if(obj!=null){
// return success(obj);
//}
//这里不分页，这里实时查询用户角色
flowTaskEntity.setRoleIds(sysUserService.selectUserRoles(flowTaskEntity.getNowUserName()));
String nowDept = flowTaskEntity.getNowDept();
if(flowTaskEntity.getRoleIds().contains(Convert.toLong(SysRoleEnum.ZGS.getCode()))){
flowTaskEntity.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(Convert.toLong(nowDept))));
}
Map<String, Object> dataMap = surProjectAuditinfoService.findMyTask(flowTaskEntity);
redisCache.setCacheObject(key, dataMap, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
//redisCache.setCacheObject(key, dataMap, Constants.CAPTCHA_EXPIRATION, TimeUnit.SECONDS);
return success(dataMap);
}
/**
* 根据条件查询我的已办任务
* @param flowTaskEntity