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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class CloudTeacherActiveTargetDetailDto {
 	private Integer userId;
@@ -23,6 +24,16 @@ public class CloudTeacherActiveTargetDetailDto {
 
 	private BigDecimal amount = BigDecimal.ZERO;
 
+	private Date createTime;
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}

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

@@ -220,11 +220,12 @@
         <result property="subjectName" column="subject_name_"/>
         <result property="currentGradeNum" column="current_grade_num_"/>
         <result property="teacherName" column="teacher_name_"/>
+        <result property="createTime" column="create_time_"/>
     </resultMap>
     <select id="queryCloudTeacherActiveDetail" resultMap="CloudTeacherActiveTargetDetailDto">
         SELECT su.username_,cto.remark_,cto.amount_,cto.student_id_,GROUP_CONCAT(DISTINCT co.name_) cooperation_name_,
         GROUP_CONCAT(DISTINCT mg.name_) music_group_name_,GROUP_CONCAT(DISTINCT ct.name_) charge_type_name_,
-        sj.name_ subject_name_,st.current_grade_num_,sus.real_name_ teacher_name_
+        sj.name_ subject_name_,st.current_grade_num_,sus.real_name_ teacher_name_,cto.create_time_
         FROM cloud_teacher_order cto
         LEFT JOIN sys_user su ON su.id_ = cto.student_id_
         LEFT JOIN student_registration sr ON sr.user_id_ = cto.student_id_ AND sr.music_group_status_ = 'NORMAL'
@@ -233,9 +234,10 @@
         LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
         LEFT JOIN student st ON st.user_id_ = cto.student_id_
         LEFT JOIN sys_user sus ON sus.id_ = st.teacher_id_
-        LEFT JOIN `subject` sj ON sj.id_ = st.user_id_
+        LEFT JOIN `subject` sj ON sj.id_ = st.subject_id_list_
         <include refid="queryCloudTeacherActiveDetailSql"/>
         GROUP BY cto.id_
+        ORDER BY cto.id_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countCloudTeacherActiveDetail" resultType="int">

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

@@ -3332,8 +3332,8 @@ public class ExportController extends BaseController {
 
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"分部", "购买人数", "人均购买金额", "总人数", "购买率", "目标人数", "目标达成率"};
-            String[] body = {"organName", "buyNum", "avgBuyAmount", "totalNum", "buyScale",
+            String[] header = {"分部", "购买人数", "购买金额", "目标金额", "人均购买金额", "总人数", "购买率", "目标人数", "目标达成率"};
+            String[] body = {"organName", "buyNum", "buyAmount", "targetAmount", "avgBuyAmount", "totalNum", "buyScale",
                             "targetNum", "targetFinishScale"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");

mec-web/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mdata/logs/web-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="/Users/chenxiaoyu/Documents/logs/web-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
@@ -30,7 +30,7 @@
 	<appender name="messagefile"
 			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>/mdata/logs/web-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+			<FileNamePattern>/Users/chenxiaoyu/Documents/logs/web-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
 					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">