Merge remote-tracking branch 'origin/master'

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

@@ -53,6 +53,8 @@ public class MusicGroupStudentsDto{
 
     private String isNewStudentStr;
 
+    private String nextPaymentDateStr;
+
     public Boolean getIsActive() {
         return isActive;
     }
@@ -180,4 +182,12 @@ public class MusicGroupStudentsDto{
     public void setIsNewStudentStr(String isNewStudentStr) {
         this.isNewStudentStr = isNewStudentStr;
     }
+
+    public String getNextPaymentDateStr() {
+        return nextPaymentDateStr;
+    }
+
+    public void setNextPaymentDateStr(String nextPaymentDateStr) {
+        this.nextPaymentDateStr = nextPaymentDateStr;
+    }
 }

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

@@ -409,7 +409,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 updateFlag = true;
                 break;
             }
-            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
+            MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
             int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
             musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
             if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
@@ -845,14 +845,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
 
 //            //生成课程协议
-            /*contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(),studentRegistration.getMusicGroupId());
+            contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(),studentRegistration.getMusicGroupId());
             //商品协议(租赁时候有)
             if(musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)){
                 StudentPaymentOrderDetail applyOrderMusical = studentPaymentOrderDetailService.findApplyOrderMusical(studentPaymentOrder.getId());
                 if(applyOrderMusical != null && applyOrderMusical.getGoodsIdList() != null && !applyOrderMusical.getGoodsIdList().equals("")){
                     contractService.transferGoodsContract(studentPaymentOrder.getUserId(),studentPaymentOrder.getMusicGroupId(),applyOrderMusical.getGoodsIdList(),musicOneSubjectClassPlan.getKitGroupPurchaseType());
                 }
-            }*/
+            }
         }
 
 

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

@@ -1253,10 +1253,9 @@
     </select>
     <select id="queryMusicGroupIds" resultType="java.lang.String">
         SELECT DISTINCT cgsm.music_group_id_ FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
-        WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT' AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.status_ = 3)
+        LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
+        LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
+        WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT' AND (mg.status_ = 'PROGRESS' OR vg.status_ = 2)
         ORDER BY cgsm.music_group_id_
         <include refid="global.limit"/>
     </select>

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

@@ -287,7 +287,7 @@
     </select>
 
     <select id="countPayNum" resultType="map">
-        SELECT COUNT(DISTINCT user_id_) `value`,subject_id_ `key` FROM student_registration
+        SELECT COUNT(DISTINCT user_id_) `value`,actual_subject_id_ `key` FROM student_registration
         WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND music_group_status_ != 'QUIT' GROUP BY subject_id_
     </select>
 

mec-util/src/main/java/com/ym/mec/util/pdf/PDFUtil.java

@@ -11,6 +11,7 @@ import java.net.URL;
 
 import org.xhtmlrenderer.pdf.ITextRenderer;
 
+import com.google.zxing.client.result.BizcardResultParser;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.BaseFont;
 import com.ym.mec.util.exception.UtilException;
@@ -317,6 +318,8 @@ public class PDFUtil {
 		File fontFamilyFile = new File(baseUrl, fontFamily);
 		if (fontFamilyFile.exists()) {
 			renderer.getFontResolver().addFont(fontFamilyFile.getAbsolutePath(), BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+		} else {
+			throw new FileNotFoundException("字体文件找不到：" + fontFamilyFile.getPath());
 		}
 		renderer.setDocumentFromString(data);
 		renderer.getSharedContext().setBaseURL(baseUrl);

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

@@ -27,7 +27,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -301,12 +300,13 @@ public class ExportController extends BaseController {
                 }else {
                     row.setIsNewStudentStr("否");
                 }
+                row.setNextPaymentDateStr(DateUtil.format(row.getNextPaymentDate(), DateUtil.DEFAULT_PATTERN));
                 row.setCurrentGrade(row.getCurrentGrade() + row.getCurrentClass());
             }
-            String[] header = {"学生姓名", "性别", "联系电话", "年级班级", "专业", "学员状态", "新增学员", "缴费金额",
+            String[] header = {"学员编号","学员姓名", "性别", "联系电话", "年级班级", "专业", "学员状态", "新增学员", "缴费金额",
                     "下次缴费日期", "报名缴费", "是否激活"};
-            String[] body = {"realName", "gender", "phone", "currentGrade", "subjectName", "studentStatus", "isNewStudentStr",
-                    "courseFee", "nextPaymentDate","paymentStatus", "activeName"};
+            String[] body = {"userId","realName", "gender", "phone", "currentGrade", "subjectName", "studentStatus", "isNewStudentStr",
+                    "courseFee", "nextPaymentDateStr","paymentStatus", "activeName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             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/TeacherAttendanceController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.service.TeacherAttendanceService;
 import com.ym.mec.common.controller.BaseController;