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

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

@@ -47,8 +47,6 @@ public class StudentManageListDto {
     
     private YesOrNoEnum isActive;
 
-    private YesOrNoEnum isMake;
-
     private YesOrNoEnum hasCourse;
 
     @ApiModelProperty(value = "是否有网管课")
@@ -156,14 +154,6 @@ public class StudentManageListDto {
         this.hasPracticeCourse = hasPracticeCourse;
     }
 
-    public YesOrNoEnum getIsMake() {
-        return isMake;
-    }
-
-    public void setIsMake(YesOrNoEnum make) {
-        isMake = make;
-    }
-
     public YesOrNoEnum getHasCourse() {
         return hasCourse;
     }

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

@@ -30,8 +30,6 @@ public class StudentManageQueryInfo extends QueryInfo {
     
     private Boolean isActive;
 
-    private Boolean isMake;
-
     private Boolean isExport = false;
 
     private Boolean hasCourse;
@@ -76,14 +74,6 @@ public class StudentManageQueryInfo extends QueryInfo {
         this.hasPracticeCourse = hasPracticeCourse;
     }
 
-    public Boolean getIsMake() {
-        return isMake;
-    }
-
-    public void setIsMake(Boolean make) {
-        isMake = make;
-    }
-
     public List<Integer> getUserIds() {
         return userIds;
     }

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

@@ -96,6 +96,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         ) {
             throw new BizException("邮寄信息必填");
         }
+        SysUser student =  sysUserFeignService.queryUserById(repairInfo.getStudentId());
+        repairInfo.setOrganId(student.getOrganId());
+
         Date date = new Date();
         BigDecimal amount = repairInfo.getAmount();
         String orderNo = idGeneratorService.generatorId("payment") + "";
@@ -250,7 +253,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         }
         Date date = new Date();
         StudentRepair studentRepair = studentRepairDao.get(repairInfo.getId());
-        studentDao.lockUser(repairInfo.getStudentId());
+        studentDao.lockUser(studentRepair.getStudentId());
         BigDecimal amount = studentRepair.getAmount();
         String orderNo = idGeneratorService.generatorId("payment") + "";
         studentRepair.setTransNo(orderNo);

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

@@ -115,9 +115,8 @@
         SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
         su.birthdate_,su.nation_,su.organ_id_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        CASE WHEN pla.id_ IS NULL THEN 0 ELSE 1 END isMake_,st.service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_
+        st.service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_
         FROM sys_user su
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
         LEFT JOIN student st ON st.user_id_ = su.id_
         left join sys_user tu on tu.id_ = st.teacher_id_
         <include refid="findStudentsByOrganIdSql"/>
@@ -139,12 +138,6 @@
             <if test="isActive != null and isActive == false">
                 AND su.password_ is null
             </if>
-            <if test="isMake != null and isMake == true">
-                AND pla.id_ IS NOT NULL
-            </if>
-            <if test="isMake != null and isMake == false">
-                AND pla.id_ IS NULL
-            </if>
             <if test="operatingTag != null">
                 AND st.operating_tag_ = #{operatingTag}
             </if>
@@ -742,7 +735,6 @@
         <result property="currentGrade" column="current_grade_"/>
         <result property="currentClass" column="current_class_"/>
         <result property="isActive" column="isActive_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="isMake" column="isMake_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="hasCourse" column="hasCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="hasPracticeCourse" column="hasPracticeCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="musicGroupName" column="music_group_name_"/>

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

@@ -316,10 +316,10 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否预约网管课", "是否有网管课", "课程余额(元)",
+                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "课程余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签","指导老师"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
-                    "isActive.msg", "hasCourse.msg", "isMake.msg", "hasPracticeCourse.msg", "courseBalance", "musicGroupName",
+                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "courseBalance", "musicGroupName",
                     "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg","teacherName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");