缴费日历审核列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderCourseSettingsDao.java

@@ -42,4 +42,14 @@ public interface MusicGroupPaymentCalenderCourseSettingsDao extends BaseDAO<Inte
 	 */
 	int batchInsert(List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList);
 
+	/**
+	 * @describe 获取收费标准
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/10/30
+	 * @time 16:04
+	 * @param calenderId:
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings>
+	 */
+	List<MusicGroupPaymentCalenderCourseSettings> queryCalenderCourseSettings(Integer calenderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import java.util.*;
 
 import com.ym.mec.biz.dal.dto.CalenderPushDto;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -132,4 +133,26 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @return com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender
      */
     MusicGroupPaymentCalender getUnusedFirstPaymentCalenderWithCalenders(@Param("calenderIds") List<Long> calenderIds);
+
+    /**
+     * @describe 乐团缴费日历审核列表
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/10/30
+     * @time 13:47
+     * @param params:
+     * @return int
+     */
+    int countAuditList(Map<String, Object> params);
+
+    /**
+     * @describe 乐团缴费日历审核列表
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/10/30
+     * @time 13:47
+     * @param params:
+     * @return int
+     */
+    List<MusicGroupPaymentCalenderAuditDto> queryAuditList(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDetailDao.java

@@ -146,4 +146,16 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
      * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail>
      */
     List<MusicGroupPaymentCalenderDetail> getUnusedPaymentCalenderWithMusicGroup(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * @describe 获取缴费日历学员列表
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/10/30
+     * @time 16:39
+     * @param calenderId:
+     * @param musicGroupId:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
+     */
+	List<SimpleUserDto> querySimpleUserDto(@Param("calenderId") Integer calenderId, @Param("musicGroupId") String musicGroupId);
 }

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

@@ -0,0 +1,41 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class MusicGroupPaymentCalenderAuditDetailDto {
+    @ApiModelProperty(value = "学员数量",required = false)
+    private Integer studentNum;
+
+    @ApiModelProperty(value = "学员名单",required = false)
+    private List<SimpleUserDto> simpleUserDtos;
+
+    @ApiModelProperty(value = "收费标准列表",required = false)
+    private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettings;
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+
+    public List<SimpleUserDto> getSimpleUserDto() {
+        return simpleUserDtos;
+    }
+
+    public void setBasicUserDtos(List<SimpleUserDto> simpleUserDtos) {
+        this.simpleUserDtos = simpleUserDtos;
+    }
+
+    public List<MusicGroupPaymentCalenderCourseSettings> getMusicGroupPaymentCalenderCourseSettings() {
+        return musicGroupPaymentCalenderCourseSettings;
+    }
+
+    public void setMusicGroupPaymentCalenderCourseSettings(List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettings) {
+        this.musicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalenderCourseSettings;
+    }
+}

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

@@ -0,0 +1,240 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MusicGroupPaymentCalenderAuditDto {
+    @ApiModelProperty(value = "缴费项目编号",required = false)
+    private Long musicGroupPaymentCalenderId;
+
+    @ApiModelProperty(value = "分部编号",required = false)
+    private Integer organId;
+
+    @ApiModelProperty(value = "分部名称",required = false)
+    private String organName;
+
+    @ApiModelProperty(value = "乐团名称",required = false)
+    private String musicGroupName;
+
+    @ApiModelProperty(value = "乐团编号",required = false)
+    private String musicGroupId;
+
+    @ApiModelProperty(value = "创建时间",required = false)
+    private Date createTime;
+
+    @ApiModelProperty(value = "缴费类型", required = false)
+    private MusicGroupPaymentCalender.PaymentType paymentType;
+
+    @ApiModelProperty(value = "订单类型，学校/个人", required = false)
+    private MusicGroupPaymentCalender.PayUserType payUserType;
+
+    @ApiModelProperty(value = "加课总时长",required = false)
+    private Integer addCourseTotalTime;
+
+    @ApiModelProperty(value = "原价",required = false)
+    private BigDecimal courseOriginalPrice;
+
+    @ApiModelProperty(value = "申请价格",required = false)
+    private BigDecimal courseCurrentPrice;
+
+    @ApiModelProperty(value = "备注",required = false)
+    private String memo;
+
+    @ApiModelProperty(value = "创建人编号",required = false)
+    private Integer operator;
+
+    @ApiModelProperty(value = "创建人名称",required = false)
+    private String operatorName;
+
+    @ApiModelProperty(value = "审核状态",required = false)
+    private MusicGroupPaymentCalender.PaymentCalenderStatusEnum auditStatus;
+
+    @ApiModelProperty(value = "收费标准名称",required = false)
+    private String calenderSettingsName;
+
+    @ApiModelProperty(value = "缴费方式",required = false)
+    private Integer paymentPattern;
+
+    @ApiModelProperty(value = "缴费有效期开始时间",required = false)
+    private String paymentValidStartDate;
+
+    @ApiModelProperty(value = "缴费有效期结束时间",required = false)
+    private String paymentValidEndDate;
+
+    @ApiModelProperty(value = "开始缴费日期",required = false)
+    private String startPaymentDate;
+
+    @ApiModelProperty(value = "缴费截止日期",required = false)
+    private String deadlinePaymentDate;
+
+    public String getCalenderSettingsName() {
+        return calenderSettingsName;
+    }
+
+    public void setCalenderSettingsName(String calenderSettingsName) {
+        this.calenderSettingsName = calenderSettingsName;
+    }
+
+    public Integer getPaymentPattern() {
+        return paymentPattern;
+    }
+
+    public void setPaymentPattern(Integer paymentPattern) {
+        this.paymentPattern = paymentPattern;
+    }
+
+    public String getPaymentValidStartDate() {
+        return paymentValidStartDate;
+    }
+
+    public void setPaymentValidStartDate(String paymentValidStartDate) {
+        this.paymentValidStartDate = paymentValidStartDate;
+    }
+
+    public String getPaymentValidEndDate() {
+        return paymentValidEndDate;
+    }
+
+    public void setPaymentValidEndDate(String paymentValidEndDate) {
+        this.paymentValidEndDate = paymentValidEndDate;
+    }
+
+    public String getStartPaymentDate() {
+        return startPaymentDate;
+    }
+
+    public void setStartPaymentDate(String startPaymentDate) {
+        this.startPaymentDate = startPaymentDate;
+    }
+
+    public String getDeadlinePaymentDate() {
+        return deadlinePaymentDate;
+    }
+
+    public void setDeadlinePaymentDate(String deadlinePaymentDate) {
+        this.deadlinePaymentDate = deadlinePaymentDate;
+    }
+
+    public Long getMusicGroupPaymentCalenderId() {
+        return musicGroupPaymentCalenderId;
+    }
+
+    public void setMusicGroupPaymentCalenderId(Long musicGroupPaymentCalenderId) {
+        this.musicGroupPaymentCalenderId = musicGroupPaymentCalenderId;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public MusicGroupPaymentCalender.PaymentType getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(MusicGroupPaymentCalender.PaymentType paymentType) {
+        this.paymentType = paymentType;
+    }
+
+    public MusicGroupPaymentCalender.PayUserType getPayUserType() {
+        return payUserType;
+    }
+
+    public void setPayUserType(MusicGroupPaymentCalender.PayUserType payUserType) {
+        this.payUserType = payUserType;
+    }
+
+    public Integer getAddCourseTotalTime() {
+        return addCourseTotalTime;
+    }
+
+    public void setAddCourseTotalTime(Integer addCourseTotalTime) {
+        this.addCourseTotalTime = addCourseTotalTime;
+    }
+
+    public BigDecimal getCourseOriginalPrice() {
+        return courseOriginalPrice;
+    }
+
+    public void setCourseOriginalPrice(BigDecimal courseOriginalPrice) {
+        this.courseOriginalPrice = courseOriginalPrice;
+    }
+
+    public BigDecimal getCourseCurrentPrice() {
+        return courseCurrentPrice;
+    }
+
+    public void setCourseCurrentPrice(BigDecimal courseCurrentPrice) {
+        this.courseCurrentPrice = courseCurrentPrice;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Integer getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Integer operator) {
+        this.operator = operator;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public MusicGroupPaymentCalender.PaymentCalenderStatusEnum getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import java.math.BigDecimal;
+
 /**
  * @Author Joburgess
  * @Date 2020/2/9
@@ -18,6 +20,16 @@ public class SimpleUserDto {
 
     private String phone;
 
+    private BigDecimal actualAmount;
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
     public String getPhone() {
         return phone;
     }

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

@@ -36,7 +36,7 @@ public class MusicGroupPaymentCalender {
 	}
 
 	public enum PayUserType implements BaseEnum<String, PayUserType> {
-		STUDENT("学生"), SCHOOL("学校");
+		STUDENT("个人"), SCHOOL("学校");
 
 		private String desc;
 
@@ -55,6 +55,26 @@ public class MusicGroupPaymentCalender {
 
 	}
 
+	public enum PaymentType implements BaseEnum<String, PaymentType> {
+		ADD_STUDENT("新增学员"), ADD_COURSE("临时加课"), MUSIC_COURSE("乐团课程");
+
+		private String desc;
+
+		PaymentType(String desc) {
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return this.name();
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+
+	}
+
 	private Long id;
 
 	@ApiModelProperty(value = "乐团编号", required = false)
@@ -80,7 +100,7 @@ public class MusicGroupPaymentCalender {
 	private Integer paymentPattern;
 
 	@ApiModelProperty(value = "缴费类型0续费,1报名", required = false)
-	private Integer paymentType;
+	private PaymentType paymentType;
 
 	private PaymentCalenderStatusEnum status;
 
@@ -107,11 +127,11 @@ public class MusicGroupPaymentCalender {
 	private List<MusicGroupPaymentCalenderCourseSettings> MusicGroupPaymentCalenderCourseSettingsList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>();
 
 
-	public Integer getPaymentType() {
+	public PaymentType getPaymentType() {
 		return paymentType;
 	}
 
-	public void setPaymentType(Integer paymentType) {
+	public void setPaymentType(PaymentType paymentType) {
 		this.paymentType = paymentType;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupPaymentCalenderQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
@@ -9,9 +10,29 @@ public class MusicGroupPaymentCalenderQueryInfo extends QueryInfo {
 	private String musicGroupId;
 	
 	private PayUserType payUserType;
+
+	private MusicGroupPaymentCalender.PaymentType paymentType;
 	
 	private PaymentCalenderStatusEnum status;
 
+	private String organId;
+
+	public MusicGroupPaymentCalender.PaymentType getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(MusicGroupPaymentCalender.PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public String getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(String organId) {
+		this.organId = organId;
+	}
+
 	public String getMusicGroupId() {
 		return musicGroupId;
 	}

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

@@ -2,7 +2,12 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface MusicGroupPaymentCalenderService extends BaseService<Long, MusicGroupPaymentCalender> {
@@ -61,4 +66,26 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @return void
 	 */
 	void autoUpdateMusicGroupStudentFeeStatus();
+
+	/**
+	 * @describe 乐团缴费日历审核列表
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/10/30
+	 * @time 10:45
+	 * @param pageInfo:
+	 * @return void
+	 */
+	PageInfo<MusicGroupPaymentCalenderAuditDto> auditList(MusicGroupPaymentCalenderQueryInfo pageInfo);
+
+	/**
+	 * @describe 乐团缴费日历审核列表详情
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/10/30
+	 * @time 15:10
+	 * @param calenderId:
+	 * @return com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto
+	 */
+	MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId,String musicGroupId);
 }

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

@@ -1,17 +1,16 @@
 package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -137,7 +136,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 			
 			//如果是报名，需要修改乐团状态
-			if (musicGroupPaymentCalender.getPaymentType() == 1) {
+			if (musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_COURSE) {
 				musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
 				musicGroup.setUpdateTime(date);
 				musicGroupDao.update(musicGroup);
@@ -265,7 +264,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 			
 			//如果是报名，需要修改乐团状态
-			if (musicGroupPaymentCalender.getPaymentType() == 1) {
+			if (musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_COURSE) {
 				musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
 				musicGroup.setUpdateTime(date);
 				musicGroupDao.update(musicGroup);
@@ -377,6 +376,46 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
+	public PageInfo<MusicGroupPaymentCalenderAuditDto> auditList(MusicGroupPaymentCalenderQueryInfo queryInfo) {
+		PageInfo<MusicGroupPaymentCalenderAuditDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<MusicGroupPaymentCalenderAuditDto> dataList = null;
+		int count = musicGroupPaymentCalenderDao.countAuditList(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = musicGroupPaymentCalenderDao.queryAuditList(params);
+			List<Integer> collect = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toList());
+			Map<Integer, String> organNameMap = getMap("organization", "id_", "name_", collect, Integer.class, String.class);
+			List<Integer> operatorIds = dataList.stream().map(e -> e.getOperator()).collect(Collectors.toList());
+			operatorIds.removeAll(Collections.singleton(null));
+			Map<Integer, String> realNameMap = getMap("sys_user", "id_", "real_name_", operatorIds, Integer.class, String.class);
+			dataList.forEach(e->{
+				e.setOperatorName(organNameMap.get(e.getOrganId()));
+				e.setOperatorName(realNameMap.get(e.getOperator()));
+			});
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
+	public MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId,String musicGroupId) {
+		MusicGroupPaymentCalenderAuditDetailDto calenderAuditDetailDto = new MusicGroupPaymentCalenderAuditDetailDto();
+		//获取收费标准
+		calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(musicGroupPaymentCalenderCourseSettingsDao.queryCalenderCourseSettings(calenderId));
+		//获取学员列表
+		calenderAuditDetailDto.setBasicUserDtos(musicGroupPaymentCalenderDetailDao.querySimpleUserDto(calenderId,musicGroupId));
+		calenderAuditDetailDto.setStudentNum(calenderAuditDetailDto.getSimpleUserDto().size());
+		return calenderAuditDetailDto;
+	}
+
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		// 获取当天创建且未缴费的数据，并推送

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

@@ -124,4 +124,8 @@
 			#{id}
 		</foreach>
 	</select>
+	<select id="queryCalenderCourseSettings" resultMap="MusicGroupPaymentCalenderCourseSettings">
+		SELECT * FROM music_group_payment_calender_course_settings mgpccs
+		WHERE mgpccs.music_group_payment_calender_id_ = #{calenderId}
+	</select>
 </mapper>

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

@@ -330,4 +330,18 @@
 			mgpc.music_group_id_ = #{musicGroupId}
 			AND NOT EXISTS ( SELECT id_ FROM course_schedule_student_payment WHERE batch_no_ = mgpcd.music_group_payment_calender_id_ AND music_group_id_ = #{musicGroupId} )
 	</select>
+	<resultMap id="SimpleUserDtoMap" type="com.ym.mec.biz.dal.dto.SimpleUserDto">
+		<result property="userName" column="username_"/>
+		<result property="userId" column="id_"/>
+		<result property="subjectNames" column="subject_name_"/>
+		<result property="actualAmount" column="actual_amount_"/>
+	</resultMap>
+    <select id="querySimpleUserDto" resultMap="SimpleUserDtoMap">
+		SELECT su.id_,su.username_,s.name_ subject_name_,mgpcd.actual_amount_
+		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_ AND sr.music_group_status_ != 'QUIT' AND sr.music_group_id_ = #{musicGroupId}
+		LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
+		WHERE mgpcd.music_group_payment_calender_id_ = #{calenderId}
+	</select>
 </mapper>

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

@@ -24,7 +24,7 @@
         <result column="payment_valid_start_date_" property="paymentValidStartDate"/>
         <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
         <result column="payment_pattern_" property="paymentPattern"/>
-        <result column="payment_type_" property="paymentType"/>
+        <result column="payment_type_" property="paymentType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="batch_no_" property="batchNo"/>
     </resultMap>
 
@@ -46,7 +46,7 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_type_,batch_no_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
-        #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType},#{batchNo})
+        #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{batchNo})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -58,7 +58,7 @@
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.expectNum},#{item.actualNum},#{item.memo},#{item.isGiveMusicNetwork},now(),now(),
-        #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentType},#{item.batchNo})
+        #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.batchNo})
         </foreach>
     </insert>
 
@@ -67,7 +67,7 @@
         UPDATE music_group_payment_calender
         <set>
             <if test="paymentType != null">
-                payment_type_ = #{paymentType},
+                payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="paymentValidStartDate != null">
                 payment_valid_start_date_ = #{paymentValidStartDate},
@@ -336,4 +336,61 @@
         </foreach>
         ORDER BY create_time_ LIMIT 1;
     </select>
+
+    <resultMap id="MusicGroupPaymentCalenderAuditDtoMap" type="com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto">
+        <result property="musicGroupId" column="music_group_id_"/>
+        <result property="musicGroupName" column="music_group_name_"/>
+        <result property="organId" column="organ_id_"/>
+        <result property="createTime" column="create_time_"/>
+        <result property="paymentType" column="payment_type_"/>
+        <result property="memo" column="memo_"/>
+        <result property="operator" column="operator_"/>
+        <result property="auditStatus" column="status_"/>
+        <result property="addCourseTotalTime" column="course_total_minuties_"/>
+        <result property="courseCurrentPrice" column="course_current_price_"/>
+        <result property="courseOriginalPrice" column="course_original_price_"/>
+        <result property="musicGroupPaymentCalenderId" column="id_"/>
+        <result property="payUserType" column="pay_user_type_"/>
+        <result property="calenderSettingsName" column="calender_settings_name_"/>
+        <result property="paymentPattern" column="payment_pattern_"/>
+        <result property="paymentValidEndDate" column="payment_valid_start_date_"/>
+        <result property="paymentValidEndDate" column="payment_valid_end_date_"/>
+        <result property="startPaymentDate" column="start_payment_date_"/>
+        <result property="deadlinePaymentDate" column="deadline_payment_date_"/>
+    </resultMap>
+    <sql id="MusicGroupPaymentCalenderAuditDtoSql">
+        <where>
+            <if test="paymentType != null and paymentType != ''">
+                AND mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="paymentCalenderStatus != null and paymentCalenderStatus != ''">
+                AND mgpc.status_ = #{paymentCalenderStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="organId != null and organId != ''">
+                AND FIND_IN_SET(mg.organ_id_,#{organId})
+            </if>
+            <if test="search != null and search != ''">
+                AND (mg.id_ LIKE CONCAT('%',#{search},'%') OR mg.name_ LIKE CONCAT('%',#{search},'%'))
+            </if>
+        </where>
+    </sql>
+    <select id="countAuditList" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT mgpc.id_)
+        FROM music_group_payment_calender mgpc
+        LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_
+        <include refid="MusicGroupPaymentCalenderAuditDtoSql"/>
+    </select>
+    <select id="queryAuditList" resultMap="MusicGroupPaymentCalenderAuditDtoMap">
+        SELECT mgpc.id_,mgpc.music_group_id_,mgpc.create_time_,mgpc.payment_type_,mgpc.operator_,
+        mgpc.pay_user_type_,mgpc.memo_,mgpc.status_,SUM(mgpccs.course_total_minuties_) course_total_minuties_,
+        SUM(mgpccs.course_original_price_) course_original_price_,SUM(mgpccs.course_current_price_) course_current_price_,
+        MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,MAX(mgpccs.name_) calender_settings_name_,mgpc.payment_pattern_,mgpc.payment_valid_start_date_,
+        mgpc.payment_valid_end_date_,mgpc.start_payment_date_,mgpc.deadline_payment_date_
+        FROM music_group_payment_calender mgpc
+        LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_
+        LEFT JOIN music_group_payment_calender_course_settings mgpccs ON mgpc.id_ = mgpccs.music_group_payment_calender_id_
+        <include refid="MusicGroupPaymentCalenderAuditDtoSql"/>
+        GROUP BY mgpc.id_
+        <include refid="global.limit"/>
+    </select>
 </mapper>

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -63,4 +65,18 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         musicGroupPaymentCalenderService.paymentPush(id,userIds);
         return succeed();
     }
+
+    @ApiOperation(value = "乐团缴费日历审核列表")
+    @GetMapping("/auditList")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/auditList')")
+    public Object auditList(MusicGroupPaymentCalenderQueryInfo queryInfo) {
+        return succeed(musicGroupPaymentCalenderService.auditList(queryInfo));
+    }
+
+    @ApiOperation(value = "乐团缴费日历审核列表详情")
+    @GetMapping("/auditListDetail")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/auditListDetail')")
+    public Object auditListDetail(Integer calenderId,String musicGroupId) {
+        return succeed(musicGroupPaymentCalenderService.auditListDetail(calenderId,musicGroupId));
+    }
 }