Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into mall_order_export

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

@@ -38,14 +38,16 @@ public class StudentStatistics {
 	/** 已完成课时（已结束课时数） */
 	private Integer overCourseNum;
 
-	@ApiModelProperty(value = "剩余课时",required = false)
-	/** 剩余课时（未开始课时数） */
+	@ApiModelProperty(value = "未开始课时数",required = false)
 	private Integer subCourseNum;
 
 	@ApiModelProperty(value = "未排课时",required = false)
 	/** 未排课时（未排课时总数） */
 	private Integer noScheduleNum;
 
+	@ApiModelProperty(value = "未开始+未排课资格",required = false)
+	private Integer subTotalCourse;
+
 	@ApiModelProperty(value = "第一次课时间",required = false)
 	/** 第一次课时间 */
 	private String firstCourseTime;
@@ -103,6 +105,14 @@ public class StudentStatistics {
 	@ApiModelProperty(value = "课程组类型（VIP,THEORY,PRACTICE）",required = false)
 	private String groupType;
 
+	public Integer getSubTotalCourse() {
+		return subTotalCourse;
+	}
+
+	public void setSubTotalCourse(Integer subTotalCourse) {
+		this.subTotalCourse = subTotalCourse;
+	}
+
 	public BigDecimal getPreCourseFee() {
 		return preCourseFee;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2775,12 +2775,12 @@ public class ExportServiceImpl implements ExportService {
         List<StudentStatisticsDto> rows = studentStatisticsService.queryStatisticsPage(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学生姓名", "学员编号", "联系电话", "声部", "学校", "年级", "学员状态", "未排课时", "总课时", "已完成课时",
-                            "剩余课时", "预收金额", "第一次课时间", "最近上课时间", "指导老师编号", "指导老师", "乐团主管编号", "乐团主管", "声部课老师编号", "声部课老师", "近30天课耗", "回访次数",
+                            "剩余未开始课时","剩余课时(未开始+未排课资格)", "预收金额", "第一次课时间", "最近上课时间", "指导老师编号", "指导老师", "乐团主管编号", "乐团主管", "声部课老师编号", "声部课老师", "近30天课耗", "回访次数",
                             "回访状态", "原因", "回访日期"},
                     new String[]{"studentBasicInfo.organName", "studentBasicInfo.userName", "studentBasicInfo.userId",
                             "studentBasicInfo.phone", "studentBasicInfo.subjectName", "studentBasicInfo.cooperationOrganName", "studentBasicInfo.grade",
                             "studentBasicInfo.studentStatus",
-                            "noScheduleNum", "totalCourseNum", "overCourseNum", "subCourseNum", "preCourseFee", "firstCourseTime", "lastCourseTime", "teacherId", "teacherName", "musicDirectorId", "musicDirectorName",
+                            "noScheduleNum", "totalCourseNum", "overCourseNum", "subCourseNum",  "subTotalCourse", "preCourseFee", "firstCourseTime", "lastCourseTime", "teacherId", "teacherName", "musicDirectorId", "musicDirectorName",
                             "studentBasicInfo.subjectTeacherId", "studentBasicInfo.subjectTeacherName", "latelyCourseConsumer", "visitNum",
                             "lastVisitStatus == null?'':lastVisitStatus == 'LOST' ? '流失':lastVisitStatus == 'THINKING' ? '考虑中':" +
                                     "lastVisitStatus == 'PENDING_PAYMENT' ? '确认缴费待缴费':lastVisitStatus == 'PAUSE' ? '暂停':lastVisitStatus == 'OTHER' ? '其他':''"

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentStatisticsServiceImpl.java

@@ -51,22 +51,28 @@ public class StudentStatisticsServiceImpl extends BaseServiceImpl<Integer, Stude
 			}
 			//更新未排课总数
 			studentStatisticsDao.updateNoCourseNum();
+		}else if (num == 2){
 			//更新未开始价值总和
 			studentStatisticsDao.updateNotStartCourseFee();
+		}else if (num == 3){
 			//更新未排课价值
 			studentStatisticsDao.updateNoCourseFee();
-		}else if (num == 2){
+		}else if (num == 4){
 			//更新第一次课的时间\最近一次课时间
 			studentStatisticsDao.updateFirstAndLastCourseTime();
+		}else if (num == 5){
 			//更新进行中课程组数量
 			studentStatisticsDao.updateNormalGroupNum();
+		}else if (num == 6){
 			//更新总课时数、已完成、剩余课时数、最近30天课耗、最近1年课耗
 			studentStatisticsDao.updateCourseNum();
-		} else if (num == 3) {
+		}else if (num == 7){
 			//更新声部班老师
 			studentBasicInfoDao.updateSubjectTeacher();
+		}else if (num == 8){
 			//更新乐团主管、指导老师
 			studentStatisticsDao.updateTeacherAndEdu();
+		} else if (num == 9) {
 			//更新第一次付费时间
 			studentStatisticsDao.updateFirstOrderTime();
 			num = 0;

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

@@ -32,6 +32,7 @@
 		<result column="last_order_time_" property="lastOrderTime" />
 		<result column="order_num_" property="orderNum" />
 		<result column="group_type_" property="groupType" />
+		<result column="subTotalCourse" property="subTotalCourse" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -330,6 +331,7 @@
 	</select>
 	<select id="queryStatistics" resultMap="StudentStatisticsDto">
 		SELECT *,ss.not_start_course_fee_ + ss.no_course_fee_ preCourseFee,
+		ss.no_schedule_num_ + ss.sub_course_num_ subTotalCourse,
 			CASE WHEN (ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND (ss.lately_year_course_consumer_ > 0 OR ss.over_course_num_ &lt;= 0) THEN '在读'
 			WHEN ss.over_course_num_ > 0 AND (ss.sub_course_num_ > 0 OR ss.no_schedule_num_ > 0) AND ss.lately_year_course_consumer_ &lt;= 0 THEN '沉睡'
 			WHEN ss.over_course_num_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0 AND suca.course_balance_ &lt;= 0 THEN '流失'