From 6c68c4fce2c2203ba34dcb9d75f138393ed15e35 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 27 Dec 2023 10:19:23 +0800
Subject: [PATCH] 报事报修步骤和评分表
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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..98671b1 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
@@ -17,14 +17,18 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.common.utils.SpringUtils;
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.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;
+import org.springblade.modules.task.service.ITaskRepairStepService;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
@@ -51,6 +55,9 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义分页
*
@@ -60,11 +67,20 @@
*/
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ taskReportForRepairs.setRegionCode(dept.getRegionCode());
+ }
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());
+ } else if (taskReportForRepairs.getRoleName().equals("物业")) {
+ taskReportForRepairs.setRegionCode("");
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
}
}
return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
@@ -149,8 +165,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 +184,46 @@
@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);
+ 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, 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));
+ 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);
+ 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,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));
+ 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;
}
+
+ /**
+ * 移交
+ *
+ * @param taskReportForRepairsVO
+ * @return
+ */
+ @Override
+ public Boolean transfer(TaskReportForRepairsVO taskReportForRepairsVO) {
+ // 记录移交记录
+ boolean save = SpringUtils.getBean(ITaskRepairStepService.class).save(taskReportForRepairsVO.getTaskRepairStepEntity());
+ if (save) {
+ taskReportForRepairsVO.setConfirmFlag(2);
+ boolean save1 = save(taskReportForRepairsVO);
+ return save1;
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3