From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 0f50c30..3e57d20 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -18,15 +18,20 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.house.service.IHouseRentalService;
+import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.mapper.TaskMapper;
+import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -40,6 +45,14 @@
@Service
public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements ITaskService {
+// @Autowired
+// private ITaskReportForRepairsService iTaskReportForRepairsService;
+
+ @Autowired
+ private IHouseholdService iHouseholdService;
+
+ @Autowired
+ private IHouseRentalService iHouseRentalService;
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
@@ -100,17 +113,49 @@
@Override
public Object countTypeNumber() {
+ TaskVO taskVO = new TaskVO();
Map<String, Object> objectObjectHashMap = new HashMap<>();
- // 已处理
- Long comprehensiveTask = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getType, 1)
- .eq(TaskEntity::getStatus, 1));
- Long residentialTask = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getType, 2)
- .eq(TaskEntity::getStatus, 1));
- Long publicTask = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getType, 3)
- .eq(TaskEntity::getStatus, 1));
+ taskVO.setUserId(AuthUtil.getUserId());
+ taskVO.setType(1);
+ taskVO.setStatus(1);
+ // 综治任务
+ Integer comprehensiveTask = baseMapper.selectTaskCount(taskVO);
+ taskVO.setType(2);
+ // 组建任务
+ Integer residentialTask = baseMapper.selectTaskCount(taskVO);
+ taskVO.setType(3);
+ // 公安任务
+ Integer publicTask = baseMapper.selectTaskCount(taskVO);
+
+ // 报事报修
+// Integer statistics = iTaskReportForRepairsService.getStatistics(AuthUtil.getUserId());
+ // 住房审核
+ Integer statistics1 = iHouseholdService.statistics(AuthUtil.getUserId());
+ // 出租审核
+ Integer statisticsCount = iHouseRentalService.getStatisticsCount(new HouseRentalTenantVO());
+
objectObjectHashMap.put("comprehensiveTask", comprehensiveTask);
objectObjectHashMap.put("residentialTask", residentialTask);
objectObjectHashMap.put("publicTask", publicTask);
+
+// objectObjectHashMap.put("baoshi", statistics);
+ objectObjectHashMap.put("zhufang", statistics1);
+ objectObjectHashMap.put("chuzhu", statisticsCount);
+ return objectObjectHashMap;
+ }
+
+ @Override
+ public Object countFrequencyNumber() {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ TaskVO taskVO = new TaskVO();
+ taskVO.setUserId(AuthUtil.getUserId());
+ taskVO.setFrequency(1);
+ taskVO.setStatus(1);
+ Integer disposable = baseMapper.selectTaskCount(taskVO);
+ taskVO.setFrequency(2);
+ Integer periodicity = baseMapper.selectTaskCount(taskVO);
+ objectObjectHashMap.put("disposable", disposable);
+ objectObjectHashMap.put("periodicity", periodicity);
return objectObjectHashMap;
}
}
--
Gitblit v1.9.3