Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectPlanDao.java

@@ -2,17 +2,6 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.web.dal.dto.SubSetViewDto;
-
-import java.util.List;
 
 public interface MusicGroupSubjectPlanDao extends BaseDAO<Integer, MusicGroupSubjectPlan> {
-
-
-    /**
-     * 根据乐团编号，获取乐团下所有科目，以及预计招生人数
-     * @param musicGroupId
-     * @return
-     */
-    List<SubSetViewDto> findSubByGroupId(Integer musicGroupId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubFeeSettingDto.java

@@ -0,0 +1,13 @@
+package com.ym.mec.web.dal.dto;
+
+public class SubFeeSettingDto {
+    private Integer subjectId;
+
+    private String subjectName;
+
+    private Integer expectedStudentNum;
+
+    private Long depositFee;
+
+//    private
+}

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubSetViewDto.java

@@ -1,64 +0,0 @@
-package com.ym.mec.web.dal.dto;
-
-import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-public class SubSetViewDto {
-
-    @ApiModelProperty(value = "乐团科目规划表编号",required = false)
-    private Integer planId;
-
-    @ApiModelProperty(value = "科目编号",required = false)
-    private String subId;
-
-    @ApiModelProperty(value = "科目名称",required = false)
-    private String subName;
-
-    @ApiModelProperty(value = "计划招生人数",required = false)
-    private Integer expectedStudentNum;
-
-    @ApiModelProperty(value = "乐器分组列表，包含乐器、辅件、教材",required = false)
-    private List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups;
-
-    public Integer getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(Integer planId) {
-        this.planId = planId;
-    }
-
-    public String getSubId() {
-        return subId;
-    }
-
-    public void setSubId(String subId) {
-        this.subId = subId;
-    }
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-
-    public Integer getExpectedStudentNum() {
-        return expectedStudentNum;
-    }
-
-    public void setExpectedStudentNum(Integer expectedStudentNum) {
-        this.expectedStudentNum = expectedStudentNum;
-    }
-
-    public List<MusicGroupSubjectGoodsGroup> getMusicGroupSubjectGoodsGroups() {
-        return musicGroupSubjectGoodsGroups;
-    }
-
-    public void setMusicGroupSubjectGoodsGroups(List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups) {
-        this.musicGroupSubjectGoodsGroups = musicGroupSubjectGoodsGroups;
-    }
-}

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubSettingDto.java

@@ -1,65 +0,0 @@
-package com.ym.mec.web.dal.dto;
-
-import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-//建团申请，声部设置实体类
-public class SubSettingDto {
-
-    @ApiModelProperty(value = "乐团科目规划表编号",required = false)
-    private Integer planId;
-
-    @ApiModelProperty(value = "乐团编号",required = false)
-    private Integer musicGroupId;
-
-    @ApiModelProperty(value = "计划招生人数",required = false)
-    private Integer expectedStudentNum;
-
-    @ApiModelProperty(value = "科目编号",required = false)
-    private Integer subId;
-
-    @ApiModelProperty(value = "当前声部商品打包列表",required = false)
-    private List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups;
-
-    public Integer getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(Integer planId) {
-        this.planId = planId;
-    }
-
-    public Integer getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(Integer musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public Integer getExpectedStudentNum() {
-        return expectedStudentNum;
-    }
-
-    public void setExpectedStudentNum(Integer expectedStudentNum) {
-        this.expectedStudentNum = expectedStudentNum;
-    }
-
-    public Integer getSubId() {
-        return subId;
-    }
-
-    public void setSubId(Integer subId) {
-        this.subId = subId;
-    }
-
-    public List<MusicGroupSubjectGoodsGroup> getMusicGroupSubjectGoodsGroups() {
-        return musicGroupSubjectGoodsGroups;
-    }
-
-    public void setMusicGroupSubjectGoodsGroups(List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups) {
-        this.musicGroupSubjectGoodsGroups = musicGroupSubjectGoodsGroups;
-    }
-}

mec-web/src/main/java/com/ym/mec/web/dal/entity/ChargeType.java

@@ -24,6 +24,10 @@ public class ChargeType {
 	/** 描述 */
 	@ApiModelProperty(value = "收费类型描述",required = false)
 	private String description;
+
+	/** 描述 */
+	@ApiModelProperty(value = "默认课程形态",required = false)
+	private String courseForm;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -78,7 +82,15 @@ public class ChargeType {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
+	public String getCourseForm() {
+		return courseForm;
+	}
+
+	public void setCourseForm(String courseForm) {
+		this.courseForm = courseForm;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-web/src/main/java/com/ym/mec/web/dal/entity/ChargeTypeSubjectMapper.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.KitGroupPurchaseTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -24,6 +25,18 @@ public class ChargeTypeSubjectMapper {
 	
 	/**  */
 	private java.util.Date updateTime;
+
+	/**  */
+	@ApiModelProperty(value = "乐器提供方式",required = false)
+	private KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum;
+
+	/**  */
+	@ApiModelProperty(value = "乐器押金",required = false)
+	private Integer depositFee;
+
+	/**  */
+	@ApiModelProperty(value = "课程费用",required = false)
+	private Integer fee;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -64,7 +77,31 @@ public class ChargeTypeSubjectMapper {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
+	public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
+		return kitGroupPurchaseTypeEnum;
+	}
+
+	public void setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum) {
+		this.kitGroupPurchaseTypeEnum = kitGroupPurchaseTypeEnum;
+	}
+
+	public Integer getDepositFee() {
+		return depositFee;
+	}
+
+	public void setDepositFee(Integer depositFee) {
+		this.depositFee = depositFee;
+	}
+
+	public Integer getFee() {
+		return fee;
+	}
+
+	public void setFee(Integer fee) {
+		this.fee = fee;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup4Teacher.java

@@ -13,7 +13,7 @@ public class ClassGroup4Teacher extends ClassGroup{
 	private String musicGroupName;
 
 	@ApiModelProperty(value = "乐团状态",required = false)
-	private MusicGroupStatusEnum MusicGroupStatus;
+	private MusicGroupStatusEnum musicGroupStatus;
 
 	public String getMusicGroupName() {
 		return musicGroupName;
@@ -24,11 +24,11 @@ public class ClassGroup4Teacher extends ClassGroup{
 	}
 
 	public MusicGroupStatusEnum getMusicGroupStatus() {
-		return MusicGroupStatus;
+		return musicGroupStatus;
 	}
 
 	public void setMusicGroupStatus(MusicGroupStatusEnum musicGroupStatus) {
-		MusicGroupStatus = musicGroupStatus;
+		this.musicGroupStatus = musicGroupStatus;
 	}
 
 	@Override

mec-web/src/main/resources/config/mybatis/ChargeTypeMapper.xml

@@ -11,6 +11,7 @@
         <result column="name_" property="name"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="description_" property="description"/>
+        <result column="course_form_" property="courseForm"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -28,13 +29,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeType" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO charge_type (id_,name_,del_flag_,description_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{description},#{createTime},#{updateTime})
+        INSERT INTO charge_type (id_,name_,del_flag_,description_,course_form_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{description},#{courseForm},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,6 +46,9 @@
             <if test="description != null">
                 description_ = #{description},
             </if>
+            <if test="courseForm != null">
+                course_form_ = #{courseForm},
+            </if>
             <if test="name != null">
                 name_ = #{name},
             </if>

mec-web/src/main/resources/config/mybatis/ChargeTypeSubjectMapperMapper.xml

@@ -12,6 +12,9 @@
         <result column="subject_id_" property="subjectId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="kit_group_purchase_type_" property="kitGroupPurchaseTypeEnum" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="deposit_fee_" property="depositFee"/>
+        <result column="fee_" property="fee"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -27,13 +30,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO charge_type_subject_mapper (id_,charge_type_id_,subject_id_,create_time_,update_time_)
-        VALUES(#{id},#{chargeTypeId},#{subjectId},#{createTime},#{updateTime})
+        INSERT INTO charge_type_subject_mapper (id_,charge_type_id_,subject_id_,kit_group_purchase_type_,deposit_fee_,fee_,create_time_,update_time_)
+        VALUES(#{id},#{chargeTypeId},#{subjectId},#{kitGroupPurchaseTypeEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},#{fee},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -36,7 +36,7 @@
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="teacher_salary_" property="teacherSalary"/>
         <result column="name_" property="musicGroupName"/>
-        <result column="status" property="MusicGroupStatus" />
+        <result column="status" property="musicGroupStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"

mec-web/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -4,73 +4,67 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.ym.mec.auth.dal.dao.MusicGroupStudentFeeDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.MusicGroupStudentFee" id="MusicGroupStudentFee">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="user_id_" property="userId" />
-		<result column="course_fee_" property="courseFee" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroupStudentFee" >
+<mapper namespace="com.ym.mec.web.dal.dao.MusicGroupStudentFeeDao">
+
+    <resultMap type="com.ym.mec.web.dal.entity.MusicGroupStudentFee" id="MusicGroupStudentFee">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="user_id_" property="userId"/>
+        <result column="course_fee_" property="courseFee"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="MusicGroupStudentFee">
 		SELECT * FROM music_group_student_fee_ WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroupStudentFee">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="MusicGroupStudentFee">
 		SELECT * FROM music_group_student_fee_ ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.MusicGroupStudentFee" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_) VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},#{createTime},#{updateTime})
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupStudentFee" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_)
+		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now())
 	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.MusicGroupStudentFee">
-		UPDATE music_group_student_fee_ <set>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="courseFee != null">
-course_fee_ = #{courseFee},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupStudentFee">
+        UPDATE music_group_student_fee_
+        <set>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="courseFee != null">
+                course_fee_ = #{courseFee},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM music_group_student_fee_ WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupStudentFee" parameterType="map">
-		SELECT * FROM music_group_student_fee_ ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="MusicGroupStudentFee" parameterType="map">
+        SELECT * FROM music_group_student_fee_ ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_student_fee_
 	</select>
 </mapper>

mec-web/src/main/resources/config/mybatis/MusicGroupSubjectPlanMapper.xml

@@ -89,17 +89,4 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_subject_plan
 	</select>
-
-    <resultMap type="com.ym.mec.web.dal.dto.SubSetViewDto" id="findSubByGroupIdMap">
-        <result column="plan_id_" property="planId" />
-        <result column="sub_id_" property="subId" />
-        <result column="sub_name_" property="subName" />
-        <result column="expected_student_num_" property="expectedStudentNum" />
-    </resultMap>
-    <select id="findSubByGroupId" resultMap="findSubByGroupIdMap">
-        SELECT mgsp.id_ plan_id_,mgsp.expected_student_num_,s.name_ sub_name_,s.id_ sub_id_
-        FROM music_group_subject_plan mgsp
-        LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_
-        WHERE mgsp.music_group_id_ = #{musicGroupId}
-    </select>
 </mapper>

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -95,7 +95,14 @@
         SELECT * FROM subject <include refid="querySubPageSql"/>
     </select>
     <select id="findDefaultSubByGroupId" resultMap="Subject">
-
+        SELECT s.id_,s.name_,g.name_ goods_name_,g.id_ goods_id_,ctsm.kit_group_purchase_type_,ctsm.deposit_fee_,ctsm.fee_
+        FROM music_group mg
+        LEFT JOIN charge_type_subject_mapper ctsm ON ctsm.charge_type_id_ = mg.charge_type_id_
+        LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
+        LEFT JOIN subject_goods_mapper sgm ON s.id_ = sgm.subject_id_
+        LEFT JOIN goods_category gc ON gc.id_ = sgm.goods_category_id_
+        LEFT JOIN goods g ON gc.id_ = g.goods_category_id_
+        WHERE mg.id_ = #{musicGroupId}
     </select>
     <sql id="querySubPageSql">
         <where>