Merge remote-tracking branch 'origin/master'

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

@@ -182,4 +182,14 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      */
     List<Map<Long, Long>> countActualNum(@Param("id") Long id);
 
+    /**
+     * @describe 获取审核详情
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/11/2
+     * @time 17:46
+     * @param calenderId:
+     * @return com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto
+     */
+    MusicGroupPaymentCalenderAuditDto getAuditDetail(@Param("calenderId") Integer calenderId);
 }

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

@@ -6,6 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 
 public class MusicGroupPaymentCalenderAuditDetailDto {
+    @ApiModelProperty(value = "缴费项基本信息",required = false)
+    private MusicGroupPaymentCalenderAuditDto auditDto;
+
     @ApiModelProperty(value = "学员数量",required = false)
     private Integer studentNum;
 
@@ -15,6 +18,14 @@ public class MusicGroupPaymentCalenderAuditDetailDto {
     @ApiModelProperty(value = "收费标准列表",required = false)
     private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettings;
 
+    public MusicGroupPaymentCalenderAuditDto getAuditDto() {
+        return auditDto;
+    }
+
+    public void setAuditDto(MusicGroupPaymentCalenderAuditDto auditDto) {
+        this.auditDto = auditDto;
+    }
+
     public Integer getStudentNum() {
         return studentNum;
     }

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

@@ -43,6 +43,9 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "备注",required = false)
     private String memo;
 
+    @ApiModelProperty(value = "审核意见",required = false)
+    private String auditMemo;
+
     @ApiModelProperty(value = "创建人编号",required = false)
     private Integer operator;
 
@@ -70,6 +73,14 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "缴费截止日期",required = false)
     private String deadlinePaymentDate;
 
+    public String getAuditMemo() {
+        return auditMemo;
+    }
+
+    public void setAuditMemo(String auditMemo) {
+        this.auditMemo = auditMemo;
+    }
+
     public String getCalenderSettingsName() {
         return calenderSettingsName;
     }

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

@@ -94,7 +94,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param calenderId:
 	 * @return com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto
 	 */
-	MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId,String musicGroupId);
+	MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId);
 
 	/**
 	 * @describe 审核通过

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

@@ -67,6 +67,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private SysConfigDao sysConfigDao;
 	@Autowired
+	private OrganizationDao organizationDao;
+	@Autowired
 	private SysMessageService sysMessageService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
@@ -436,12 +438,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
-	public MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId,String musicGroupId) {
+	public MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId) {
 		MusicGroupPaymentCalenderAuditDetailDto calenderAuditDetailDto = new MusicGroupPaymentCalenderAuditDetailDto();
+		MusicGroupPaymentCalenderAuditDto auditDto = musicGroupPaymentCalenderDao.getAuditDetail(calenderId);
+		if(auditDto.getOrganId() != null){
+			Organization organization = organizationDao.get(auditDto.getOrganId());
+			auditDto.setOrganName(organization.getName());
+		}
+		if(auditDto.getOperator() != null){
+			SysUser sysUser = sysUserFeignService.queryUserById(auditDto.getOperator());
+			auditDto.setOperatorName(sysUser.getRealName());
+		}
+		calenderAuditDetailDto.setAuditDto(auditDto);
+
 		//获取收费标准
 		calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(musicGroupPaymentCalenderCourseSettingsDao.queryCalenderCourseSettings(calenderId));
 		//获取学员列表
-		calenderAuditDetailDto.setBasicUserDtos(musicGroupPaymentCalenderDetailDao.querySimpleUserDto(calenderId,musicGroupId));
+		calenderAuditDetailDto.setBasicUserDtos(musicGroupPaymentCalenderDetailDao.querySimpleUserDto(calenderId,auditDto.getMusicGroupId()));
 		calenderAuditDetailDto.setStudentNum(calenderAuditDetailDto.getSimpleUserDto().size());
 		return calenderAuditDetailDto;
 	}

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

@@ -378,6 +378,7 @@
         <result property="paymentValidEndDate" column="payment_valid_end_date_"/>
         <result property="startPaymentDate" column="start_payment_date_"/>
         <result property="deadlinePaymentDate" column="deadline_payment_date_"/>
+        <result property="auditMemo" column="audit_memo_"/>
     </resultMap>
     <sql id="MusicGroupPaymentCalenderAuditDtoSql">
         <where>
@@ -405,8 +406,7 @@
         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_
+        MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,mgpc.payment_pattern_
         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_
@@ -426,4 +426,15 @@
         AND mgpcd.payment_status_ = 'PAID_COMPLETED'
         GROUP BY mgpcd.music_group_payment_calender_id_
     </select>
+    <select id="getAuditDetail" 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_,mgpc.audit_memo_
+        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_
+        WHERE mgpc.id_ = #{calenderId} LIMIT 1
+    </select>
 </mapper>

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

@@ -110,8 +110,8 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     @ApiOperation(value = "乐团缴费日历审核列表详情")
     @GetMapping("/auditListDetail")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/auditListDetail')")
-    public Object auditListDetail(Integer calenderId,String musicGroupId) {
-        return succeed(musicGroupPaymentCalenderService.auditListDetail(calenderId,musicGroupId));
+    public Object auditListDetail(Integer calenderId) {
+        return succeed(musicGroupPaymentCalenderService.auditListDetail(calenderId));
     }
 
     @ApiOperation(value = "乐团缴费日历审核通过")