我的任务改查询方式

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/ItdmTaskController.java

@@ -95,73 +95,17 @@ public class ItdmTaskController extends JeecgController<ItdmTask, IItdmTaskServi
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String realName = loginUser.getRealname(); // 登录人姓名
 
-		if(!realName.equals(GlobalVariables.gly)){
+		if(!realName.equals(GlobalVariables.gly)){ //管理员
 			dto.setTaskUser(realName);
-
-			SysUserRole userRole = new SysUserRole();
-			userRole.setUserId(loginUser.getId());
-			Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
-			List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
-			if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
-				List<String> roles = userRoleList.stream().map(i->{
-					return roleService.getById(i.getRoleId()).getRoleName();
-				}).collect(Collectors.toList());
-
-				dto.setTaskRoleList(roles);
-			}
 		}
 
 		List<ItdmTaskListVO> list = itdmTaskService.queryTaskList(dto);
 
-//		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
-//		List<ItdmTask> pageList = itdmTaskService.list(queryWrapper);
-//		List<ItdmTaskListVO> list = pageList.stream().map(i->{
-//			ItdmWeituoInfo weituoInfo = weituoInfoService.getById(i.getWeituoId());
-//			if(weituoInfo!=null){
-//				String weituoNo = weituoInfo.getWeituoNo();
-//				String weituoClient = weituoInfo.getWeituoClient();
-//				return ItdmTaskConvert.INSTANCE.convert(i,weituoNo,weituoClient);
-//			}else {
-//				return ItdmTaskConvert.INSTANCE.convert(i,"","");
-//			}
-//		}).collect(Collectors.toList());
-
 		long endTime = System.currentTimeMillis();
 		long timeElapsed = endTime - startTime;
-
 		System.out.println(itdmTask.getTaskStatus()+"=============================该查询get方法用时为：" + timeElapsed + " 毫秒=============================");
-
 		return Result.OK(list);
 	}
-//	public Result<IPage<ItdmTask>> queryPageList(ItdmTask itdmTask,
-//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-//								   HttpServletRequest req) {
-//		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//		String realName = loginUser.getRealname(); // 登录人姓名
-//
-//		if(!realName.equals("管理员")){
-//			itdmTask.setTaskUser(realName);
-//
-//			SysUserRole userRole = new SysUserRole();
-//			userRole.setUserId(loginUser.getId());
-//			Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
-//			List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
-//			if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
-//				List<String> roles = userRoleList.stream().map(i->{
-//					return roleService.getById(i.getRoleId()).getRoleName();
-//				}).collect(Collectors.toList());
-//
-//				String role = roles.get(0); // 登录人角色，一般只有一个
-//				itdmTask.setTaskRole(role);
-//			}
-//		}
-//
-//		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
-//		Page<ItdmTask> page = new Page<ItdmTask>(pageNo, pageSize);
-//		IPage<ItdmTask> pageList = itdmTaskService.page(page, queryWrapper);
-//		return Result.OK(pageList);
-//	}
 
 	/**
 	 *   添加

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/itdmFirstPageController.java

@@ -52,28 +52,10 @@ public class itdmFirstPageController {
         List<String> roles = new ArrayList<>();
         if(!username.equals("admin")){
             itdmTask.setTaskUser(realName);
-
-            SysUserRole userRole = new SysUserRole();
-            userRole.setUserId(loginUser.getId());
-            Wrapper<SysUserRole> userRoleWrapper = new QueryWrapper<>(userRole);
-            List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleWrapper);
-            if(userRoleList != null && !userRoleList.isEmpty() && userRoleList.get(0)!=null){
-                roles = userRoleList.stream().map(i->{
-                    return roleService.getById(i.getRoleId()).getRoleName();
-                }).collect(Collectors.toList());
-
-//                String role = roles.get(0); // 登录人角色，只有一个(可以有多个，但本系统根据客户需求由前端限制只有一个)
-//                itdmTask.setTaskRole(role);
-
-//                if(role.equals("经理") || role.equals("计划员")) itdmTask.setTaskUser(null);
-            }
-
         }
 
         QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>(itdmTask);
 
-        if(!username.equals("admin")) taskWrapper.in("task_role", roles);
-
         Long totalNum = taskService.count(taskWrapper);
 
         itdmTask.setTaskStatus(0);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/xml/ItdmTaskMapper.xml

@@ -10,12 +10,6 @@
         <where>
             <if test="taskUser != null and taskUser != ''"> task_user = #{taskUser}</if>
             <if test="taskStatus != null "> and task_status = #{taskStatus}</if>
-            <if test="taskRoleList != null and taskRoleList.size() > 0">
-                and task_role in
-                <foreach collection="taskRoleList" item="role" separator="," open="(" close=")">
-                    #{role}
-                </foreach>
-            </if>
         </where>
     </select>
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/qita/GlobalVariables.java

@@ -8,4 +8,11 @@ public class GlobalVariables {
     public static String czy = "操作员";
     public static String gly = "管理员";
 
+    public static String wtsh = "委托审核";
+    public static String jhpq = "计划排期";
+    public static String cjgd = "拆解工单";
+    public static String syxmsr = "试验项目输入";
+    public static String syxmsrsh = "试验项目输入-审核";
+
+
 }