From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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 77f183b..c2e033e 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,13 +18,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.common.utils.SpringUtils;
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.place.service.IPlaceExtService;
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;
@@ -32,6 +35,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -43,8 +47,8 @@
@Service
public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements ITaskService {
-// @Autowired
-// private ITaskReportForRepairsService iTaskReportForRepairsService;
+ // @Autowired
+ // private ITaskReportForRepairsService iTaskReportForRepairsService;
@Autowired
private IHouseholdService iHouseholdService;
@@ -55,7 +59,15 @@
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
task.setUserId(AuthUtil.getUserId());
- return page.setRecords(baseMapper.selectTaskPage(page, task));
+ // 民警角色
+ if (AuthUtil.getUserRole().equals("mj")) {
+ task.setUserId(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectTaskPageBy(page, task));
+ } else {
+ // 非民警角色
+ List<TaskVO> taskVOS = baseMapper.selectTaskPage(page, task);
+ return page.setRecords(taskVOS);
+ }
}
/**
@@ -115,35 +127,35 @@
}
@Override
- public Object countTypeNumber() {
+ public Object countTypeNumber(Integer roleType, String neiCode) {
TaskVO taskVO = new TaskVO();
Map<String, Object> objectObjectHashMap = new HashMap<>();
- 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);
-
+ taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
+ taskVO.setNeiCode(neiCode);
+ taskVO.setReportType(2);
+ // 标签事件
+ Integer bqsj = baseMapper.selectTaskCount(taskVO);
+ taskVO.setReportType(1);
+ // 取保候审
+ Integer qbhs = baseMapper.selectTaskCount(taskVO);
// 报事报修
-// Integer statistics = iTaskReportForRepairsService.getStatistics(AuthUtil.getUserId());
+ Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
// 住房审核
- Integer statistics1 = iHouseholdService.statistics(AuthUtil.getUserId());
+ Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
// 出租审核
- 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);
+ HouseRentalTenantVO houseRentalTenantVO = new HouseRentalTenantVO();
+ houseRentalTenantVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
+ houseRentalTenantVO.setNeiCode(neiCode);
+ Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
+ // 场所审核
+ Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 1);
+ objectObjectHashMap.put("qbhs", qbhs);
+ objectObjectHashMap.put("bqsj", bqsj);
+ objectObjectHashMap.put("bsbx", bsbx);
+ objectObjectHashMap.put("zhsh", zhsh);
+ objectObjectHashMap.put("czsh", czsh);
+ objectObjectHashMap.put("cssh", cssh);
return objectObjectHashMap;
}
--
Gitblit v1.9.3