From aa237538c7e5f71f92372cc6deda1b1fac2e79e5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 10:48:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 9dc867f..db6077d 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
@@ -21,6 +21,7 @@
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.mapper.TaskReportForRepairsMapper;
@@ -32,9 +33,8 @@
import org.springframework.stereotype.Service;
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.*;
/**
* 报事报修任务表 服务实现类
@@ -102,6 +102,8 @@
taskReportForRepairs.setTaskId(taskEntity.getId());
taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
+ // 同时向web 端推送消息
+ SSEServer.sendMessage("web:1","1");
}
return flag;
}
@@ -153,6 +155,7 @@
/**
* 更新状态--临时接口
+ *
* @param gridman
* @return
*/
@@ -161,4 +164,32 @@
baseMapper.updateView(gridman);
return true;
}
+
+ @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));
+ } 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));
+ }
+ return objectObjectHashMap;
+ }
}
--
Gitblit v1.9.3