zouxuan 5 tahun lalu
induk
melakukan
93f4a5d291

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -37,7 +38,7 @@ public class MusicGroupPaymentCalenderDetail {
 	private String musicGroupId;
 
 	/**1是0否  */
-	private Integer open;
+	private YesOrNoEnum open;
 	
 	/**  */
 	private java.util.Date payTime;
@@ -82,11 +83,11 @@ public class MusicGroupPaymentCalenderDetail {
 		this.deadlinePaymentDate = deadlinePaymentDate;
 	}
 
-	public Integer getOpen() {
+	public YesOrNoEnum getOpen() {
 		return open;
 	}
 
-	public void setOpen(Integer open) {
+	public void setOpen(YesOrNoEnum open) {
 		this.open = open;
 	}
 

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
@@ -76,7 +77,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			e.setUpdateTime(date);
 			e.setExpectAmount(expectAmount);
 			if(expectAmount.doubleValue() > 0){
-				if((e.getOpen() != null && e.getOpen() == 1) || calender.getPaymentStatus() == OPEN){
+				if((e.getOpen() != null && e.getOpen() == YesOrNoEnum.YES) || calender.getPaymentStatus() == OPEN){
 					studentIds.add(e.getUserId());
 				}
 			}
@@ -147,7 +148,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		String musicGroupId = calenderDetails.get(0).getMusicGroupId();
 		calenderDetails.forEach(e->{
 			e.setUpdateTime(date);
-			e.setOpen(1);
+			e.setOpen(YesOrNoEnum.YES);
 //			e.setPaymentStatus(PROCESSING);
 			e.setStartPaymentDate(date);
 			e.setDeadlinePaymentDate(date);

+ 0 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -2174,7 +2174,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     idNameMap = educationalUsers.stream().filter(e -> Objects.nonNull(e.getUserId()) && Objects.nonNull(e.getUserName())).collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
                 }
 
-
                 for (PracticeGroupDto e : dataList) {
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
                     e.setOrganName(organNames.get(e.getOrganId()));

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderDetailServiceImpl.java

@@ -16,6 +16,7 @@ import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;

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

@@ -18,7 +18,7 @@
 		<result column="deadline_payment_date_" property="deadlinePaymentDate" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
-		<result column="open_" property="open" />
+		<result column="open_" property="open" 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" />
@@ -169,8 +169,7 @@
 	</delete>
 
     <!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail"
-		parameterType="map">
+	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">
 		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_

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

@@ -86,7 +86,6 @@ public class ExportController extends BaseController {
     private TeacherCourseRewardService teacherCourseRewardService;
     @Autowired
     private DegreeRegistrationService degreeRegistrationService;
-
     @Autowired
     private CooperationOrganService cooperationOrganService;
     @Autowired
@@ -96,24 +95,24 @@ public class ExportController extends BaseController {
     @Autowired
     private StudentDao studentDao;
     @Autowired
-    private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
+    private MusicGroupPaymentCalenderDetailService musicGroupPaymentCalenderDetailService;
 
     @Autowired
     private TeacherService teacherService;
 
     @ApiOperation(value = "乐团管理--修改--缴费设置导出")
-    @PostMapping("export/musicGroupPaymentCalender")
-    @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalender')")
-    public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderQueryInfo queryInfo) throws IOException {
+    @PostMapping("export/musicGroupPaymentCalenderDetail")
+    @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalenderDetail')")
+    public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderDetailQueryInfo queryInfo) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        List<MusicGroupPaymentCalender> rows = musicGroupPaymentCalenderService.queryDetailPage(queryInfo).getRows();
+        List<MusicGroupPaymentCalenderDetail> rows = musicGroupPaymentCalenderDetailService.queryPage(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"缴费开始日期", "缴费结束日期", "预计缴费人数", "实际缴费人数", "状态", "缴费状态",
-                    "备注"}, new String[]{
-                    "startPaymentDate", "deadlinePaymentDate", "expectNum", "actualNum", "type.msg", "paymentStatus.desc",
-                    "memo"}, rows);
+            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);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -488,10 +487,10 @@ 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", "onlineClassesUnitPrice",
-                    "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate",
+                    "organName", "id", "name", "teacherName", "educationalTeacherName", "studentNum","currentClassTimes",
+                    "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate",
                     "groupStatus.desc","payStatus","memo"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");