增加经营报表接口

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

@@ -52,9 +52,14 @@ public class MusicGroupSubjectGoodsGroup {
 	//购买方式
 	private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
 
-	//购买方式-减免金额 json
+	//购买方式-乐器减免金额 json
+	@ApiModelProperty(value = "购买方式-乐器减免金额 json",required = false)
 	private String kitGroupPurchaseTypeJson;
 
+	//购买方式-减免金额 json
+	@ApiModelProperty(value = "购买方式-课程减免金额 json",required = false)
+	private String coursePurchaseTypeJson;
+
 
 	/**  */
 	private java.util.Date createTime;
@@ -178,6 +183,14 @@ public class MusicGroupSubjectGoodsGroup {
 		this.kitGroupPurchaseType = kitGroupPurchaseType;
 	}
 
+	public String getCoursePurchaseTypeJson() {
+		return coursePurchaseTypeJson;
+	}
+
+	public void setCoursePurchaseTypeJson(String coursePurchaseTypeJson) {
+		this.coursePurchaseTypeJson = coursePurchaseTypeJson;
+	}
+
 
 	public String getKitGroupPurchaseTypeJson() {
 		return kitGroupPurchaseTypeJson;
@@ -191,4 +204,5 @@ public class MusicGroupSubjectGoodsGroup {
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
+
 }

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

@@ -18,6 +18,7 @@
         <result column="deposit_fee_" property="depositFee"/>
         <result column="remission_course_fee_" property="remissionCourseFee"/>
         <result column="kit_group_purchase_type_json_" property="kitGroupPurchaseTypeJson"/>
+        <result column="course_purchase_type_json_" property="coursePurchaseTypeJson"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -38,16 +39,16 @@
             parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_goods_group
-        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_)
-        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson})
+        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_)
+        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson},#{coursePurchaseTypeJson})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO music_group_subject_goods_group
-        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_) VALUES
+        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_) VALUES
         <foreach collection="lists" item="item" index="index" separator=",">
             (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.kitGroupPurchaseTypeJson})
+            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson})
         </foreach>
     </insert>