云教练活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -692,6 +692,6 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * 获取云教练活动分部目标
      * @return
      */
-    List<CloudTeacherActiveTargetDto> queryOrganTarget();
+    List<CloudTeacherActiveTargetJsonDto> queryOrganTarget();
 
 }

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

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class CloudTeacherActiveTargetJsonDto {
+	private Integer organId;
+
+	private Integer targetNum = 0;
+
+	private BigDecimal targetAmount = BigDecimal.ZERO;
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
+	public Integer getTargetNum() {
+		return targetNum;
+	}
+
+	public void setTargetNum(Integer targetNum) {
+		this.targetNum = targetNum;
+	}
+
+	public BigDecimal getTargetAmount() {
+		return targetAmount;
+	}
+
+	public void setTargetAmount(BigDecimal targetAmount) {
+		this.targetAmount = targetAmount;
+	}
+}

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;

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

@@ -1702,7 +1702,12 @@
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         WHERE sr.music_group_status_ != 'QUIT' AND mg.status_ NOT IN ('CANCELED','CLOSE') AND mg.course_view_type_ = 2
     </select>
-    <select id="queryOrganTarget" resultMap="com.ym.mec.biz.dal.dao.IndexBaseMonthDataDao.CloudTeacherActiveTargetDto">
+    <resultMap id="CloudTeacherActiveTargetJsonDto" type="com.ym.mec.biz.dal.dto.CloudTeacherActiveTargetJsonDto">
+        <result property="targetNum" column="target_num_"/>
+        <result property="targetAmount" column="target_amount_"/>
+        <result property="organId" column="organ_id_"/>
+    </resultMap>
+    <select id="queryOrganTarget" resultMap="CloudTeacherActiveTargetJsonDto">
         SELECT su.organ_id_,COUNT(DISTINCT su.id_) target_num_,COUNT(DISTINCT su.id_) * 2040 target_amount_ FROM student_registration sr
         LEFT JOIN sys_user su  ON sr.user_id_ = su.id_
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_