From d0b0e00e40226700a0ffa1f1671a8dc273610f67 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 14:28:10 +0800
Subject: [PATCH] 菜单分类优化
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 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..4bf1d63 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,24 +16,25 @@
*/
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.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.sse.server.SSEServer;
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;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 报事报修任务表 服务实现类
@@ -60,10 +61,12 @@
@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());
+ } else if(taskReportForRepairs.getRoleName().equals("居民")){
+ taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
}
}
return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
@@ -99,7 +102,10 @@
boolean save = taskService.save(taskEntity);
if (save){
taskReportForRepairs.setTaskId(taskEntity.getId());
+ taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
+ // 同时向web 端推送消息
+ SSEServer.sendMessage("web:1","1");
}
return flag;
}
@@ -143,4 +149,49 @@
// 返回
return flag;
}
+
+ @Override
+ public Integer getStatistics(Long userId) {
+ return baseMapper.getStatistics(userId);
+ }
+
+ /**
+ * 更新状态--临时接口
+ *
+ * @param gridman
+ * @return
+ */
+ @Override
+ public boolean updateView(GridmanEntity gridman) {
+ baseMapper.updateView(gridman);
+ return true;
+ }
+
+ @Override
+ public Object getReportForStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ if (roleType.equals("1")) {
+ Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,null);
+ Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1,null);
+ // 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), 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));
+ } else {
+ Integer result1 = baseMapper.getReportForStatistics(code, null, null,null);
+ Integer result = baseMapper.getReportForStatistics(code, null, 1,null);
+ objectObjectHashMap.put("result", result1);
+ objectObjectHashMap.put("result1", result);
+ 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));
+ }
+ return objectObjectHashMap;
+ }
}
--
Gitblit v1.9.3