任务看板修改bug

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/vo/TaskStatisticsVO.java

@@ -30,10 +30,17 @@ import lombok.Data;
 public class TaskStatisticsVO {
 
 	private String UserName;
+
+	private Integer quantity = 0;
+//	待执行
 	private Integer waitingQuantity = 0;
+//	执行中
 	private Integer carryTheQuantity = 0;
+//	已提交
 	private Integer numberOfCommits = 0;
+//	超时
 	private Integer theNumberOfTimeouts = 0;
+//	工单关闭
 	private Integer theNumberOfClosures = 0;
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/TaskController.java

@@ -26,6 +26,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -99,7 +100,8 @@ public class TaskController extends BladeController {
 				.le("create_time", date.get(1));
 		}
 		qw.eq("is_deleted", 0);
-		if (AuthUtil.getUserName() != "admin") {
+		String userName = AuthUtil.getUserName();
+		if (!"admin".equals(userName)) {
 			qw.and(qwa -> qwa.like("cc_id", AuthUtil.getUserId())
 				.or().eq("create_user", AuthUtil.getUserId())
 				.or().eq("responsible_user_id", AuthUtil.getUserId()));

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/TaskServiceImpl.java

@@ -50,6 +50,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
 		LocalDateTime nowTime = LocalDateTime.now();
 		LambdaQueryWrapper<Task> lqw = new LambdaQueryWrapper<Task>()
 			.eq(Task::getTenantId, AuthUtil.getTenantId())
+			.ne(Task::getType, 4)
 			.eq(Task::getIsDeleted, 0);
 		List<Task> taskList = baseMapper.selectList(lqw);
 
@@ -110,7 +111,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
 		LambdaQueryWrapper<Task> lqw = new LambdaQueryWrapper<Task>().eq(Task::getTenantId, tenantId).eq(Task::getIsDeleted, 0);
 		List<Task> tasks = baseMapper.selectList(lqw);
 		LocalDateTime nowTime = LocalDateTime.now();
-		return getTaskStatisticsVO(tasks, nowTime);
+		TaskStatisticsVO taskStatisticsVO = getTaskStatisticsVO(tasks, nowTime);
+		taskStatisticsVO.setQuantity(tasks.size());
+		return taskStatisticsVO;
 	}
 
 }