From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回

---
 src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java b/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
index 87c2eec..865b28f 100644
--- a/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
@@ -18,11 +18,22 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.modules.licetuser.entity.Licetuser;
+import org.springblade.modules.licetuser.service.ILicetuserService;
+import org.springblade.modules.permit.dto.PermitDTO;
+import org.springblade.modules.permit.dto.PermitRecordDTO;
 import org.springblade.modules.permit.entity.Permit;
 import org.springblade.modules.permit.mapper.PermitMapper;
 import org.springblade.modules.permit.service.IPermitService;
 import org.springblade.modules.permit.vo.PermitVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  *  服务实现类
@@ -33,9 +44,77 @@
 @Service
 public class PermitServiceImpl extends ServiceImpl<PermitMapper, Permit> implements IPermitService {
 
+	@Autowired
+	private ILicetuserService licetuserService;
+
 	@Override
-	public IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit) {
-		return page.setRecords(baseMapper.selectPermitPage(page, permit));
+	public IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit,String jurisdiction) {
+		return page.setRecords(baseMapper.selectPermitPage(page, permit,jurisdiction));
 	}
 
+	@Override
+	public Map selectIn(String cardid,String type) {
+		return baseMapper.selectIn(cardid,type);
+	}
+
+	@Override
+	public void insertPer(Permit permit) {
+		baseMapper.insertPer(permit);
+	}
+
+
+	/**
+	 * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
+	 * @param record
+	 * @return
+	 */
+	@Override
+	public PermitDTO getDetails(PermitDTO record) {
+		//查询公司信息
+		PermitDTO permitDTO = baseMapper.selectRecordDetail(record);
+		if (null !=permitDTO) {
+			//查询材料信息
+			Licetuser licetuser = new Licetuser();
+			licetuser.setUserid(record.getCardid());
+			licetuser.setPtype(record.getPtype());
+			List<Licetuser> licetusers = licetuserService.list(Condition.getQueryWrapper(licetuser));
+			//数据封装
+			permitDTO.setLicetusers(licetusers);
+			//返回数据
+			return permitDTO;
+		}
+		return null;
+	}
+
+	/**
+	 * 许可备案集合信息
+	 * @param record
+	 * @return
+	 */
+	@Override
+	public List<PermitRecordDTO> permitRecordList(PermitDTO record) {
+		//1.查询分公司,自招保安单位备案集合信息
+		List<PermitRecordDTO> recordDTOList = baseMapper.selectRecordList(record);
+		//2.查询保安服务公司,培训单位许可设立集合信息
+		List<PermitRecordDTO> permitRecordDTOList = baseMapper.selectPermitList(record);
+		//3.查询跨区域经营备案集合信息
+		List<PermitRecordDTO> recordkDTOList = baseMapper.selectRecordkList(record);
+		//4.查询保安单位法人变更集合信息
+		List<PermitRecordDTO> recordLegalpersonDTOList = baseMapper.selectRecordLegalpersonList(record);
+		//5. 合并集合信息
+		List<PermitRecordDTO> fileIdList = listIntegration(recordDTOList,permitRecordDTOList,recordkDTOList,recordLegalpersonDTOList);
+		//返回
+		return fileIdList;
+	}
+
+	/**
+	 * 合并集合
+	 * @param lists
+	 * @return
+	 */
+	private List<PermitRecordDTO> listIntegration(List<PermitRecordDTO> ...lists){
+		return Arrays.stream(lists).flatMap(List::stream).collect(Collectors.toList());
+	}
+
+
 }

--
Gitblit v1.9.3