From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 133 insertions(+), 4 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 73c6f97..6d5fcff 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
@@ -16,13 +16,23 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.vo.TaskVO;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.ITaskService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.vo.TaskVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 任务表 服务实现类
@@ -33,10 +43,129 @@
@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) {
- return page.setRecords(baseMapper.selectTaskPage(page, task));
+ task.setUserId(AuthUtil.getUserId());
+ // 民警角色
+ if (AuthUtil.getUserRole().contains("mj")) {
+ task.setUserId(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectTaskPageBy(page, task));
+ } else {
+ // 非民警角色
+ return page.setRecords(baseMapper.selectTaskPage(page, task));
+ }
+ }
+
+ /**
+ * 新增任务
+ *
+ * @param type
+ * @param name
+ * @param frequency
+ * @param remark
+ * @param createUser
+ * @return
+ */
+ @Override
+ public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode,Integer reportType) {
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setType(type);
+ taskEntity.setName(name);
+ taskEntity.setFrequency(frequency);
+ taskEntity.setRemark(remark);
+ taskEntity.setCreateTime(new Date());
+ taskEntity.setCreateUser(createUser);
+ taskEntity.setHouseCode(houseCode);
+ taskEntity.setReportType(reportType);
+ return baseMapper.insert(taskEntity) > 0 ? taskEntity.getId() : 0;
+ }
+
+ @Override
+ public Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status) {
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setId(id);
+ taskEntity.setType(type);
+ taskEntity.setName(name);
+ taskEntity.setFrequency(frequency);
+ taskEntity.setRemark(remark);
+ taskEntity.setUpdateTime(new Date());
+ taskEntity.setUpdateUser(updateUser);
+ taskEntity.setStatus(status);
+ return baseMapper.updateById(taskEntity) > 0 ? 1L : 0;
}
+ @Override
+ public Object countNumber(String houseCode, Integer status) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ // 总数
+ Long all = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery()
+ .eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
+ .in(TaskEntity::getReportType,2,3,4,5,6));
+ // 已处理
+ Long processed = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery()
+ .eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
+ .eq(TaskEntity::getStatus, 2)
+ .in(TaskEntity::getReportType,2,3,4,5,6));
+ objectObjectHashMap.put("all", all);
+ objectObjectHashMap.put("processed", processed);
+ return objectObjectHashMap;
+ }
+
+ @Override
+ public Object countTypeNumber() {
+ 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);
+
+ // 报事报修
+// 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