导出修改

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/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -309,11 +309,12 @@
 	<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.sub_course_num_ > 0,1,0)) as subCourseNum,
+			sum(if(t.sub_give_course_num_ > 0,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_

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

@@ -922,12 +922,12 @@
             concat(#{params.monday},'至', #{params.sunday}) 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_,

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 = ["编号","姓名","乐团名称","分部","服务周期","服务指标总数","已布置","已提交数","点评数","出勤率","达标率"]