Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

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

@@ -43,6 +43,8 @@ public class ReplacementInstrumentActivity {
 	/** 乐器编号 */
 	private Integer instrumentsId;
 	
+	private String otherSuggestion;
+	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -145,6 +147,14 @@ public class ReplacementInstrumentActivity {
 		return this.instrumentsId;
 	}
 			
+	public String getOtherSuggestion() {
+		return otherSuggestion;
+	}
+
+	public void setOtherSuggestion(String otherSuggestion) {
+		this.otherSuggestion = otherSuggestion;
+	}
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -17,6 +17,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="question_result_" property="questionResult" />
 		<result column="instruments_id_" property="instrumentsId" />
+		<result column="other_suggestion_" property="otherSuggestion" />
 		<result column="open_flag_" property="openFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -40,8 +41,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO replacement_instrument_activity (cooperation_organ_id_,user_id_,user_name_,grade_,classes_,mobile_no_,subject_id_,question_result_,instruments_id_,create_time_,update_time_)
-		VALUES(#{cooperationOrganId},#{userId},#{userName},#{grade},#{classes},#{mobileNo},#{subjectId},#{questionResult},#{instrumentsId},NOW(),NOW())
+		INSERT INTO replacement_instrument_activity (cooperation_organ_id_,user_id_,user_name_,grade_,classes_,mobile_no_,subject_id_,question_result_,instruments_id_,other_suggestion_,create_time_,update_time_)
+		VALUES(#{cooperationOrganId},#{userId},#{userName},#{grade},#{classes},#{mobileNo},#{subjectId},#{questionResult},#{instrumentsId},#{otherSuggestion},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -69,6 +70,7 @@
 		update_time_ = #{updateTime},
 		</if>
 		instruments_id_ = #{instrumentsId},
+		other_suggestion_ = #{otherSuggestion},
 		<if test="mobileNo != null">
 		mobile_no_ = #{mobileNo},
 		</if>