经营报表调整

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.StudentMusicCourseFee;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface StudentMusicCourseFeeDao extends BaseDAO<Integer, StudentMusicCourseFee> {
+
+}

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

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 对应数据库表(student_music_course_fee):
+ */
+@Data
+public class StudentMusicCourseFee extends BaseEntity {
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private Integer id;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private Integer organId;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String musicGroupId;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String expectPrice;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String actualPrice;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String receivablePrice;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String createTime;
+
+	@ApiModelProperty(value = "收费类型编号",required = false)
+	private String updateTime;
+}

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

@@ -455,7 +455,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             //应收 = 预计课费 - 实际课费
             //实际收入 = 当月已消耗课费总和
             //预计收入 = 实际总课费
-
         }
 
         ModelMap map = new ModelMap(1);