新生基础信息调整

src/main/java/com/xjrsoft/module/student/dto/BaseNewStudentPageDto.java

@@ -77,4 +77,19 @@ public class BaseNewStudentPageDto extends PageInput {
 
     @ApiModelProperty("学生来源")
     private String source;
+
+    @ApiModelProperty("是否可以分班（0：否，1：是）")
+    private Integer isCanBanding;
+
+    @ApiModelProperty("分班类型(1:自动分班 2:手动分班)")
+    private Integer operateMode;
+
+    @ApiModelProperty("缴费状态(已缴费、未缴费)")
+    private String paymnystate;
+
+    @ApiModelProperty("应届生、往届生")
+    private String previous;
+
+    @ApiModelProperty("户籍所在地")
+    private String city;
 }

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -58,6 +58,27 @@
         <if test="dto.enrollmentPlanId != null">
             AND t1.enrollment_plan_id = #{dto.enrollmentPlanId}
         </if>
+
+        <if test="dto.isCanBanding != null">
+            and t1.is_can_banding = #{dto.isCanBanding}
+        </if>
+        <if test="dto.operateMode != null">
+            and t1.operate_mode = #{dto.operateMode}
+        </if>
+        <if test="dto.paymnystate != null and dto.paymnystate != ''">
+            AND t1.paymnystate = #{dto.paymnystate}
+        </if>
+        <if test="dto.previous != null and dto.previous != ''">
+            AND t1.previous = #{dto.previous}
+        </if>
+        <if test="dto.city != null and dto.city != ''">
+            AND (
+                t1.province like concat('%', #{dto.paymnystate}, '%')
+                or t1.city like concat('%', #{dto.paymnystate}, '%')
+                or t1.myarea like concat('%', #{dto.paymnystate}, '%')
+                )
+        </if>
+
         <if test="dto.treeId != null and dto.treeType != null">
             <if test="dto.treeType == 1">
                 AND t4.grade_id = #{dto.treeId}