update

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

@@ -1,16 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
 
 /**
  * 对应数据库表(music_group):

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

@@ -1,13 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
-import com.ym.mec.common.enums.BaseEnum;
+import java.util.Date;
 
 /**
  * 对应数据库表(music_group_payment_calender):
@@ -15,13 +13,34 @@ import com.ym.mec.common.enums.BaseEnum;
 public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCalender> {
 
 	public enum FeeType implements BaseEnum<String, FeeType> {
-		OFFLINE, ONLINE, ALL;
+
+		OFFLINE("OFFLINE", "线下"), ONLINE("ONLINE", "线上"), ALL("ALL", "线上/线下");
+
+		private String code;
+
+		private String msg;
+
+		FeeType(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 code;
 		}
-
 	}
 
 	/**  */
@@ -48,7 +67,7 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 	private Integer actualNum;
 
 	private String memo;
-	
+
 	private FeeType type;
 
 	/**  */

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.page.MusicCalenderQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Date;
@@ -63,7 +64,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param queryInfo
 	 * @return
 	 */
-	Object queryDetailPage(MusicCalenderQueryInfo queryInfo);
+	PageInfo<MusicGroupPaymentCalender> queryDetailPage(MusicCalenderQueryInfo queryInfo);
 
 	/**
 	 * 推送乐团缴费提醒

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

@@ -425,7 +425,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
-	public Object queryDetailPage(MusicCalenderQueryInfo queryInfo) {
+	public PageInfo<MusicGroupPaymentCalender> queryDetailPage(MusicCalenderQueryInfo queryInfo) {
 		PageInfo<MusicGroupPaymentCalender> pageInfo = queryPage(queryInfo);
 		List<MusicGroupPaymentCalender> rows = pageInfo.getRows();
 		if (rows.size() == 0) {

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

@@ -98,10 +98,44 @@ public class ExportController extends BaseController {
     private StudentPaymentOrderDao studentPaymentOrderDao;
     @Autowired
     private StudentDao studentDao;
+    @Autowired
+    private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
 
     @Autowired
     private TeacherService teacherService;
 
+    @ApiOperation(value = "乐团管理--修改--缴费设置导出")
+    @PostMapping("export/musicGroupPaymentCalender")
+    @PreAuthorize("@pcs.hasPermissions('export/musicGroupPaymentCalender')")
+    public void exportTeacherAttendances(HttpServletResponse response, MusicCalenderQueryInfo queryInfo) throws IOException {
+        queryInfo.setPage(1);
+        queryInfo.setRows(49999);
+        List<MusicGroupPaymentCalender> rows = musicGroupPaymentCalenderService.queryDetailPage(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);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     @ApiOperation(value = "导出教师考勤列表")
     @PostMapping("export/queryTeacherAttendances")
     @PreAuthorize("@pcs.hasPermissions('export/queryTeacherAttendances')")