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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -38,7 +38,10 @@ public class MusicGroupPaymentCalenderDetail {
 	private String musicGroupId;
 
 	/**1是0否  */
-	private YesOrNoEnum open;
+	private Integer open;
+
+	/**1是0否  */
+	private YesOrNoEnum openFlag;
 	
 	/**  */
 	private java.util.Date payTime;
@@ -57,6 +60,14 @@ public class MusicGroupPaymentCalenderDetail {
 
 	private SysUser sysUser = new SysUser();
 
+	public YesOrNoEnum getOpenFlag() {
+		return openFlag;
+	}
+
+	public void setOpenFlag(YesOrNoEnum openFlag) {
+		this.openFlag = openFlag;
+	}
+
 	private StudentRegistration studentRegistration = new StudentRegistration();
 
 	public String getMusicGroupId() {
@@ -83,11 +94,11 @@ public class MusicGroupPaymentCalenderDetail {
 		this.deadlinePaymentDate = deadlinePaymentDate;
 	}
 
-	public YesOrNoEnum getOpen() {
+	public Integer getOpen() {
 		return open;
 	}
 
-	public void setOpen(YesOrNoEnum open) {
+	public void setOpen(Integer open) {
 		this.open = open;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -14,7 +14,7 @@ public class MusicGroupStudentFee {
 
 	public enum PaymentStatus implements BaseEnum<String, PaymentStatus> {
 
-		PAID_COMPLETED("完成缴费"), NON_PAYMENT("未缴费"), PROCESSING("缴费中");
+		PAID_COMPLETED("已缴费"), NON_PAYMENT("未缴费"), PROCESSING("缴费中");
 
 		private String desc;
 

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

@@ -77,7 +77,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			e.setUpdateTime(date);
 			e.setExpectAmount(expectAmount);
 			if(expectAmount.doubleValue() > 0){
-				if((e.getOpen() != null && e.getOpen() == YesOrNoEnum.YES) || calender.getPaymentStatus() == OPEN){
+				if((e.getOpen() != null && e.getOpen() == 1) || calender.getPaymentStatus() == OPEN){
 					studentIds.add(e.getUserId());
 				}
 			}
@@ -148,7 +148,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		String musicGroupId = calenderDetails.get(0).getMusicGroupId();
 		calenderDetails.forEach(e->{
 			e.setUpdateTime(date);
-			e.setOpen(YesOrNoEnum.YES);
+			e.setOpen(1);
 //			e.setPaymentStatus(PROCESSING);
 			e.setStartPaymentDate(date);
 			e.setDeadlinePaymentDate(date);

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

@@ -18,7 +18,8 @@
 		<result column="deadline_payment_date_" property="deadlinePaymentDate" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
-		<result column="open_" property="open" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="open_" property="open"/>
+		<result column="open_" property="openFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 			<result column="username_" property="username" />
 			<result column="phone_" property="phone" />
@@ -170,7 +171,7 @@
 
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">
-		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_
+		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,mgpc.start_payment_date_,mgpc.deadline_payment_date_
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_

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

@@ -50,11 +50,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherAttendance" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO teacher_attendance
         (id_,group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,remark_,create_time_,sign_out_time_,
         sign_out_status_,current_class_times_,sign_in_longitude_latitude_,sign_out_longitude_latitude_)

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

@@ -111,8 +111,8 @@ public class ExportController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名", "学员声部", "学员状态", "手机号", "预计缴费金额",
                     "缴费开始日期","缴费截止日期","是否开启缴费","缴费状态","支付时间"}, new String[]{
-                    "userId", "sysUser.username", "studentRegistration.subjectName", "studentRegistration.musicGroupStatus.msg", "sysUser.phone", "actualAmount",
-                    "startPaymentDate", "deadlinePaymentDate", "open.msg", "paymentStatus.desc", "payTime"}, rows);
+                    "userId", "sysUser.username", "studentRegistration.subjectName", "studentRegistration.musicGroupStatus.msg", "sysUser.phone", "expectAmount",
+                    "startPaymentDate", "deadlinePaymentDate", "openFlag.msg", "paymentStatus.desc", "payTime"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();