Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -113,6 +113,26 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin = false;
 
+	private Integer serviceTag;
+
+	private Integer operatingTag;
+
+	public Integer getServiceTag() {
+		return serviceTag;
+	}
+
+	public void setServiceTag(Integer serviceTag) {
+		this.serviceTag = serviceTag;
+	}
+
+	public Integer getOperatingTag() {
+		return operatingTag;
+	}
+
+	public void setOperatingTag(Integer operatingTag) {
+		this.operatingTag = operatingTag;
+	}
+
 	public String getCurrentGrade() {
 		return currentGrade;
 	}

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

@@ -14,6 +14,9 @@ public class StudentBuyPracticeDto {
     //老师名
     private String teacherName;
 
+    //老师名
+    private String courseGroupTeacherName;
+
     //分部
     private String organName;
 
@@ -32,6 +35,14 @@ public class StudentBuyPracticeDto {
     //时间差
     private int intervalDay;
 
+    public String getCourseGroupTeacherName() {
+        return courseGroupTeacherName;
+    }
+
+    public void setCourseGroupTeacherName(String courseGroupTeacherName) {
+        this.courseGroupTeacherName = courseGroupTeacherName;
+    }
+
     public String getTeacherName() {
         return teacherName;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
@@ -38,6 +39,26 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Boolean hasPracticeCourse;
 
+    private Integer serviceTag;
+
+    private Integer operatingTag;
+
+    public Integer getServiceTag() {
+        return serviceTag;
+    }
+
+    public void setServiceTag(Integer serviceTag) {
+        this.serviceTag = serviceTag;
+    }
+
+    public Integer getOperatingTag() {
+        return operatingTag;
+    }
+
+    public void setOperatingTag(Integer operatingTag) {
+        this.operatingTag = operatingTag;
+    }
+
     public Boolean getIsExport() {
         return isExport;
     }

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

@@ -398,7 +398,10 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("手机号已被占用");
         }
         teacherDao.updateUser(sysUser);
-        studentService.upSet(new Student(userId,studentRegistrationDao.getSubjectIds(userId)));
+        Student student = new Student(userId, studentRegistrationDao.getSubjectIds(userId));
+        student.setOperatingTag(sysUser.getOperatingTag());
+        student.setServiceTag(sysUser.getServiceTag());
+        studentService.upSet(student);
         return userId;
     }
 

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

@@ -412,6 +412,7 @@
         <result property="studentId" column="student_id_"/>
         <result property="studentName" column="student_name_"/>
         <result property="teacherName" column="teacher_name_"/>
+        <result property="courseGroupTeacherName" column="course_group_teacher_"/>
         <result property="firstBuyTime" column="first_buy_time_"/>
         <result property="intervalDay" column="interval_day_"/>
         <result property="lastClassDate" column="last_class_date_"/>
@@ -423,7 +424,7 @@
         b.lastClassDate last_class_date_,c.firstBuyTime first_buy_time_,
         CASE WHEN DATEDIFF(c.firstBuyTime,b.lastClassDate) &lt; 0 THEN 0 ELSE DATEDIFF(c.firstBuyTime,b.lastClassDate)
         END interval_day_,
-        CASE WHEN c.firstBuyTime IS NULL THEN 0 ELSE 1 END buy_practice_,d.teacher_name_
+        CASE WHEN c.firstBuyTime IS NULL THEN 0 ELSE 1 END buy_practice_,d.teacher_name_,d.course_group_teacher_
         FROM
         (SELECT DISTINCT(pg.`student_id_`),pg.`organ_id_` FROM `practice_group` pg WHERE pg.`group_status_` in
         ('NORMAL','FINISH')) a
@@ -436,13 +437,14 @@
         FROM `practice_group` pg
         WHERE pg.`buy_months_` IS NOT NULL AND pg.`group_status_` IN ('NORMAL','FINISH') GROUP
         BY pg.`student_id_` ) c ON a.student_id_ = c.student_id_
-        LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT su.real_name_) teacher_name_,pg.student_id_
+        LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT su.real_name_) teacher_name_,pg.student_id_,GROUP_CONCAT(DISTINCT suc.real_name_) course_group_teacher_
         FROM `practice_group` pg
         LEFT JOIN `course_schedule` cs ON cs.`music_group_id_` = pg.`id_`
         LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
+        LEFT JOIN sys_user suc ON suc.id_ = pg.user_id_
         WHERE cs.`group_type_` = 'PRACTICE' AND pg.`group_status_` IN ('NORMAL','FINISH') GROUP BY pg.`student_id_` ) d ON a.student_id_ = d.student_id_
         LEFT JOIN `sys_user` u ON u.`id_` = a.student_id_
-        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_
+        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_;
         <include refid="queryStudentBuysSql"/>
         <include refid="global.limit"/>
     </select>

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

@@ -31,11 +31,45 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student (user_id_,subject_id_list_,create_time_,update_time_) VALUES(#{userId},#{subjectIdList},NOW(),NOW())
+		INSERT INTO student (user_id_,subject_id_list_,
+		<if test="serviceTag != null">
+			service_tag_,
+		</if>
+		<if test="operatingTag != null">
+			operating_tag_,
+		</if>
+		create_time_,update_time_)
+		VALUES
+		(#{userId},#{subjectIdList},
+		<if test="serviceTag != null">
+			#{serviceTag},
+		</if>
+		<if test="operatingTag != null">
+			#{operatingTag},
+		</if>
+		NOW(),NOW())
 	</insert>
 	
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
-		UPDATE student SET subject_id_list_=#{subjectIdList},update_time_=NOW() WHERE user_id_=#{userId}
+		UPDATE student
+		<set>
+			<if test="subjectIdList != null">
+				subject_id_list_ = #{subjectIdList},
+			</if>
+			<if test="serviceTag != null">
+				service_tag_ = #{serviceTag},
+			</if>
+			<if test="operatingTag != null">
+				operating_tag_ = #{operatingTag},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="updateTime == null">
+				update_time_ = NOW()
+			</if>
+		</set>
+		WHERE user_id_ = #{userId}
 	</update>
 	
 	<!-- 分页查询 -->

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

@@ -107,9 +107,9 @@ public class ExportController extends BaseController {
         List<StudentBuyPracticeDto> rows = practiceGroupService.studentBuys(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部","老师名称", "购买网管课",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部","课程老师","课程组老师", "购买网管课",
                     "免费课结束日期", "首次购买日期", "时间差"}, new String[]{
-                    "studentId", "studentName", "organName","teacherName" ,"buyPractice.msg",
+                    "studentId", "studentName", "organName","teacherName","courseGroupTeacherName" ,"buyPractice.msg",
                     "lastClassDate", "firstBuyTime", "intervalDay"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -82,16 +82,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "修改学员信息")
     @PostMapping("/studentUpdate")
     @PreAuthorize("@pcs.hasPermissions('studentManage/studentUpdate')")
-    public Object studentUpdate(Integer id, String phone, String username, Integer gender, String realName, Date birthdate,String nation,Integer organId){
-        SysUser sysUser = new SysUser();
-        sysUser.setId(id);
-        sysUser.setPhone(phone);
-        sysUser.setUsername(username);
-        sysUser.setGender(gender);
-        sysUser.setRealName(realName);
-        sysUser.setBirthdate(birthdate);
-        sysUser.setNation(nation);
-        sysUser.setOrganId(organId);
+    public Object studentUpdate(SysUser sysUser){
         return succeed(studentManageService.studentUpdate(sysUser));
     }