update

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

@@ -51,6 +51,12 @@ public class MusicGroupPaymentCalenderDetail {
 
 	/**  */
 	private java.util.Date deadlinePaymentDate;
+
+	/**  */
+	private java.util.Date startPaymentDateMgpc;
+
+	/**  */
+	private java.util.Date deadlinePaymentDateMgpc;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -58,6 +64,22 @@ public class MusicGroupPaymentCalenderDetail {
 	/**  */
 	private java.util.Date createTime;
 
+	public Date getStartPaymentDateMgpc() {
+		return startPaymentDateMgpc;
+	}
+
+	public void setStartPaymentDateMgpc(Date startPaymentDateMgpc) {
+		this.startPaymentDateMgpc = startPaymentDateMgpc;
+	}
+
+	public Date getDeadlinePaymentDateMgpc() {
+		return deadlinePaymentDateMgpc;
+	}
+
+	public void setDeadlinePaymentDateMgpc(Date deadlinePaymentDateMgpc) {
+		this.deadlinePaymentDateMgpc = deadlinePaymentDateMgpc;
+	}
+
 	private SysUser sysUser = new SysUser();
 
 	public YesOrNoEnum getOpenFlag() {

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupStatusEnum.java

@@ -10,10 +10,10 @@ public enum GroupStatusEnum implements BaseEnum<String, GroupStatusEnum> {
 
     NOT_START("NOT_START","未开始"),
     APPLYING("APPLYING","报名中"),
-    NORMAL("NORMAL", "正常"),
+    NORMAL("NORMAL", "进行中"),
     LOCK("LOCK", "锁定"),
     FINISH("FINISH", "结束"),
-    CANCEL("CANCEL", "取消");
+    CANCEL("CANCEL", "关闭");
 
     private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PracticeGroupType.java

@@ -3,16 +3,35 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum PracticeGroupType implements BaseEnum<String, PracticeGroupType> {
-	/** 免费 */
-	FREE,
-	/** 收费 */
-	CHARGE,
-	/** 试听 */
-	TRIAL;
+
+	FREE("FREE","免费"),
+	CHARGE("CHARGE","收费"),
+	TRIAL("TRIAL","试听");
+
+	private String code;
+
+	private String msg;
+
+	PracticeGroupType(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
 
 	@Override
 	public String getCode() {
-		return this.name();
+		return this.code;
 	}
 
 }

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

@@ -16,6 +16,8 @@
 		<result column="pay_time_" property="payTime" />
 		<result column="start_payment_date_" property="startPaymentDate" />
 		<result column="deadline_payment_date_" property="deadlinePaymentDate" />
+		<result column="start_payment_date_mgpc" property="startPaymentDateMgpc" />
+		<result column="deadline_payment_date_mgpc" property="deadlinePaymentDateMgpc" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="open_" property="open"/>
@@ -46,20 +48,20 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,
-		user_status_,pay_time_,update_time_,create_time_,open_,start_payment_date_,deadline_payment_date_)
+		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
 		VALUES(#{id},#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{userStatus},#{payTime},#{updateTime},#{createTime},#{open},#{startPaymentDate},#{deadlinePaymentDate})
+		#{userStatus},#{payTime},#{updateTime},#{createTime},#{startPaymentDate},#{deadlinePaymentDate})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
         INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,
-		payment_status_,user_status_,pay_time_,update_time_,create_time_,open_,start_payment_date_,deadline_payment_date_)
+		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
             (#{item.id},#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},
             #{item.actualAmount},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.userStatus},#{item.payTime},
-            #{item.updateTime},#{item.createTime},#{item.open},#{item.startPaymentDate},#{item.deadlinePaymentDate})
+            #{item.updateTime},#{item.createTime},#{item.startPaymentDate},#{item.deadlinePaymentDate})
         </foreach>
     </insert>
 
@@ -171,7 +173,7 @@
 
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">
-		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,mgpc.start_payment_date_,mgpc.deadline_payment_date_
+		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,mgpc.start_payment_date_ start_payment_date_mgpc,mgpc.deadline_payment_date_ deadline_payment_date_mgpc
 		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-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -96,11 +96,10 @@ public class ExportController extends BaseController {
     private StudentDao studentDao;
     @Autowired
     private MusicGroupPaymentCalenderDetailService musicGroupPaymentCalenderDetailService;
-
     @Autowired
     private TeacherService teacherService;
 
-    @ApiOperation(value = "乐团管理--修改--缴费设置导出")
+    @ApiOperation(value = "乐团管理--修改--缴费设置--缴费记录导出")
     @PostMapping("export/musicGroupPaymentCalenderDetail")
     @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalenderDetail')")
     public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderDetailQueryInfo queryInfo) throws IOException {
@@ -112,7 +111,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名", "学员声部", "学员状态", "手机号", "预计缴费金额",
                     "缴费开始日期","缴费截止日期","是否开启缴费","缴费状态","支付时间"}, new String[]{
                     "userId", "sysUser.username", "studentRegistration.subjectName", "studentRegistration.musicGroupStatus.msg", "sysUser.phone", "expectAmount",
-                    "startPaymentDate", "deadlinePaymentDate", "openFlag.msg", "paymentStatus.desc", "payTime"}, rows);
+                    "startPaymentDateMgpc", "deadlinePaymentDateMgpc", "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();
@@ -487,9 +486,9 @@ public class ExportController extends BaseController {
             });
         }
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "网管课编号", "课程名称", "指导老师", "教务老师", "班级人数",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{ "课程组编号","课程组名称", "课程组类型","分部", "教务老师", "指导老师", "班级人数",
                     "当前课次", "总课次", "剩余课次", "开课时间", "结束时间", "课程组状态", "是否续费", "备注"}, new String[]{
-                    "organName", "id", "name", "teacherName", "educationalTeacherName", "studentNum","currentClassTimes",
+                    "id","name","type.msg","organName", "educationalTeacherName", "teacherName", "studentNum","currentClassTimes",
                     "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate",
                     "groupStatus.desc","payStatus","memo"}, rows);
             response.setContentType("application/octet-stream");