From 7ecbb9875d55c5323b2eba09e987a815171335c8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 02 Feb 2024 23:59:18 +0800
Subject: [PATCH] 场所新增警务网格
---
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
index 1ca5cf3..505d5ff 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -22,6 +22,7 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
@@ -35,10 +36,12 @@
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
+import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -86,8 +89,8 @@
for (TaskPlaceRectificationVO taskPlaceRectificationVO : taskPlaceRectificationVOS) {
StringBuilder builder = new StringBuilder("");
List<PatrolRecordVO> patrolRecordVOList = taskPlaceRectificationVO.getPatrolRecordVOList();
- for (PatrolRecordVO patrolRecordVO : patrolRecordVOList) {
- builder.append(patrolRecordVO.getItemsName()).append(";");
+ for (int i = 0; i < patrolRecordVOList.size(); i++) {
+ builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
}
taskPlaceRectificationVO.setHiddenDanger(builder.toString());
}
@@ -119,7 +122,7 @@
ITaskService bean = SpringUtils.getBean(ITaskService.class);
boolean update = bean.update(Wrappers.<TaskEntity>lambdaUpdate()
.set(TaskEntity::getStatus, taskPlaceRectification.getStatus())
- .set(TaskEntity::getRemark,taskPlaceRectification.getReasonFailure())
+ .set(TaskEntity::getRemark, taskPlaceRectification.getReasonFailure())
.eq(TaskEntity::getId, taskPlaceRectification.getTaskId()));
// 更新任务详情状态
boolean b1 = updateById(taskPlaceRectification);
@@ -127,7 +130,7 @@
}
@Override
- public Object rectificationStatistics() {
+ public Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
// 统计九小场所类型隐患统计
@@ -137,9 +140,17 @@
.eq(Region::getRegionLevel, 4));
List<RegionVO> copy = BeanUtil.copy(list, RegionVO.class);
for (RegionVO regionVO : copy) {
- List<Map<String, Integer>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionChildCodesList, isAdministrator);
+ List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(), regionChildCodesList, isAdministrator,taskPlaceRectification);
regionVO.setNineTypeStatistics(nineTypeStatistics);
}
return copy;
}
+
+ @Override
+ public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
+ List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO,regionChildCodesList,isAdministrator);
+ return export;
+ }
}
--
Gitblit v1.9.3