经营报表

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
+@Data
 public class MusicGroupPaymentCalenderDetailDto extends MusicGroupPaymentCalenderDetail {
     //辅件
     private BigDecimal accessoriesAmount = BigDecimal.ZERO;
@@ -16,52 +19,4 @@ public class MusicGroupPaymentCalenderDetailDto extends MusicGroupPaymentCalende
     private BigDecimal activityAmount = BigDecimal.ZERO;
     //课程
     private BigDecimal courseAmount = BigDecimal.ZERO;
-
-    public BigDecimal getCourseAmount() {
-        return courseAmount;
-    }
-
-    public void setCourseAmount(BigDecimal courseAmount) {
-        this.courseAmount = courseAmount;
-    }
-
-    public BigDecimal getAccessoriesAmount() {
-        return accessoriesAmount;
-    }
-
-    public void setAccessoriesAmount(BigDecimal accessoriesAmount) {
-        this.accessoriesAmount = accessoriesAmount;
-    }
-
-    public BigDecimal getCloudAmount() {
-        return cloudAmount;
-    }
-
-    public void setCloudAmount(BigDecimal cloudAmount) {
-        this.cloudAmount = cloudAmount;
-    }
-
-    public BigDecimal getMusicalAmount() {
-        return musicalAmount;
-    }
-
-    public void setMusicalAmount(BigDecimal musicalAmount) {
-        this.musicalAmount = musicalAmount;
-    }
-
-    public BigDecimal getMaintenanceAmount() {
-        return maintenanceAmount;
-    }
-
-    public void setMaintenanceAmount(BigDecimal maintenanceAmount) {
-        this.maintenanceAmount = maintenanceAmount;
-    }
-
-    public BigDecimal getActivityAmount() {
-        return activityAmount;
-    }
-
-    public void setActivityAmount(BigDecimal activityAmount) {
-        this.activityAmount = activityAmount;
-    }
 }

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

@@ -88,6 +88,8 @@ public class MusicGroupPaymentCalenderDetail extends BaseEntity {
 	
 	private SysUser responsible = new SysUser();
 
+	private StudentRegistration studentRegistration = new StudentRegistration();
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,5 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,29 +13,38 @@ import java.math.BigDecimal;
  * 对应数据库表(student_music_course_fee):
  */
 @Data
-public class StudentMusicCourseFee extends BaseEntity {
+public class StudentMusicCourseFee{
 
+	@TableId(value = "id_", type = IdType.AUTO)
 	private Integer id;
 
+	@TableField("user_id_")
 	@ApiModelProperty(value = "学员编号",required = false)
 	private Integer userId;
 
+	@TableField("organ_id_")
 	@ApiModelProperty(value = "分部编号",required = false)
 	private Integer organId;
 
+	@TableField("music_group_id_")
 	@ApiModelProperty(value = "乐团编号",required = false)
 	private String musicGroupId;
 
+	@TableField("expect_price_")
 	@ApiModelProperty(value = "预计总课费",required = false)
 	private BigDecimal expectPrice = BigDecimal.ZERO;
 
+	@TableField("actual_price_")
 	@ApiModelProperty(value = "实收总课费",required = false)
 	private BigDecimal actualPrice = BigDecimal.ZERO;
 
+	@TableField("receivable_price_")
 	@ApiModelProperty(value = "应收",required = false)
 	private BigDecimal receivablePrice = BigDecimal.ZERO;
 
+	@TableField("create_time_")
 	private String createTime;
 
+	@TableField("update_time_")
 	private String updateTime;
 }

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

@@ -243,6 +243,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
             musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
             musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
             musicGroupPaymentCalenderDetail.setResponsibleUserId(musicGroupPaymentCalender.getOperator());
+            musicGroupPaymentCalenderDetail.setMusicGroupId(musicGroupPaymentCalender.getMusicGroupId());
             //设置云教练、课程收入
             this.setCourseIncome(calenderMember,musicGroupPaymentCalenderDetail);
             Integer organId = musicGroupPaymentCalender.getOrganId();

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

@@ -25,7 +25,7 @@
 		<result column="current_year_fee_" property="currentYearFee" />
 		<result column="group_purchase_year_fee_" property="groupPurchaseYearFee" />
 		<result column="original_year_fee_" property="originalYearFee" />
-		<result column="income_year_fee" property="incomeYearFee" />
+		<result column="income_year_fee_" property="incomeYearFee" />
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 

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

@@ -28,7 +28,6 @@
 		<result column="use_in_course_" property="useInCourse"/>
 		<result column="responsible_user_id_" property="responsibleUserId"/>
 		<result column="responsible_record_" property="responsibleRecord"/>
-		<result column="course_income_" property="courseIncome"/>
 		<result column="responsible_username_" property="responsible.username"/>
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 			<result column="username_" property="username" />
@@ -57,11 +56,11 @@
 		INSERT INTO music_group_payment_calender_detail
 		(music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,
 		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_,
-		payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_,course_income_)
+		payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_)
 		VALUES(#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},
 		       #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{userStatus},#{payTime},NOW(),NOW(),#{startPaymentDate},#{deadlinePaymentDate},
-		       #{paymentOrderId},#{useInCourse},#{responsibleUserId},#{responsibleRecord},#{expectMemberAmount},#{tenantId},#{courseIncome})
+		       #{paymentOrderId},#{useInCourse},#{responsibleUserId},#{responsibleRecord},#{expectMemberAmount},#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
@@ -69,13 +68,13 @@
         INSERT INTO music_group_payment_calender_detail
 		(music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,
 		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,
-		 deadline_payment_date_,payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_,course_income_)
+		 deadline_payment_date_,payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
             (#{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.startPaymentDate},#{item.deadlinePaymentDate},
-             #{item.paymentOrderId},#{item.useInCourse},#{item.responsibleUserId},#{item.responsibleRecord},#{item.expectMemberAmount},#{item.tenantId},#{item.courseIncome})
+             #{item.paymentOrderId},#{item.useInCourse},#{item.responsibleUserId},#{item.responsibleRecord},#{item.expectMemberAmount},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -84,9 +83,6 @@
 		parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
 		UPDATE music_group_payment_calender_detail
 		<set>
-			<if test="courseIncome != null">
-				course_income_ = #{courseIncome},
-			</if>
 			<if test="startPaymentDate != null">
 				start_payment_date_ = #{startPaymentDate},
 			</if>
@@ -142,9 +138,6 @@
 		<foreach collection="calenderDetails" item="item" index="index" open="" close="" separator=";">
 			UPDATE music_group_payment_calender_detail
 			<set>
-				<if test="item.courseIncome != null">
-					course_income_ = #{item.courseIncome},
-				</if>
 				<if test="item.startPaymentDate != null">
 					start_payment_date_ = #{item.startPaymentDate},
 				</if>