From 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 17:16:27 +0800
Subject: [PATCH] 投票人员查询优化

---
 src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 7988dee..c3d445b 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -16,31 +16,43 @@
  */
 package org.springblade.modules.place.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.util.FileUtil;
+import org.apache.logging.log4j.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springblade.common.cache.SysCache;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.DictConstant;
+import org.springblade.common.param.CommonParamSet;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.grid.service.IGridService;
 import org.springblade.modules.patrol.entity.PatrolRecord;
 import org.springblade.modules.patrol.service.IPatrolRecordService;
 import org.springblade.modules.place.dto.PlaceCheckDTO;
 import org.springblade.modules.place.entity.PlaceCheckEntity;
+import org.springblade.modules.place.excel.NinePlaceExcel;
+import org.springblade.modules.place.excel.PlaceCheckExcel;
 import org.springblade.modules.place.service.IPlaceService;
 import org.springblade.modules.place.vo.PlaceCheckVO;
 import org.springblade.modules.place.mapper.PlaceCheckMapper;
 import org.springblade.modules.place.service.IPlaceCheckService;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IRegionService;
 import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
 import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
 import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -58,7 +70,13 @@
 
 	@Override
 	public IPage<PlaceCheckVO> selectPlaceCheckPage(IPage<PlaceCheckVO> page, PlaceCheckVO placeCheck) {
-		List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page, placeCheck);
+		// 公共参数设置
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceCheckVO.class,placeCheck);
+		List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page,
+			placeCheck,
+			commonParamSet.getIsAdministrator(),
+			commonParamSet.getRegionChildCodesList(),
+			commonParamSet.getGridCodeList());
 		for (PlaceCheckVO placeCheckVO : placeCheckVOS) {
 			int number = 0;
 			for (PatrolRecord patrolRecord : placeCheckVO.getPatrolRecordVOList()) {
@@ -145,4 +163,20 @@
 	public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO) {
 		return this.baseMapper.selectPlaceCheckList(placeCheckDTO);
 	}
+
+	/**
+	 * 导出场所检查信息
+	 * @param placeCheck
+	 */
+	@Override
+	public List<PlaceCheckExcel> exportPlaceCheck(PlaceCheckVO placeCheck) {
+		// 公共参数设置
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceCheckVO.class,placeCheck);
+		List<PlaceCheckExcel> placeCheckVOS = baseMapper.selectPlaceCheckListExcel(placeCheck,
+			commonParamSet.getIsAdministrator(),
+			commonParamSet.getRegionChildCodesList(),
+			commonParamSet.getGridCodeList());
+		// 返回
+		return placeCheckVOS;
+	}
 }

--
Gitblit v1.9.3