更新

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Schema(description = "驾校人员-手机APP查询专用接口")
 @Data
@@ -55,4 +56,12 @@ public class DlDriveSchoolStaffVO {
     private String endTime;
     /**是否合格*/
     private String examStatus;
+    /**查询时间范围*/
+    private List<String> rangeTime;
+    /**地址*/
+    private String address;
+    /**年龄*/
+    private List<String> age;
+    /**拿证天数*/
+    private Integer passDays;
 }

dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml

@@ -98,6 +98,20 @@
           <if test="entity.examStatus!=null and entity.examStatus!=''">
               AND dsp.exam_status = #{entity.examStatus}
           </if>
+          <if test="entity.rangeTime!=null">
+              AND dsco.create_time BETWEEN #{entity.rangeTime[0]} AND #{entity.rangeTime[1]}
+          </if>
+          <if test="entity.address!=null and entity.address!=''">
+              AND main.address LIKE CONCAT('%',#{entity.address},'%')
+          </if>
+          <if test="entity.age!=null and entity.age!=''">
+              AND main.id_card IS NOT NULL
+              AND TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(main.id_card, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN #{entity.age[0]} AND #{entity.age[1]}
+          </if>
+          <if test="entity.passDays!=null and entity.passDays!=''">
+              AND dsco.pass_time IS NOT NULL
+             AND TIMESTAMPDIFF(DAY, dsco.create_time, dsco.pass_time)  = #{entity.passDays}
+          </if>
           GROUP BY
           main.id
           <choose>