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/TaskReportForRepairsServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 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 ba1e0fa..d0ac5cd 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
@@ -19,7 +19,9 @@
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.mapper.TaskReportForRepairsMapper;
@@ -31,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.*;
/**
* 报事报修任务表 服务实现类
@@ -64,6 +65,8 @@
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));
@@ -101,6 +104,8 @@
taskReportForRepairs.setTaskId(taskEntity.getId());
taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
+ // 同时向web 端推送消息
+ SSEServer.sendMessage("web:1","1");
}
return flag;
}
@@ -149,4 +154,44 @@
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("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), 2, 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 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), 2, 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