From 26e412c4417bd4cfa9f8a9f193d26fba584ecdf6 Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 31 Jul 2025 17:10:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=BA=E5=91=98=E6=8A=BD=E6=A3=80excel?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A2=AB=E6=8A=BD=E6=A3=80=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobileSupervision/SamplingController.java | 16 ++++++------ .../supervision/mapper/SamplingMapper.java | 3 +++ .../biutag/supervision/pojo/vo/PoliceVo.java | 2 ++ .../supervision/pojo/vo/SamplingVo.java | 3 +++ src/main/resources/mapper/SamplingMapper.xml | 25 ++++++++++++++++++- 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java index fa2b297..03506a8 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java @@ -3,14 +3,18 @@ package com.biutag.supervision.controller.mobileSupervision; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.mapper.SamplingMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.SamplingPoliceDto; +import com.biutag.supervision.pojo.entity.SupPolice; import com.biutag.supervision.pojo.param.SamplingQueryParam; import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo; import com.biutag.supervision.pojo.vo.PoliceVo; import com.biutag.supervision.pojo.vo.SamplingVo; import com.biutag.supervision.service.SamplingService; +import com.biutag.supervision.service.SupPoliceService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -27,6 +31,9 @@ public class SamplingController { private final SamplingService samplingService; + private final SupPoliceService policeService; + + private final SamplingMapper samplingMapper; /** * 分页查询 * */ @@ -85,13 +92,8 @@ public class SamplingController { if(StrUtil.isNotBlank(vo.getOrgStr())){ vo.setOrgIds(List.of(vo.getOrgStr().split(","))); } - List data = samplingService.getSamplingPolice(vo); - List list = data.stream().map(item -> { - SamplingPoliceDto exportGabVo = new SamplingPoliceDto(); - BeanUtil.copyProperties(item, exportGabVo); - return exportGabVo; - }).toList(); - String excelName = StrUtil.isNotBlank( vo.getSamplingName())?vo.getSamplingName():"人员抽检规则"; + List list = samplingMapper.selectPoliceByIdCode(vo); + String excelName ="人员抽检名单"; String headerValue = "attachment; filename=\"" + URLEncoder.encode(excelName+".xlsx", "UTF-8") + "\""; response.setHeader("Content-Disposition", headerValue); response.setContentType("application/octet-stream"); diff --git a/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java index 0e5d72f..4c7ed2d 100644 --- a/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.dto.SamplingPoliceDto; import com.biutag.supervision.pojo.entity.Sampling; import com.biutag.supervision.pojo.vo.PoliceVo; import com.biutag.supervision.pojo.vo.SamplingVo; @@ -20,4 +21,6 @@ public interface SamplingMapper extends BaseMapper { List selectPoliceDataLead(SamplingVo vo); + List selectPoliceByIdCode(SamplingVo vo); + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java b/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java index f244ad7..4cc5acb 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java @@ -7,6 +7,8 @@ import lombok.Setter; @Setter public class PoliceVo { + private String id; + //警员姓名 private String name; diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java index 64e524a..3fa77bc 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java @@ -85,6 +85,9 @@ public class SamplingVo { //抽检id private List policeCodes; + //导出抽检人员使用 + private List policeVos; + @Getter @Setter public static class SamplingObject{ diff --git a/src/main/resources/mapper/SamplingMapper.xml b/src/main/resources/mapper/SamplingMapper.xml index e9790a3..3779447 100644 --- a/src/main/resources/mapper/SamplingMapper.xml +++ b/src/main/resources/mapper/SamplingMapper.xml @@ -14,6 +14,7 @@ SELECT + sup.id, sup.`name`, sup.emp_no as empNo, sup.id_code as idCode, @@ -147,7 +149,7 @@ and (age < #{ageMax} and age > #{ageMin}) - + and idCode in #{code} @@ -155,4 +157,25 @@ order by RAND() + +