访客记录导出新增校区筛选字段

src/main/java/com/template/api/WelcomeVisitorControllerAPI.java

@@ -62,5 +62,5 @@ public interface WelcomeVisitorControllerAPI {
 
     @GetMapping("admin/export")
     @ApiOperation(value = "导出访客记录")
-    void export();
+    void export(WelcomeVisitorQuery visitorQuery);
 }

src/main/java/com/template/controller/WelcomeVisitorController.java

@@ -86,7 +86,7 @@ public class WelcomeVisitorController implements WelcomeVisitorControllerAPI {
     }
 
     @Override
-    public void export() {
-        welcomeVisitorService.export();
+    public void export(WelcomeVisitorQuery visitorQuery) {
+        welcomeVisitorService.export(visitorQuery);
     }
 }

src/main/java/com/template/model/query/WelcomeVisitorQuery.java

@@ -18,4 +18,7 @@ public class WelcomeVisitorQuery extends PageQuery {
 
     @ApiModelProperty(value = "访客姓名，模糊搜索")
     private String name;
+
+    @ApiModelProperty(value = "校区名称")
+    private String school;
 }

src/main/java/com/template/model/vo/WelcomeVisitorVO.java

@@ -27,18 +27,10 @@ public class WelcomeVisitorVO implements Serializable {
     @ExcelProperty("访客姓名")
     private String name;
 
-    @ApiModelProperty(value = "司机姓名")
-    @ExcelProperty("司机姓名")
-    private String driverName;
-
     @ApiModelProperty(value = "访客手机号")
     @ExcelProperty("访客手机号")
     private String phone;
 
-    @ApiModelProperty(value = "证件号")
-    @ExcelProperty("证件号")
-    private String cardId;
-
     @ApiModelProperty(value = "校区id")
     @ExcelIgnore
     private String schoolId;

src/main/java/com/template/services/WelcomeVisitorService.java

@@ -65,7 +65,7 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
     /**
      * 导出访客记录
      */
-    void export();
+    void export(WelcomeVisitorQuery visitorQuery);
 
     Integer countTotal(LocalDateTime start, LocalDateTime end);
 

src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -3,7 +3,6 @@ package com.template.services.impl;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.format.DatePrinter;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
@@ -224,9 +223,10 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     }
 
     @Override
-    public void export() {
+    public void export(WelcomeVisitorQuery visitorQuery) {
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(WelcomeVisitor::getId);
+        wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
         List<WelcomeVisitor> welcomeVisitors = list(wrapper);
 
         List<WelcomeVisitorVO> welcomeVisitorVOS = BeanUtil.copyListProperties(welcomeVisitors, WelcomeVisitorVO::new);