Joburgess преди 4 години
родител
ревизия
cb7b714712

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupCategory.java

@@ -38,6 +38,17 @@ public class VipGroupCategory {
 	@ApiModelProperty(value = "线下课单价",required = false)
 	private BigDecimal offlineClassesUnitPrice;
 
+	@ApiModelProperty(value = "是否乐理课")
+	private Boolean musicTheory = false;
+
+	public Boolean getMusicTheory() {
+		return musicTheory;
+	}
+
+	public void setMusicTheory(Boolean musicTheory) {
+		this.musicTheory = musicTheory;
+	}
+
 	public BigDecimal getOnlineClassesUnitPrice() {
 		return onlineClassesUnitPrice;
 	}

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -284,7 +284,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//生成vip课信息
 		List<String> bySubIds = subjectDao.findBySubIds(vipGroupApplyBaseInfoDto.getSubjectIdList());
-		StringBuffer className=new StringBuffer(StringUtils.join(bySubIds,","));
+		StringBuffer className=new StringBuffer();
+		className.append(StringUtils.join(bySubIds,","));
 		className.append(vipGroupCategory.getName());
 		className.append(StringUtils.join(studentNames, ","));
 		vipGroupApplyBaseInfoDto.setName(className.toString());

+ 7 - 7
mec-biz/src/main/resources/config/mybatis/VipGroupCategoryMapper.xml

@@ -12,6 +12,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="single_class_minutes_" property="singleClassMinutes" />
 		<result column="student_num_" property="studentNum" />
+		<result column="music_theory_" property="musicTheory" />
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
 	</resultMap>
@@ -53,11 +54,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO vip_group_category
-		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_)
-		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum})
+		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_,music_theory_)
+		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum},#{musicTheory})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -73,9 +72,6 @@
 			<if test="id != null">
 				id_ = #{id},
 			</if>
-			<if test="updateTime != null">
-				update_time_ = NOW(),
-			</if>
 			<if test="singleClassMinutes != null">
 				single_class_minutes_ = #{singleClassMinutes},
 			</if>
@@ -85,6 +81,10 @@
 			<if test="createTime != null">
 				create_time_ = #{createTime},
 			</if>
+			<if test="musicTheory != null">
+				music_theory_ = #{musicTheory},
+			</if>
+				update_time_ = NOW(),
 		</set>
 		WHERE id_ = #{id}
 	</update>