update 报名中缴费中列表 1.新增【缴费状态】搜索条件

  2.新增【是否回访】字段及搜索条件

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -71,6 +71,9 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "声部更换详情",required = false)
     private SubjectChange subjectChange;
 
+    @ApiModelProperty(value = "回访次数",required = false)
+    private Integer visitNum;
+
     public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
         return kitGroupPurchaseTypeEnum;
     }
@@ -214,4 +217,12 @@ public class StudentApplyDetailDto{
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getVisitNum() {
+        return visitNum;
+    }
+
+    public void setVisitNum(Integer visitNum) {
+        this.visitNum = visitNum;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentRegistrationQueryInfo.java

@@ -21,7 +21,7 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "实际专业编号",required = false)
     private Integer actualSubjectId;
 
-    @ApiModelProperty(value = "学员缴费状态",required = false)
+    @ApiModelProperty(value = "学员缴费状态 0-未开启缴费 1-开启缴费 2-已缴费",required = false)
     private String paymentStatus;
 
     @ApiModelProperty(value = "用户名或手机号",required = false)
@@ -33,6 +33,9 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "入学年份",required = false)
     private String createYear;
 
+    @ApiModelProperty(value = "是否已回访",required = false)
+    private Boolean visited;
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -106,4 +109,12 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     public void setCurrentGrade(String currentGrade) {
         this.currentGrade = currentGrade;
     }
+
+    public Boolean getVisited() {
+        return visited;
+    }
+
+    public void setVisited(Boolean visited) {
+        this.visited = visited;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -288,6 +288,15 @@
             <if test="actualSubjectId != null">
                 AND sr.actual_subject_id_ = #{actualSubjectId}
             </if>
+            <if test="paymentStatus != null">
+                AND sr.payment_status_ = #{paymentStatus}
+            </if>
+            <if test="visited!= null and visited==true">
+                AND sv.num >0
+            </if>
+            <if test="visited!= null and visited==false">
+                AND sv.num IS NULL
+            </if>
             <if test="name != null">
                 AND (sr.name_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
             </if>
@@ -317,20 +326,27 @@
         <result column="id_" property="id"/>
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
+        <result column="visit_num_" property="visitNum"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
         SELECT sr.id_,sr.create_time_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,sr.current_grade_date_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
-        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_
+        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_,IFNULL(sv.num,0) visit_num_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
         LEFT JOIN `subject` ss ON sr.actual_subject_id_ = ss.id_
+        LEFT JOIN (
+            SELECT v.student_id_, COUNT(*) num FROM student_visit v WHERE v.music_group_id_ = #{musicGroupId} GROUP BY v.student_id_
+        ) sv ON sv.student_id_=sr.user_id_
         <include refid="queryStudentDetailPageSql"/>
         <include refid="global.limit"/>
     </select>
     <select id="queryStudentDetailCount" resultType="java.lang.Integer">
         SELECT COUNT(sr.id_) FROM student_registration sr
+        LEFT JOIN (
+            SELECT v.student_id_, COUNT(*) num FROM student_visit v WHERE v.music_group_id_ = #{musicGroupId} GROUP BY v.student_id_
+        ) sv on sv.student_id_=sr.user_id_
         <include refid="queryStudentDetailPageSql"/>
     </select>