From 6c2a489b7ddcfb971e463da944bc36b3563e2988 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 02 Feb 2024 17:06:23 +0800
Subject: [PATCH] 隐患场所统计
---
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 a406943..ef9d14f 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;
@@ -86,8 +87,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 +120,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);
@@ -137,9 +138,15 @@
.eq(Region::getRegionLevel, 4));
List<RegionVO> copy = BeanUtil.copy(list, RegionVO.class);
for (RegionVO regionVO : copy) {
- List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(),regionChildCodesList, isAdministrator);
+ List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(), regionChildCodesList, isAdministrator);
regionVO.setNineTypeStatistics(nineTypeStatistics);
}
return copy;
}
+
+ @Override
+ public List<HouseExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO) {
+ List<HouseExcel> houseExcels = null; //baseMapper.export(taskPlaceRectificationVO);
+ return houseExcels;
+ }
}
--
Gitblit v1.9.3