From ed28663eebdcc20325474e70be42e10e91fad930 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Jan 2024 11:54:31 +0800
Subject: [PATCH] 住户删除，场所删除，三色任务执行修改
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 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 db6077d..c8a201f 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
@@ -22,6 +22,8 @@
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.sse.server.SSEServer;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
@@ -51,6 +53,9 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义分页
*
@@ -60,18 +65,27 @@
*/
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ taskReportForRepairs.setRegionCode(dept.getRegionCode());
+ }
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
List<String> list = new ArrayList<>();
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
if (taskReportForRepairs.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ } else if (taskReportForRepairs.getRoleName().equals("居民")) {
+ taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
+ taskReportForRepairs.setConfirmUserId(null);
}
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
}
/**
* 查询报事报修统计
+ *
* @return
*/
@Override
@@ -81,6 +95,7 @@
/**
* 报事报修任务表 新增
+ *
* @param taskReportForRepairs
* @return
*/
@@ -93,23 +108,24 @@
taskEntity.setStatus(1);
taskEntity.setType(1);
taskEntity.setFrequency(3);
- if (null!=taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")){
+ if (null != taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")) {
taskEntity.setHouseCode(taskReportForRepairs.getAddressCode());
}
// 新增
boolean save = taskService.save(taskEntity);
- if (save){
+ if (save) {
taskReportForRepairs.setTaskId(taskEntity.getId());
taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
// 同时向web 端推送消息
- SSEServer.sendMessage("web:1","1");
+ SSEServer.sendMessage("web:1", "1");
}
return flag;
}
/**
* 报事报修任务表 自定义修改
+ *
* @param taskReportForRepairs
* @return
*/
@@ -124,6 +140,7 @@
/**
* 报事报修任务表 审核
+ *
* @param taskReportForRepairs
* @return
*/
@@ -149,8 +166,8 @@
}
@Override
- public Integer getStatistics(Long userId) {
- return baseMapper.getStatistics(userId);
+ public Integer getStatistics(Long userId, String neiCode) {
+ return baseMapper.getStatistics(userId, neiCode);
}
/**
@@ -168,28 +185,29 @@
@Override
public Object getReportForStatistics(String code, String roleType) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
- if (roleType.equals("1")) {
- Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1,null);
- Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,null);
- // result 总数 result1 已处理 result2 处理率 result3 公共维修 result4 居家维修 result5 矛盾纠纷 result6 投诉举报
- objectObjectHashMap.put("result", result);
- objectObjectHashMap.put("result1", result1);
- objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
- objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,1));
- objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,2));
- objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,3));
- objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,4));
+ if (roleType.equals("2")) {
+ Integer result1 = baseMapper.getReportForStatistics(code, null, null, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, null, 3, null, roleType);
+ objectObjectHashMap.put("result", result1);
+ objectObjectHashMap.put("result1", result);
+ objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
+ objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, null, null, 1, roleType));
+ objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, null, null, 2, roleType));
+ objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, null, null, 3, roleType));
+ objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null, 4, roleType));
} else {
- Integer result = baseMapper.getReportForStatistics(code, null, 1,null);
- Integer result1 = baseMapper.getReportForStatistics(code, null, null,null);
- objectObjectHashMap.put("result", result);
- objectObjectHashMap.put("result1", result1);
- objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
- objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code,null,null,1));
- objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, null, null,2));
- objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, null, null,3));
- objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null,4));
+ Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 3, null, roleType);
+ // result 总数 result1 已处理 result2 处理率 result3 公共维修 result4 居家维修 result5 矛盾纠纷 result6 投诉举报
+ objectObjectHashMap.put("result", result1);
+ objectObjectHashMap.put("result1", result);
+ objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
+ objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 1, roleType));
+ objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 2, roleType));
+ objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 3, roleType));
+ objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 4, roleType));
}
return objectObjectHashMap;
}
+
}
--
Gitblit v1.9.3