Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 public class TeacherCourseStatistics {
     private Long id;
@@ -71,6 +72,10 @@ public class TeacherCourseStatistics {
 
     private String monthStr;
 
+    private List<Subject> subjectList;
+
+    private String subjectListStr;
+
     public Long getId() {
         return id;
     }
@@ -206,4 +211,20 @@ public class TeacherCourseStatistics {
     public void setMonthStr(String monthStr) {
         this.monthStr = monthStr;
     }
+
+    public List<Subject> getSubjectList() {
+        return subjectList;
+    }
+
+    public void setSubjectList(List<Subject> subjectList) {
+        this.subjectList = subjectList;
+    }
+
+    public String getSubjectListStr() {
+        return subjectListStr;
+    }
+
+    public void setSubjectListStr(String subjectListStr) {
+        this.subjectListStr = subjectListStr;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 
 import com.ym.mec.biz.dal.dao.TeacherCourseStatisticsDao;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.TeacherCourseStatistics;
 import com.ym.mec.biz.dal.page.TeacherCourseStatisticsQueryInfo;
 import com.ym.mec.biz.service.TeacherCourseStatisticsService;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, TeacherCourseStatistics> implements TeacherCourseStatisticsService {
@@ -33,6 +35,14 @@ public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, Te
 
         PageInfo<TeacherCourseStatistics> pageInfo = queryPage(queryInfo);
         List<TeacherCourseStatistics> rows = pageInfo.getRows();
+        if (rows != null && rows.size() > 0) {
+            for (TeacherCourseStatistics row : rows) {
+                if (row.getSubjectList() != null && row.getSubjectList().size() > 0) {
+                    String subjectList = row.getSubjectList().stream().map(Subject::getName).collect(Collectors.joining(","));
+                    row.setSubjectListStr(subjectList);
+                }
+            }
+        }
         return pageInfo;
     }
 }

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

@@ -19,6 +19,10 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
         <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
+        <collection property="subjectList" ofType="com.ym.mec.biz.dal.entity.Subject">
+            <result column="subject_id" property="id"/>
+            <result column="subject_name" property="name"/>
+        </collection>
     </resultMap>
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherCourseStatistics" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
@@ -68,11 +72,12 @@
         GROUP BY csts.user_id_, csts.group_type_;
   </select>
 
-    <!-- 分页查询 -->
     <select id="queryPage" resultMap="TeacherCourseStatistics" parameterType="map">
-        SELECT tcs.*,u.real_name_,u.phone_,o.name_ organ_name_,DATE_FORMAT(tcs.month_,'%Y年%m月') month_str_ FROM teacher_course_statistics tcs
+        SELECT tcs.*,u.real_name_,u.phone_,o.name_ organ_name_,DATE_FORMAT(tcs.month_,'%Y年%m月') month_str_,
+        s.id_ subject_id,s.name_ subject_name FROM teacher_course_statistics tcs
         left join sys_user u on tcs.user_id_ = u.id_
         left join organization o on tcs.organ_id_ = o.id_
+        LEFT JOIN subject s ON FIND_IN_SET(s.id_,tcs.subject_id_list_)
         <include refid="queryParams"/>
         <include refid="global.limit"/>
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/TeacherCourseStatisticsController.java

@@ -54,6 +54,6 @@ public class TeacherCourseStatisticsController extends BaseController {
                 }
             }
         }
-        return succeed(teacherCourseStatisticsService.queryPage(queryInfo));
+        return succeed(teacherCourseStatisticsService.queryPageDetail(queryInfo));
     }
 }