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

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

@@ -9,23 +9,41 @@ import java.util.Date;
 
 public class TeacherSalaryDto{
 
+    @ApiModelProperty(value = "用户名编号",required = false)
+    private Integer userId;
+
     @ApiModelProperty(value = "用户名",required = false)
     private String username;
 
+    @ApiModelProperty(value = "手机号",required = false)
     private String phone;
 
+    @ApiModelProperty(value = "课程类型",required = false)
     private CourseSchedule.CourseScheduleType type;
 
+    @ApiModelProperty(value = "课程名",required = false)
     private String name;
 
+    @ApiModelProperty(value = "实际薪水",required = false)
     private BigDecimal actualSalary;
 
+    @ApiModelProperty(value = "补助",required = false)
     private BigDecimal subsidy;
 
+    @ApiModelProperty(value = "结算时间",required = false)
     private Date settlementTime;
 
+    @ApiModelProperty(value = "教师类型",required = false)
     private TeachTypeEnum teacherRole;
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getUsername() {
         return username;
     }

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

@@ -138,6 +138,7 @@
 
 	<resultMap id="TeacherSalaryDtoMap" type="com.ym.mec.biz.dal.dto.TeacherSalaryDto">
 		<result property="username" column="username"/>
+		<result property="userId" column="user_id_"/>
 		<result property="phone" column="phone_"/>
 		<result property="type" column="type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result property="name" column="name_"/>
@@ -148,7 +149,7 @@
 	</resultMap>
 
 	<select id="querySalaries" resultMap="TeacherSalaryDtoMap">
-		SELECT su.username_,su.phone_,cs.type_,cs.name_,csts.actual_salary_,csts.subsidy_,csts.settlement_time_,csts.teacher_role_
+		SELECT su.id_ user_id_,su.username_,su.phone_,cs.type_,cs.name_,csts.actual_salary_,csts.subsidy_,csts.settlement_time_,csts.teacher_role_
 		FROM course_schedule_teacher_salary csts
 		LEFT JOIN sys_user su ON su.id_ = csts.user_id_
 		LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_

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

@@ -41,8 +41,8 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
         List<TeacherSalaryDto> teacherSalaries = courseScheduleTeacherSalaryService.querySalaries(queryInfo).getRows();
         OutputStream ouputStream = null;
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[] { "用户名", "手机号", "课程类型", "实际薪水", "补助", "结算时间", "教师角色"}, new String[] {
-                    "username", "phone", "type.msg", "name", "actualSalary", "subsidy", "settlementTime", "teacherRole.msg"}, teacherSalaries);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[] { "用户编号","用户名", "手机号", "课程类型", "实际薪水", "补助", "结算时间", "教师角色"}, new String[] {
+                    "userId","username", "phone", "type.msg", "name", "actualSalary", "subsidy", "settlementTime", "teacherRole.msg"}, teacherSalaries);
             response.setContentType("application/msexcel");
             response.setHeader("Content-disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();