From 7a867acb6c49c5d4774bdfa6be83043017176e39 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 10:55:39 +0800
Subject: [PATCH] 导出优化
---
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 ef9d14f..98609f3 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
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
@@ -26,6 +27,7 @@
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
+import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IDeptService;
@@ -36,10 +38,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;
@@ -128,7 +132,7 @@
}
@Override
- public Object rectificationStatistics() {
+ public Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
// 统计九小场所类型隐患统计
@@ -138,15 +142,42 @@
.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, taskPlaceRectification);
regionVO.setNineTypeStatistics(nineTypeStatistics);
}
return copy;
}
@Override
- public List<HouseExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO) {
- List<HouseExcel> houseExcels = null; //baseMapper.export(taskPlaceRectificationVO);
- return houseExcels;
+ 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);
+ IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
+ List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
+ for (TaskPlaceRectificationExcel taskPlaceRectificationExcel : export) {
+ for (DictBiz dictBiz : nineType) {
+ if (StringUtils.isNotBlank(taskPlaceRectificationExcel.getNineType()) && taskPlaceRectificationExcel.getNineType().equals(dictBiz.getDictKey())) {
+ taskPlaceRectificationExcel.setNineType(dictBiz.getDictValue());
+ }
+ }
+ if (taskPlaceRectificationExcel.getRectificationFlag().equals(1)) {
+ taskPlaceRectificationExcel.setRectificationFlag("否");
+ } else {
+ taskPlaceRectificationExcel.setRectificationFlag("是");
+ }
+ if (taskPlaceRectificationExcel.getRectificationNoticeFlag().equals(1)) {
+ taskPlaceRectificationExcel.setRectificationNoticeFlag("否");
+ } else {
+ taskPlaceRectificationExcel.setRectificationNoticeFlag("是");
+ }
+ StringBuilder builder = new StringBuilder("");
+ List<PatrolRecordVO> patrolRecordVOList = taskPlaceRectificationExcel.getPatrolRecordVOList();
+ for (int i = 0; i < patrolRecordVOList.size(); i++) {
+ builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
+ }
+ taskPlaceRectificationExcel.setHiddenDanger(builder.toString());
+ }
+ return export;
}
}
--
Gitblit v1.9.3