fix:人员抽检excel导出被抽检人员

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<PoliceVo> data  =  samplingService.getSamplingPolice(vo);
+        List<SamplingPoliceDto> list = samplingMapper.selectPoliceByIdCode(vo);
-        List<SamplingPoliceDto> list = data.stream().map(item -> {
+        String excelName ="人员抽检名单";
-            SamplingPoliceDto exportGabVo = new SamplingPoliceDto();
-            BeanUtil.copyProperties(item, exportGabVo);
-            return exportGabVo;
-        }).toList();
-        String excelName = StrUtil.isNotBlank( vo.getSamplingName())?vo.getSamplingName():"人员抽检规则";
         String headerValue = "attachment; filename=\"" + URLEncoder.encode(excelName+".xlsx", "UTF-8") + "\"";
         response.setHeader("Content-Disposition", headerValue);
         response.setContentType("application/octet-stream");

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<Sampling> {
 
     List<PoliceVo> selectPoliceDataLead(SamplingVo vo);
 
+    List<SamplingPoliceDto> selectPoliceByIdCode(SamplingVo vo);
+
 }

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;
 

src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java

@@ -85,6 +85,9 @@ public class SamplingVo {
     //抽检id
     private List<String> policeCodes;
 
+    //导出抽检人员使用
+    private  List<String> policeVos;
+
     @Getter
     @Setter
     public static class SamplingObject{

src/main/resources/mapper/SamplingMapper.xml

@@ -14,6 +14,7 @@
 
     <select id="selectPoliceData" resultType="com.biutag.supervision.pojo.vo.PoliceVo" parameterType="com.biutag.supervision.pojo.vo.SamplingVo">
         SELECT
+        sup.id,
         sup.name,
         sup.id_code as idCode,
         sdp.short_name as shortName,
@@ -86,6 +87,7 @@
 
     <select id="selectPoliceDataLead" resultType="com.biutag.supervision.pojo.vo.PoliceVo" parameterType="com.biutag.supervision.pojo.vo.SamplingVo">
         SELECT
+        sup.id,
         sup.`name`,
         sup.emp_no as empNo,
         sup.id_code as idCode,
@@ -147,7 +149,7 @@
         <if test=" ageMax != null  and ageMax != 0 ">
             and (age &lt; #{ageMax} and age &gt; #{ageMin})
         </if>
-        <if test="policeCodes != null and policeCodes.length > 0">
+        <if test="policeCodes != null ">
             and idCode in
             <foreach collection="policeCodes" item="code" open="(" separator="," close=")">
                 #{code}
@@ -155,4 +157,25 @@
         </if>
         order by RAND()
     </select>
+
+    <select id="selectPoliceByIdCode" resultType="com.biutag.supervision.pojo.dto.SamplingPoliceDto">
+        SELECT
+            a.emp_no,
+            a.`name`,
+            b.short_name
+        FROM
+            sup_police a
+                LEFT JOIN sup_depart b
+                          on a.org_id = b.id
+        <where>
+            a.del =0
+            <if test="policeVos != null ">
+             and a.id_code in
+                <foreach collection="policeVos" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
 </mapper>