Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/resources/config/mybatis/CourseGroupInfoMapper.xml

@@ -6,98 +6,117 @@
 -->
 <mapper namespace="com.ym.mec.collectfee.dao.CourseGroupInfoDao">
 
-	<resultMap type="com.ym.mec.collectfee.entity.CourseGroupInfo" id="CourseGroupInfo">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="sub_id_" property="subId" />
-		<result column="class_id_" property="classId" />
-		<result column="sub_name_" property="subName" />
-		<result column="plan_num_" property="planNum" />
-		<result column="reg_num_" property="regNum" />
-		<result column="fee_type_" property="feeType" />
-		<result column="fee_amount_" property="feeAmount" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="version" property="version" />
-	</resultMap>
+    <resultMap type="com.ym.mec.collectfee.entity.CourseGroupInfo" id="CourseGroupInfo">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="sub_id_" property="subId"/>
+        <result column="class_id_" property="classId"/>
+        <result column="sub_name_" property="subName"/>
+        <result column="plan_num_" property="planNum"/>
+        <result column="reg_num_" property="regNum"/>
+        <result column="fee_type_" property="feeType"/>
+        <result column="fee_amount_" property="feeAmount"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="version" property="version"/>
+    </resultMap>
 
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseGroupInfo" >
-		SELECT * FROM course_group_info WHERE id_ = #{id} 
-	</select>
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseGroupInfo">
+        SELECT * FROM course_group_info WHERE id_ = #{id}
+    </select>
 
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseGroupInfo">
-		SELECT * FROM course_group_info ORDER BY id_
-	</select>
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseGroupInfo">
+        SELECT *
+        FROM course_group_info
+        ORDER BY id_
+    </select>
 
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" >
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-		</selectKey>
-		-->
-		INSERT INTO course_group_info (class_id_,id_,name_,sub_id_,sub_name_,plan_num_,reg_num_,fee_type_,fee_amount_,create_time_,update_time_) VALUES(#{classId},#{id},#{name},#{subId},#{subName},#{planNum},#{regNum},#{feeType},#{feeAmount},#{createTime},#{updateTime})
-	</insert>
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO course_group_info
+        (class_id_,id_,name_,sub_id_,sub_name_,plan_num_,reg_num_,fee_type_,fee_amount_,create_time_,update_time_)
+        VALUES(#{classId},#{id},#{name},#{subId},#{subName},#{planNum},#{regNum},#{feeType},#{feeAmount},#{createTime},#{updateTime})
+    </insert>
 
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo">
-		UPDATE course_group_info
-		<set>
-			<if test="classId != null">
-				class_id_ = #{classId},
-			</if>
-			<if test="subId != null">
-				sub_id_ = #{subId},
-			</if>
-			<if test="planNum != null">
-				plan_num_ = #{planNum},
-			</if>
-			<if test="feeAmount != null">
-				fee_amount_ = #{feeAmount},
-			</if>
-			<if test="feeType != null">
-				fee_type_ = #{feeType},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="subName != null">
-				sub_name_ = #{subName},
-			</if>
-			<if test="regNum != null">
-				reg_num_ = #{regNum},
-			</if>
-			<if test="name != null">
-				name_ = #{name},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo">
+        UPDATE course_group_info
+        <set>
+            <if test="classId != null">
+                class_id_ = #{classId},
+            </if>
+            <if test="subId != null">
+                sub_id_ = #{subId},
+            </if>
+            <if test="planNum != null">
+                plan_num_ = #{planNum},
+            </if>
+            <if test="feeAmount != null">
+                fee_amount_ = #{feeAmount},
+            </if>
+            <if test="feeType != null">
+                fee_type_ = #{feeType},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="subName != null">
+                sub_name_ = #{subName},
+            </if>
+            <if test="regNum != null">
+                reg_num_ = #{regNum},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
 
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM course_group_info WHERE id_ = #{id} 
-	</delete>
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+        DELETE FROM course_group_info WHERE id_ = #{id}
+    </delete>
 
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseGroupInfo" parameterType="map">
-		SELECT * FROM course_group_info ORDER BY id_ <include refid="global.limit"/>
-	</select>
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseGroupInfo" parameterType="map">
+        SELECT * FROM course_group_info ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
 
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_group_info
-	</select>
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*)
+        FROM course_group_info
+    </select>
 
-	<select id="getCourses" resultMap="CourseGroupInfo">
-		SELECT * FROM course_group_info WHERE sub_id_ IN (SELECT MIN(sub_id_)sub_id_ FROM course_group_info
-		WHERE class_id_ = #{classId} GROUP BY sub_name_) AND class_id_ = #{classId}
-	</select>
+    <select id="getCourses" resultMap="CourseGroupInfo">
+        SELECT * FROM course_group_info WHERE sub_id_ IN (SELECT MIN(sub_id_)sub_id_ FROM course_group_info
+        WHERE class_id_ = #{classId} GROUP BY sub_name_) AND class_id_ = #{classId}
+    </select>
 
-	<!-- 根据id和version更新实际已招生人数 -->
-	<update id="upByIdAndVersion" parameterType="com.ym.mec.collectfee.entity.Account">
-		UPDATE `course_group_info` SET `reg_num_` = #{regNum},`version` = `version`+1 WHERE `id_` = #{id} AND `version`=#{version}
-	</update>
+    <!-- 根据id和version更新实际已招生人数 -->
+    <update id="upByIdAndVersion" parameterType="com.ym.mec.collectfee.entity.Account">
+        UPDATE `course_group_info`
+        <set>
+            <if test="regNum != null">
+                reg_num_ = #{regNum},
+            </if>
+            <if test="planNum != null">
+                plan_num_ = #{planNum},
+            </if>
+            <if test="version != null">
+                `version` = `version`+1
+            </if>
+        </set>
+        WHERE `id_` = #{id} AND `version`=#{version}
+    </update>
 </mapper>