Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -25,6 +25,10 @@ public class ExportStudentSubCourse {
      * 剩余排课资格
      */
     private Integer subCourseNum;
+    /**
+     * 剩余赠送排课资格
+     */
+    private Integer subGiveCourseNum;
 
     public Integer getUserId() {
         return userId;
@@ -73,4 +77,12 @@ public class ExportStudentSubCourse {
     public void setSubCourseNum(Integer subCourseNum) {
         this.subCourseNum = subCourseNum;
     }
+
+    public Integer getSubGiveCourseNum() {
+        return subGiveCourseNum;
+    }
+
+    public void setSubGiveCourseNum(Integer subGiveCourseNum) {
+        this.subGiveCourseNum = subGiveCourseNum;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -91,7 +91,7 @@ public class StudentRegistration extends BaseEntity {
     @ApiModelProperty(value = "生日", required = false)
     private Date birthdate;
 
-    @ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）", required = false)
+    @ApiModelProperty(value = "缴费状态（2-已缴费 1-开启缴费 0-未交费）", required = false)
     private PaymentStatusEnum paymentStatus;
 
     @ApiModelProperty(value = "用户所在乐团状态）",required = false)

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

@@ -309,17 +309,18 @@
 	<select id="exportStudentSubCourse" resultType="com.ym.mec.biz.dal.dto.ExportStudentSubCourse">
 		select
 			t.user_id_ as userId,
-			ifnull(su.real_name_,su.username_) as username,
+			su.username_ as username,
 			t.activity_id_ as activityId,
 			o.name_ as organizationName,
 			vga.name_ as activityName,
-			sum(ifnull(t.sub_course_num_,0) + ifnull(sub_give_course_num_,0)) as subCourseNum
+			sum(if(t.vip_flag_ = 1 || t.practice_flag_ = 1 ,1,0)) as subCourseNum,
+			sum(if(t.give_vip_flag_ = 1 || t.give_practice_flag_ = 1,1,0)) as subGiveCourseNum
 		from activity_user_mapper t
 				 left join vip_group_activity vga on t.activity_id_ = vga.id_
 				 left join sys_user su on t.user_id_ = su.id_
 				 left join organization o on su.organ_id_ = o.id_
-		where t.tenant_id_ = #{tenantId}
-		and (t.sub_course_num_>0 or t.sub_give_course_num_>0)
+		where t.tenant_id_ = #{tenantId} and t.return_fee_ = 0
+		and (t.vip_flag_ = 1 or t.give_vip_flag_ = 1 or t.practice_flag_ = 1 or t.give_practice_flag_ = 1)
 		<if test="organId != null">
 			AND FIND_IN_SET(su.organ_id_,#{organId})
 		</if>

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

@@ -919,15 +919,15 @@
         select
             t.student_id_,
             t.music_group_name_,
-            concat(#{params.monday},'至', #{params.sunday}) as serve_period_,
+            concat(#{params.startTime},'至', #{params.endTime}) as serve_period_,
             t.username_,
             t.organ_name_,
-            sees.serve_num_,
-            sees.actual_exercises_num_,
-            sees.exercises_reply_num_,
-            sees.exercises_message_num_,
-            a.sign_rate_,
-            a.pass_rate_
+            ifnull(sees.serve_num_,0) as serve_num_,
+            ifnull(sees.actual_exercises_num_,0) as actual_exercises_num_,
+            ifnull(sees.exercises_reply_num_,0) as exercises_reply_num_,
+            ifnull(sees.exercises_message_num_,0) as exercises_message_num_,
+            ifnull(a.sign_rate_,0) as sign_rate_,
+            ifnull(a.pass_rate_,0) as pass_rate_
         from (
             select
                 a.user_id_ as student_id_,
@@ -938,7 +938,7 @@
             left join music_group b on a.music_group_id_ = b.id_
             left join sys_user u ON a.user_id_ = u.id_
             LEFT JOIN organization organ ON organ.id_=u.organ_id_ and organ.del_flag_ = 0
-            where payment_status_ = 1 and b.status_ = 'PROGRESS'
+            where payment_status_ = 2 and b.status_ = 'PROGRESS'
             <if test="params.tenantId != null and params.tenantId > 0">
                 AND a.tenant_id_ = #{params.tenantId}
             </if>
@@ -961,11 +961,11 @@
                 <if test="params.tenantId != null and params.tenantId > 0">
                     AND sees.tenant_id_ = #{params.tenantId}
                 </if>
-                <if test="params.monday != null and params.monday != ''">
-                    AND DATE_FORMAT(sees.monday_, '%Y-%m-%d') &gt;= #{params.monday}
+                <if test="params.startTime != null and params.startTime != ''">
+                    AND DATE_FORMAT(sees.monday_, '%Y-%m-%d') &gt;= #{params.startTime}
                 </if>
-                <if test="params.sunday != null and params.sunday != ''">
-                    AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d') &lt;= #{params.sunday}
+                <if test="params.endTime != null and params.endTime != ''">
+                    AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d') &lt;= #{params.endTime}
                 </if>
                 <if test="params.organId != null and params.organId != ''">
                     AND FIND_IN_SET(u.organ_id_,#{params.organId})
@@ -983,15 +983,17 @@
             left join sys_user u ON cssp.user_id_ = u.id_
             left join student_attendance sa on cssp.user_id_ = sa.user_id_ and cs.id_ = sa.course_schedule_id_
             <where>
-                cs.group_type_ = 'MUSIC' and cs.id_ is not null
+                cs.del_flag_ = 0 and cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND cs.organ_id_ IS NOT NULL and cs.id_ is not null
+                and cs.group_type_ = 'MUSIC'
+                and (cs.new_course_id_ is null or cs.id_ = cs.new_course_id_)
                 <if test="params.tenantId != null and params.tenantId > 0">
                     AND cs.tenant_id_ = #{params.tenantId}
                 </if>
-                <if test="params.monday != null and params.monday != ''">
-                    AND DATE_FORMAT(cs.start_class_time_, '%Y-%m-%d') &gt;= #{params.monday}
+                <if test="params.startTime != null and params.startTime != ''">
+                    AND DATE_FORMAT(cs.start_class_time_, '%Y-%m-%d') &gt;= #{params.startTime}
                 </if>
-                <if test="params.sunday != null and params.sunday != ''">
-                    AND DATE_FORMAT(cs.end_class_time_, '%Y-%m-%d') &lt;= #{params.sunday}
+                <if test="params.endTime != null and params.endTime != ''">
+                    AND DATE_FORMAT(cs.end_class_time_, '%Y-%m-%d') &lt;= #{params.endTime}
                 </if>
                 <if test="params.organId != null and params.organId != ''">
                     AND FIND_IN_SET(u.organ_id_,#{params.organId})

mec-web/src/main/resources/columnMapper.ini

@@ -89,8 +89,9 @@ ID = id
 活动编号 = activityId
 活动名称 = activityName
 剩余排课资格 = subCourseNum
+剩余赠送排课资格 = subGiveCourseNum
 
-[乐团学生指标导出]
+[乐团学生服务指标导出]
 编号 = userId
 姓名 = username
 乐团名称 = musicGroupName

mec-web/src/main/resources/exportColumnMapper.ini

@@ -283,8 +283,8 @@ headColumns = ["分部","老师编号","老师姓名","预计安排(人次)","
 fieldColumns = ["organName","teacherId","teacherName","expectExercisesNum","actualExercisesNum", "100 * actualExercisesNum / expectExercisesNum","exercisesReplyNum","exercisesMessageNum", "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum","100 * exercisesMessageTimelyNum / exercisesReplyNum"]
 
 [活动资格导出]
-headColumns = ["分部","学员编号","学员姓名","活动编号","活动名称","剩余排课资格"]
-fieldColumns = ["organizationName","userId","username","activityId","activityName", "subCourseNum"]
+headColumns = ["分部","学员编号","学员姓名","活动编号","活动名称","剩余排课资格","剩余赠送排课资格"]
+fieldColumns = ["organizationName","userId","username","activityId","activityName", "subCourseNum","subGiveCourseNum"]
 
 [乐团学生服务指标导出]
 headColumns = ["编号","姓名","乐团名称","分部","服务周期","服务指标总数","已布置","已提交数","点评数","出勤率","达标率"]