From 38ff397652a9ef114092f8e7bdbe6d3fede69039 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 Nov 2023 18:04:50 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index f2282e4..0185983 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -16,19 +16,19 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -60,13 +60,17 @@
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
List<String> list = new ArrayList<>();
- if (null!=taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")){
- if (taskReportForRepairs.getRoleName().equals("网格员")){
+ if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
+ if (taskReportForRepairs.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
+ // 没有范围，不查询数据
+ if (list.size() > 0) {
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
+ }
+ return page.setRecords(new ArrayList<>());
}
/**
@@ -99,6 +103,7 @@
boolean save = taskService.save(taskEntity);
if (save){
taskReportForRepairs.setTaskId(taskEntity.getId());
+ taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
}
return flag;
@@ -143,4 +148,9 @@
// 返回
return flag;
}
+
+ @Override
+ public Integer getStatistics(Long userId) {
+ return baseMapper.getStatistics(userId);
+ }
}
--
Gitblit v1.9.3