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

codegen/src/main/resources/generateConfigration.xml

@@ -2,13 +2,13 @@
 <GenerateConfiguration>
 	<dbConfiguration>
 		<driverClass>com.mysql.jdbc.Driver</driverClass>
-		<url>jdbc:mysql://120.26.238.168:3306/mec_dev</url>
+		<url>jdbc:mysql://47.99.212.176:3306/mec_dev</url>
 		<username>mec_dev</username>
 		<password>mec_dev</password>
 		<catalog>mec_dev</catalog>
 		<schema>mec_dev</schema>
 	</dbConfiguration>
-	<srcBase>e:/javabean</srcBase>
+	<srcBase>d:/javabean</srcBase>
 	<pojoPackageName>com.ym.mec.auth.api.entity</pojoPackageName>
 	<daoPackageName>com.ym.mec.auth.dal.dao</daoPackageName>
 	<servicePackageName>com.ym.mec.auth.service</servicePackageName>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysDeptMapper.xml

@@ -38,7 +38,25 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysDept">
-		UPDATE sys_dept SET del_flag_ = #{delFlag},update_time_ = #{updateTime},create_time_ = #{createTime},parent_id_ = #{parentId},name_ = #{name},sort_ = #{sort} WHERE id_ = #{id}
+		UPDATE sys_dept
+		 <set>
+			 <if test="delFlag != null">
+				 del_flag_ = #{delFlag},
+			 </if>
+			 <if test="updateTime != null">
+				 update_time_ = #{updateTime},
+			 </if>
+			 <if test="parentId != null">
+				 parent_id_ = #{parentId},
+			 </if>
+			 <if test="name != null">
+				 name_ = #{name},
+			 </if>
+			 <if test="sort != null">
+				 sort_ = #{sort},
+			 </if>
+		 </set>
+		 WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysDeptRelationMapper.xml

@@ -31,11 +31,6 @@
 		INSERT INTO sys_dept_relation (ancestor_,descendant_) VALUES(#{ancestor},#{descendant})
 	</insert>
 	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysDeptRelation">
-		UPDATE sys_dept_relation SET ancestor_ = #{ancestor},descendant_ = #{descendant} WHERE ancestor_ = #{ancestor} AND descendant_ = #{descendant}
-	</update>
-	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" parameterType="java.util.Map">
 		DELETE FROM sys_dept_relation WHERE ancestor_ = #{ancestor} AND descendant_ = #{descendant}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -5,60 +5,100 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.auth.dal.dao.SysMenuDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysMenu" id="SysMenu">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="permission_" property="permission" />
-		<result column="path_" property="path" />
-		<result column="parent_id_" property="parentId" />
-		<result column="icon_" property="icon" />
-		<result column="component_" property="component" />
-		<result column="sort_" property="sort" />
-		<result column="keep_alive_" property="keepAlive" />
-		<result column="type_" property="type" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysMenu" >
+
+    <resultMap type="com.ym.mec.auth.api.entity.SysMenu" id="SysMenu">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="permission_" property="permission"/>
+        <result column="path_" property="path"/>
+        <result column="parent_id_" property="parentId"/>
+        <result column="icon_" property="icon"/>
+        <result column="component_" property="component"/>
+        <result column="sort_" property="sort"/>
+        <result column="keep_alive_" property="keepAlive"/>
+        <result column="type_" property="type"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="del_flag_" property="delFlag"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysMenu">
 		SELECT * FROM sys_menu WHERE id_ = #{id}
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysMenu">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysMenu">
 		SELECT * FROM sys_menu ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_menu (id_,name_,permission_,path,parent_id_,icon_,component_,sort,keep_alive_,type_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},#{createTime},#{updateTime},#{delFlag})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysMenu">
-		UPDATE sys_menu SET path_ = #{path},del_flag_ = #{delFlag},update_time_ = #{updateTime},create_time_ = #{createTime},parent_id_ = #{parentId},name_ = #{name},icon_ = #{icon},component_ = #{component},permission_ = #{permission},sort_ = #{sort},keep_alive_ = #{keepAlive},type_ = #{type} WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_menu
+        (id_,name_,permission_,path,parent_id_,icon_,component_,sort,keep_alive_,type_,create_time_,update_time_,del_flag_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},#{createTime},#{updateTime},#{delFlag})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.auth.api.entity.SysMenu">
+        UPDATE sys_menu
+        <set>
+            <if test="parentId != null">
+                parent_id_ = #{parentId},
+            </if>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="keepAlive != null">
+                keep_alive_ = #{keepAlive},
+            </if>
+            <if test="permission != null">
+                permission_ = #{permission},
+            </if>
+            <if test="path != null">
+                path_ = #{path},
+            </if>
+            <if test="sort != null">
+                sort_ = #{sort},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+            <if test="icon != null">
+                icon_ = #{icon},
+            </if>
+            <if test="component != null">
+                component_ = #{component},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="type != null">
+                type_ = #{type},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_menu WHERE id_ = #{id}
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysMenu" parameterType="map">
-		SELECT * FROM sys_menu ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysMenu" parameterType="map">
+        SELECT * FROM sys_menu ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_menu
 	</select>
 
@@ -66,7 +106,7 @@
 		SELECT sm.* FROM sys_role_menu srm LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_ WHERE srm.role_id_ = 1 AND sm.del_flag_ = 0
 	</select>
 
-	<select id="findByUser" resultType="com.ym.mec.auth.api.entity.SysMenu">
+    <select id="findByUser" resultType="com.ym.mec.auth.api.entity.SysMenu">
 		SELECT sm.* FROM sys_user_role sur
 		LEFT JOIN sys_role sr ON sur.role_id_ = sr.id_
 		LEFT JOIN sys_role_menu srm ON sr.id_ = srm.role_id_

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysOauthClientDetailsMapper.xml

@@ -5,58 +5,95 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.auth.dal.dao.SysOauthClientDetailsDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysOauthClientDetails" id="SysOauthClientDetails">
-		<result column="id_" property="id" />
-		<result column="resource_ids_" property="resourceIds" />
-		<result column="client_secret_" property="clientSecret" />
-		<result column="scope_" property="scope" />
-		<result column="authorized_grant_types_" property="authorizedGrantTypes" />
-		<result column="web_server_redirect_uri_" property="webServerRedirectUri" />
-		<result column="authorities_" property="authorities" />
-		<result column="access_token_validity_" property="accessTokenValidity" />
-		<result column="refresh_token_validity_" property="refreshTokenValidity" />
-		<result column="additional_information_" property="additionalInformation" />
-		<result column="autoapprove_" property="autoapprove" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysOauthClientDetails" >
+
+    <resultMap type="com.ym.mec.auth.api.entity.SysOauthClientDetails" id="SysOauthClientDetails">
+        <result column="id_" property="id"/>
+        <result column="resource_ids_" property="resourceIds"/>
+        <result column="client_secret_" property="clientSecret"/>
+        <result column="scope_" property="scope"/>
+        <result column="authorized_grant_types_" property="authorizedGrantTypes"/>
+        <result column="web_server_redirect_uri_" property="webServerRedirectUri"/>
+        <result column="authorities_" property="authorities"/>
+        <result column="access_token_validity_" property="accessTokenValidity"/>
+        <result column="refresh_token_validity_" property="refreshTokenValidity"/>
+        <result column="additional_information_" property="additionalInformation"/>
+        <result column="autoapprove_" property="autoapprove"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysOauthClientDetails">
 		SELECT * FROM sys_oauth_client_details WHERE id_ = #{id}
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysOauthClientDetails">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysOauthClientDetails">
 		SELECT * FROM sys_oauth_client_details ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysOauthClientDetails" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_oauth_client_details (id_,resource_ids_,client_secret_,scope_,authorized_grant_types_,web_server_redirect_uri_,authorities_,access_token_validity_,refresh_token_validity_,additional_information_,autoapprove_) VALUES(#{id},#{resourceIds},#{clientSecret},#{scope},#{authorizedGrantTypes},#{webServerRedirectUri},#{authorities},#{accessTokenValidity},#{refreshTokenValidity},#{additionalInformation},#{autoapprove})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysOauthClientDetails">
-		UPDATE sys_oauth_client_details SET additional_information_ = #{additionalInformation},access_token_validity_ = #{accessTokenValidity},autoapprove_ = #{autoapprove},scope_ = #{scope},web_server_redirect_uri_ = #{webServerRedirectUri},authorized_grant_types_ = #{authorizedGrantTypes},client_secret_ = #{clientSecret},resource_ids_ = #{resourceIds},authorities_ = #{authorities},refresh_token_validity_ = #{refreshTokenValidity} WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysOauthClientDetails" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_oauth_client_details
+        (id_,resource_ids_,client_secret_,scope_,authorized_grant_types_,web_server_redirect_uri_,authorities_,access_token_validity_,refresh_token_validity_,additional_information_,autoapprove_)
+        VALUES(#{id},#{resourceIds},#{clientSecret},#{scope},#{authorizedGrantTypes},#{webServerRedirectUri},#{authorities},#{accessTokenValidity},#{refreshTokenValidity},#{additionalInformation},#{autoapprove})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.auth.api.entity.SysOauthClientDetails">
+        UPDATE sys_oauth_client_details
+        <set>
+            <if test="accessTokenValidity != null">
+                access_token_validity_ = #{accessTokenValidity},
+            </if>
+            <if test="resourceIds != null">
+                resource_ids_ = #{resourceIds},
+            </if>
+            <if test="refreshTokenValidity != null">
+                refresh_token_validity_ = #{refreshTokenValidity},
+            </if>
+            <if test="additionalInformation != null">
+                additional_information_ = #{additionalInformation},
+            </if>
+            <if test="clientSecret != null">
+                client_secret_ = #{clientSecret},
+            </if>
+            <if test="webServerRedirectUri != null">
+                web_server_redirect_uri_ = #{webServerRedirectUri},
+            </if>
+            <if test="authorizedGrantTypes != null">
+                authorized_grant_types_ = #{authorizedGrantTypes},
+            </if>
+            <if test="authorities != null">
+                authorities_ = #{authorities},
+            </if>
+            <if test="scope != null">
+                scope_ = #{scope},
+            </if>
+            <if test="autoapprove != null">
+                autoapprove_ = #{autoapprove},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_oauth_client_details WHERE id_ = #{id}
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysOauthClientDetails" parameterType="map">
-		SELECT * FROM sys_oauth_client_details ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysOauthClientDetails" parameterType="map">
+        SELECT * FROM sys_oauth_client_details ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_oauth_client_details
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleDeptMapper.xml

@@ -34,7 +34,16 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRoleDept">
-		UPDATE sys_role_dept SET role_id_ = #{roleId},dept_id_ = #{deptId} WHERE id_ = #{id}
+		UPDATE sys_role_dept
+		 <set>
+			 <if test="roleId != null">
+				 role_id_ = #{roleId},
+			 </if>
+			 <if test="deptId != null">
+				 dept_id_ = #{deptId},
+			 </if>
+		 </set>
+		 WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

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

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -31,11 +31,6 @@
 		INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES(#{roleId},#{menuId})
 	</insert>
 	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRoleMenu">
-		UPDATE sys_role_menu SET role_id_ = #{roleId},menu_id_ = #{menuId} WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
-	</update>
-	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" parameterType="java.util.Map">
 		DELETE FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginMapper.xml

@@ -5,58 +5,83 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserLoginDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysUserLogin" id="SysUserLogin">
-		<result column="user_id_" property="userId" />
-		<result column="login_count_" property="loginCount" />
-		<result column="last_login_time_" property="lastLoginTime" />
-		<result column="last_login_ip_" property="lastLoginIp" />
-		<result column="fail_count_" property="failCount" />
-		<result column="lock_time_" property="lockTime" />
-		<result column="lock_date_" property="lockDate" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserLogin" >
+
+    <resultMap type="com.ym.mec.auth.api.entity.SysUserLogin" id="SysUserLogin">
+        <result column="user_id_" property="userId"/>
+        <result column="login_count_" property="loginCount"/>
+        <result column="last_login_time_" property="lastLoginTime"/>
+        <result column="last_login_ip_" property="lastLoginIp"/>
+        <result column="fail_count_" property="failCount"/>
+        <result column="lock_time_" property="lockTime"/>
+        <result column="lock_date_" property="lockDate"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUserLogin">
 		SELECT * FROM sys_user_login WHERE user_id_ = #{userId}
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserLogin">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUserLogin">
 		SELECT * FROM sys_user_login ORDER BY user_id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUserLogin" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" >
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-		</selectKey>
-		-->
-		INSERT INTO sys_user_login (user_id_,login_count_,last_login_time_,last_login_ip_,fail_count_,lock_time_,lock_date_) VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUserLogin">
-		UPDATE sys_user_login SET user_id_ = #{userId},last_login_time_ = #{lastLoginTime},last_login_ip_ = #{lastLoginIp},fail_count_ = #{failCount},lock_time_ = #{lockTime},login_count_ = #{loginCount},lock_date_ = #{lockDate} WHERE user_id_ = #{userId}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUserLogin" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user_login
+        (user_id_,login_count_,last_login_time_,last_login_ip_,fail_count_,lock_time_,lock_date_)
+        VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.auth.api.entity.SysUserLogin">
+        UPDATE sys_user_login
+        <set>
+            <if test="failCount != null">
+                fail_count_ = #{failCount},
+            </if>
+            <if test="lastLoginIp != null">
+                last_login_ip_ = #{lastLoginIp},
+            </if>
+            <if test="lockTime != null">
+                lock_time_ = #{lockTime},
+            </if>
+            <if test="loginCount != null">
+                login_count_ = #{loginCount},
+            </if>
+            <if test="lastLoginTime != null">
+                last_login_time_ = #{lastLoginTime},
+            </if>
+            <if test="lockDate != null">
+                lock_date_ = #{lockDate},
+            </if>
+        </set>
+        WHERE user_id_ = #{userId}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_user_login WHERE user_id_ = #{userId}
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserLogin" parameterType="map">
-		SELECT * FROM sys_user_login ORDER BY user_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUserLogin" parameterType="map">
+        SELECT * FROM sys_user_login ORDER BY user_id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_login
 	</select>
 
-	<select id="findLoginByUserId" resultMap="SysUserLogin">
+    <select id="findLoginByUserId" resultMap="SysUserLogin">
 		SELECT * FROM sys_user_login WHERE user_id_ = #{userId}
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -5,86 +5,137 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
-		<result column="id_" property="id" />
-		<result column="username_" property="username" />
-		<result column="password_" property="password" />
-		<result column="salt_" property="salt" />
-		<result column="phone_" property="phone" />
-		<result column="avatar_" property="avatar" />
-		<result column="dept_id_" property="deptId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="lock_flag_" property="lockFlag" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="wx_openid_" property="wxOpenid" />
-		<result column="qq_openid_" property="qqOpenid" />
-		<result column="user_type_" property="userType" />
-	</resultMap>
-	
-	<!-- 查询条件 -->
-	<sql id="queryCondition">
-			<if test="userStartDate != null">
-				and create_time_ &gt;= #{createStartDate}
-			</if>
-			<if test="userEndDate != null">
-				and create_time_ &lt;= #{createEndDate}
-			</if>
-			<if test="userType != null">
-				and user_type_ = #{userType}
-			</if>
-	</sql>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUser" >
+
+    <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
+        <result column="id_" property="id"/>
+        <result column="username_" property="username"/>
+        <result column="password_" property="password"/>
+        <result column="salt_" property="salt"/>
+        <result column="phone_" property="phone"/>
+        <result column="avatar_" property="avatar"/>
+        <result column="dept_id_" property="deptId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="lock_flag_" property="lockFlag"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="wx_openid_" property="wxOpenid"/>
+        <result column="qq_openid_" property="qqOpenid"/>
+        <result column="user_type_" property="userType"/>
+    </resultMap>
+
+    <!-- 查询条件 -->
+    <sql id="queryCondition">
+        <if test="userStartDate != null">
+            and create_time_ &gt;= #{createStartDate}
+        </if>
+        <if test="userEndDate != null">
+            and create_time_ &lt;= #{createEndDate}
+        </if>
+        <if test="userType != null">
+            and user_type_ = #{userType}
+        </if>
+    </sql>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUser">
 		SELECT * FROM sys_user WHERE id_ = #{id}
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUser">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUser">
 		SELECT * FROM sys_user ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user (id_,username_,password_,salt_,phone_,avatar_,dept_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_) VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{deptId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">
-		UPDATE sys_user SET del_flag_ = #{delFlag},salt_ = #{salt},create_time_ = #{createTime},qq_openid_ = #{qqOpenid},avatar_ = #{avatar},lock_flag_ = #{lockFlag},password_ = #{password},update_time_ = #{updateTime},wx_openid_ = #{wxOpenid},phone_ = #{phone},dept_id_ = #{deptId},username_ = #{username},user_type_ = #{userType} WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user
+        (id_,username_,password_,salt_,phone_,avatar_,dept_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_)
+        VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{deptId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">
+        UPDATE sys_user
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="wxOpenid != null">
+                wx_openid_ = #{wxOpenid},
+            </if>
+            <if test="avatar != null">
+                avatar_ = #{avatar},
+            </if>
+            <if test="email != null">
+                email_ = #{email},
+            </if>
+            <if test="gender != null">
+                gender_ = #{gender},
+            </if>
+            <if test="password != null">
+                password_ = #{password},
+            </if>
+            <if test="salt != null">
+                salt_ = #{salt},
+            </if>
+            <if test="username != null">
+                username_ = #{username},
+            </if>
+            <if test="userType != null">
+                user_type_ = #{userType},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="lockFlag != null">
+                lock_flag_ = #{lockFlag},
+            </if>
+            <if test="birthdate != null">
+                birthdate_ = #{birthdate},
+            </if>
+            <if test="phone != null">
+                phone_ = #{phone},
+            </if>
+            <if test="qqOpenid != null">
+                qq_openid_ = #{qqOpenid},
+            </if>
+            <if test="nation != null">
+                nation_ = #{nation},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_user WHERE id_ = #{id}
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUser" parameterType="map">
-		SELECT * FROM sys_user ORDER BY id_
-		<include refid="queryCondition" />
-		<include refid="global.orderby" />
-		<include refid="global.limit" />
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user
-		<include refid="queryCondition" />
-	</select>
-	
-	<select id="queryByUsername" resultMap="SysUser">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUser" parameterType="map">
+        SELECT * FROM sys_user ORDER BY id_
+        <include refid="queryCondition"/>
+        <include refid="global.orderby"/>
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*) FROM sys_user
+        <include refid="queryCondition"/>
+    </select>
+
+    <select id="queryByUsername" resultMap="SysUser">
 		select * from sys_user where username_ = #{username}
 	</select>
-	
-	<select id="queryByPhone" resultMap="SysUser">
+
+    <select id="queryByPhone" resultMap="SysUser">
 		select * from sys_user where phone_ = #{phone}
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserRoleMapper.xml

@@ -5,57 +5,54 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserRoleDao">
-	
-	<resultMap type="com.ym.mec.auth.api.entity.SysUserRole" id="SysUserRole">
-		<result column="user_id_" property="userId" />
-		<result column="role_id_" property="roleId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserRole" parameterType="java.util.Map">
+
+    <resultMap type="com.ym.mec.auth.api.entity.SysUserRole" id="SysUserRole">
+        <result column="user_id_" property="userId"/>
+        <result column="role_id_" property="roleId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUserRole" parameterType="java.util.Map">
 		SELECT * FROM sys_user_role WHERE user_id_ = #{userId} AND role_id_ = #{roleId}
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserRole">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUserRole">
 		SELECT * FROM sys_user_role ORDER BY user_id_,role_id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUserRole" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user_role (user_id_,role_id_) VALUES(#{userId},#{roleId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUserRole">
-		UPDATE sys_user_role SET user_id_ = #{userId},role_id_ = #{roleId} WHERE user_id_ = #{userId} AND role_id_ = #{roleId}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" parameterType="java.util.Map">
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysUserRole" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user_role (user_id_,role_id_) VALUES(#{userId},#{roleId})
+    </insert>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete" parameterType="java.util.Map">
 		DELETE FROM sys_user_role WHERE user_id = #{userId} AND role_id = #{roleId} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserRole" parameterType="map">
-		SELECT * FROM sys_user_role ORDER BY user_id_,role_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUserRole" parameterType="map">
+        SELECT * FROM sys_user_role ORDER BY user_id_,role_id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_role
 	</select>
-	
-	<select id="queryRoleIdListByUserId" resultType="int" parameterType="int">
+
+    <select id="queryRoleIdListByUserId" resultType="int" parameterType="int">
 		SELECT ur.role_id_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
-	
-	<select id="queryRoleCodeListByUserId" resultType="string" parameterType="int">
+
+    <select id="queryRoleCodeListByUserId" resultType="string" parameterType="int">
 		SELECT r.role_code_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
 </mapper>

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

@@ -5,72 +5,71 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.ChargeTypeDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.ChargeType" id="ChargeType">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="description_" property="description" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="ChargeType" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.ChargeType" id="ChargeType">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="description_" property="description"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="ChargeType">
 		SELECT * FROM charge_type WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="ChargeType">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="ChargeType">
 		SELECT * FROM charge_type ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<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},#{description},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeType">
-		UPDATE charge_type <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <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},#{description},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeType">
+        UPDATE charge_type
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="description != null">
+                description_ = #{description},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM charge_type WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="ChargeType" parameterType="map">
-		SELECT * FROM charge_type ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="ChargeType" parameterType="map">
+        SELECT * FROM charge_type ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM charge_type
 	</select>
 </mapper>

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

@@ -5,68 +5,67 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.ChargeTypeSubjectMapperDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper" id="ChargeTypeSubjectMapper">
-		<result column="id_" property="id" />
-		<result column="charge_type_id_" property="chargeTypeId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="ChargeTypeSubjectMapper" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper" id="ChargeTypeSubjectMapper">
+        <result column="id_" property="id"/>
+        <result column="charge_type_id_" property="chargeTypeId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="ChargeTypeSubjectMapper">
 		SELECT * FROM charge_type_subject_mapper WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="ChargeTypeSubjectMapper">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="ChargeTypeSubjectMapper">
 		SELECT * FROM charge_type_subject_mapper ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<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>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper">
-		UPDATE charge_type_subject_mapper <set>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="chargeTypeId != null">
-charge_type_id_ = #{chargeTypeId},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <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>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper">
+        UPDATE charge_type_subject_mapper
+        <set>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="chargeTypeId != null">
+                charge_type_id_ = #{chargeTypeId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM charge_type_subject_mapper WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="ChargeTypeSubjectMapper" parameterType="map">
-		SELECT * FROM charge_type_subject_mapper ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="ChargeTypeSubjectMapper" parameterType="map">
+        SELECT * FROM charge_type_subject_mapper ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM charge_type_subject_mapper
 	</select>
 </mapper>

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

@@ -5,92 +5,92 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.ClassGroupDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.ClassGroup" id="ClassGroup">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="name_" property="name" />
-		<result column="student_num_" property="studentNum" />
-		<result column="assistant_teacher_id_" property="assistantTeacherId" />
-		<result column="main_teacher_id_" property="mainTeacherId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="type_" property="type" />
-		<result column="teacher_salary_" property="teacherSalary" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="ClassGroup" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.ClassGroup" id="ClassGroup">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="name_" property="name"/>
+        <result column="student_num_" property="studentNum"/>
+        <result column="assistant_teacher_id_" property="assistantTeacherId"/>
+        <result column="main_teacher_id_" property="mainTeacherId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="type_" property="type"/>
+        <result column="teacher_salary_" property="teacherSalary"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="ClassGroup">
 		SELECT * FROM class_group WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="ClassGroup">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="ClassGroup">
 		SELECT * FROM class_group ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO class_group (id_,music_group_id_,subject_id_,name_,student_num_,assistant_teacher_id_,main_teacher_id_,create_time_,update_time_,type_,teacher_salary_) VALUES(#{id},#{musicGroupId},#{subjectId},#{name},#{studentNum},#{assistantTeacherId},#{mainTeacherId},#{createTime},#{updateTime},#{type},#{teacherSalary})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroup">
-		UPDATE class_group <set>
-<if test="mainTeacherId != null">
-main_teacher_id_ = #{mainTeacherId},
-</if>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="studentNum != null">
-student_num_ = #{studentNum},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="assistantTeacherId != null">
-assistant_teacher_id_ = #{assistantTeacherId},
-</if>
-<if test="teacherSalary != null">
-teacher_salary_ = #{teacherSalary},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO class_group
+        (id_,music_group_id_,subject_id_,name_,student_num_,assistant_teacher_id_,main_teacher_id_,create_time_,update_time_,type_,teacher_salary_)
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{name},#{studentNum},#{assistantTeacherId},#{mainTeacherId},#{createTime},#{updateTime},#{type},#{teacherSalary})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroup">
+        UPDATE class_group
+        <set>
+            <if test="mainTeacherId != null">
+                main_teacher_id_ = #{mainTeacherId},
+            </if>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="studentNum != null">
+                student_num_ = #{studentNum},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="assistantTeacherId != null">
+                assistant_teacher_id_ = #{assistantTeacherId},
+            </if>
+            <if test="teacherSalary != null">
+                teacher_salary_ = #{teacherSalary},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+            <if test="type != null">
+                type_ = #{type},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM class_group WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="ClassGroup" parameterType="map">
-		SELECT * FROM class_group ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="ClassGroup" parameterType="map">
+        SELECT * FROM class_group ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM class_group
 	</select>
 </mapper>

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

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

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

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

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

@@ -5,84 +5,84 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseGroupDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseGroupDetail" id="CourseGroupDetail">
-		<result column="id_" property="id" />
-		<result column="course_type_id_" property="courseTypeId" />
-		<result column="course_group_id_" property="courseGroupId" />
-		<result column="class_period_" property="classPeriod" />
-		<result column="unit_price_" property="unitPrice" />
-		<result column="discount_unit_price_" property="discountUnitPrice" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseGroupDetail" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseGroupDetail" id="CourseGroupDetail">
+        <result column="id_" property="id"/>
+        <result column="course_type_id_" property="courseTypeId"/>
+        <result column="course_group_id_" property="courseGroupId"/>
+        <result column="class_period_" property="classPeriod"/>
+        <result column="unit_price_" property="unitPrice"/>
+        <result column="discount_unit_price_" property="discountUnitPrice"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseGroupDetail">
 		SELECT * FROM course_group_detail WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseGroupDetail">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseGroupDetail">
 		SELECT * FROM course_group_detail ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail" 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_detail (id_,course_type_id_,course_group_id_,class_period_,unit_price_,discount_unit_price_,del_flag_,create_time_,update_time_) VALUES(#{id},#{courseTypeId},#{courseGroupId},#{classPeriod},#{unitPrice},#{discountUnitPrice},#{delFlag},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail">
-		UPDATE course_group_detail <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="courseTypeId != null">
-course_type_id_ = #{courseTypeId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="unitPrice != null">
-unit_price_ = #{unitPrice},
-</if>
-<if test="discountUnitPrice != null">
-discount_unit_price_ = #{discountUnitPrice},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="courseGroupId != null">
-course_group_id_ = #{courseGroupId},
-</if>
-<if test="classPeriod != null">
-class_period_ = #{classPeriod},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail" 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_detail
+        (id_,course_type_id_,course_group_id_,class_period_,unit_price_,discount_unit_price_,del_flag_,create_time_,update_time_)
+        VALUES(#{id},#{courseTypeId},#{courseGroupId},#{classPeriod},#{unitPrice},#{discountUnitPrice},#{delFlag},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroupDetail">
+        UPDATE course_group_detail
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="courseTypeId != null">
+                course_type_id_ = #{courseTypeId},
+            </if>
+            <if test="unitPrice != null">
+                unit_price_ = #{unitPrice},
+            </if>
+            <if test="discountUnitPrice != null">
+                discount_unit_price_ = #{discountUnitPrice},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="courseGroupId != null">
+                course_group_id_ = #{courseGroupId},
+            </if>
+            <if test="classPeriod != null">
+                class_period_ = #{classPeriod},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM course_group_detail WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseGroupDetail" parameterType="map">
-		SELECT * FROM course_group_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseGroupDetail" parameterType="map">
+        SELECT * FROM course_group_detail ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_group_detail
 	</select>
 </mapper>

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

@@ -5,72 +5,71 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseGroupDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseGroup" id="CourseGroup">
-		<result column="id_" property="id" />
-		<result column="organ_id_" property="organId" />
-		<result column="name_" property="name" />
-		<result column="del_flag" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseGroup" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseGroup" id="CourseGroup">
+        <result column="id_" property="id"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="name_" property="name"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseGroup">
 		SELECT * FROM course_group WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseGroup">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseGroup">
 		SELECT * FROM course_group ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroup" 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 (id_,organ_id_,name_,del_flag,create_time_,update_time_) VALUES(#{id},#{organId},#{name},#{delFlag},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroup">
-		UPDATE course_group <set>
-<if test="delFlag != null">
-del_flag = #{delFlag},
-</if>
-<if test="organId != null">
-organ_id_ = #{organId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseGroup" 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 (id_,organ_id_,name_,del_flag,create_time_,update_time_)
+        VALUES(#{id},#{organId},#{name},#{delFlag},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseGroup">
+        UPDATE course_group
+        <set>
+            <if test="delFlag != null">
+                del_flag = #{delFlag},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM course_group WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseGroup" parameterType="map">
-		SELECT * FROM course_group ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseGroup" parameterType="map">
+        SELECT * FROM course_group ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_group
 	</select>
 </mapper>

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

@@ -5,92 +5,92 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseScheduleDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseSchedule" id="CourseSchedule">
-		<result column="id_" property="id" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="status_" property="status" />
-		<result column="subsidy_" property="subsidy" />
-		<result column="class_date_" property="classDate" />
-		<result column="start_class_time_" property="startClassTime" />
-		<result column="end_class_time_" property="endClassTime" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="actual_teacher_id_" property="actualTeacherId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseSchedule" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseSchedule" id="CourseSchedule">
+        <result column="id_" property="id"/>
+        <result column="class_group_id_" property="classGroupId"/>
+        <result column="status_" property="status"/>
+        <result column="subsidy_" property="subsidy"/>
+        <result column="class_date_" property="classDate"/>
+        <result column="start_class_time_" property="startClassTime"/>
+        <result column="end_class_time_" property="endClassTime"/>
+        <result column="teacher_id_" property="teacherId"/>
+        <result column="actual_teacher_id_" property="actualTeacherId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseSchedule">
 		SELECT * FROM course_schedule WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseSchedule">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseSchedule">
 		SELECT * FROM course_schedule ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseSchedule" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_schedule (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_) VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseSchedule">
-		UPDATE course_schedule <set>
-<if test="classDate != null">
-class_date_ = #{classDate},
-</if>
-<if test="endClassTime != null">
-end_class_time_ = #{endClassTime},
-</if>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="actualTeacherId != null">
-actual_teacher_id_ = #{actualTeacherId},
-</if>
-<if test="subsidy != null">
-subsidy_ = #{subsidy},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="classGroupId != null">
-class_group_id_ = #{classGroupId},
-</if>
-<if test="startClassTime != null">
-start_class_time_ = #{startClassTime},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseSchedule" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO course_schedule
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
+        VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseSchedule">
+        UPDATE course_schedule
+        <set>
+            <if test="classDate != null">
+                class_date_ = #{classDate},
+            </if>
+            <if test="endClassTime != null">
+                end_class_time_ = #{endClassTime},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="actualTeacherId != null">
+                actual_teacher_id_ = #{actualTeacherId},
+            </if>
+            <if test="subsidy != null">
+                subsidy_ = #{subsidy},
+            </if>
+            <if test="classGroupId != null">
+                class_group_id_ = #{classGroupId},
+            </if>
+            <if test="startClassTime != null">
+                start_class_time_ = #{startClassTime},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM course_schedule WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseSchedule" parameterType="map">
-		SELECT * FROM course_schedule ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseSchedule" parameterType="map">
+        SELECT * FROM course_schedule ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_schedule
 	</select>
 </mapper>

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

@@ -5,80 +5,79 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseTypeDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseType" id="CourseType">
-		<result column="id_" property="id" />
-		<result column="organ_id_" property="organId" />
-		<result column="name_" property="name" />
-		<result column="support_periods_" property="supportPeriods" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="description_" property="description" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseType" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseType" id="CourseType">
+        <result column="id_" property="id"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="name_" property="name"/>
+        <result column="support_periods_" property="supportPeriods"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="description_" property="description"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseType">
 		SELECT * FROM course_type WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseType">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseType">
 		SELECT * FROM course_type ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseType" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_type (id_,organ_id_,name_,support_periods_,del_flag_,create_time_,update_time_,description_) VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag},#{createTime},#{updateTime},#{description})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseType">
-		UPDATE course_type <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="organId != null">
-organ_id_ = #{organId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="supportPeriods != null">
-support_periods_ = #{supportPeriods},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseType" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO course_type (id_,organ_id_,name_,support_periods_,del_flag_,create_time_,update_time_,description_)
+        VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag},#{createTime},#{updateTime},#{description})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseType">
+        UPDATE course_type
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="description != null">
+                description_ = #{description},
+            </if>
+            <if test="supportPeriods != null">
+                support_periods_ = #{supportPeriods},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM course_type WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseType" parameterType="map">
-		SELECT * FROM course_type ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseType" parameterType="map">
+        SELECT * FROM course_type ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_type
 	</select>
 </mapper>

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

@@ -5,84 +5,83 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.GoodsCategoryDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.GoodsCategory" id="GoodsCategory">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="img_" property="img" />
-		<result column="parent_id_" property="parentId" />
-		<result column="order_no_" property="orderNo" />
-		<result column="status_" property="status" />
-		<result column="desc_" property="desc" />
-		<result column="update_time_" property="updateTime" />
-		<result column="create_time_" property="createTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="GoodsCategory" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.GoodsCategory" id="GoodsCategory">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="img_" property="img"/>
+        <result column="parent_id_" property="parentId"/>
+        <result column="order_no_" property="orderNo"/>
+        <result column="status_" property="status"/>
+        <result column="desc_" property="desc"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="create_time_" property="createTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="GoodsCategory">
 		SELECT * FROM goods_category WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="GoodsCategory">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="GoodsCategory">
 		SELECT * FROM goods_category ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsCategory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO goods_category (id_,name_,img_,parent_id_,order_no_,status_,desc_,update_time_,create_time_) VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{status},#{desc},#{updateTime},#{createTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsCategory">
-		UPDATE goods_category <set>
-<if test="parentId != null">
-parent_id_ = #{parentId},
-</if>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="img != null">
-img_ = #{img},
-</if>
-<if test="desc != null">
-desc_ = #{desc},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsCategory" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO goods_category (id_,name_,img_,parent_id_,order_no_,status_,desc_,update_time_,create_time_)
+        VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{status},#{desc},#{updateTime},#{createTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsCategory">
+        UPDATE goods_category
+        <set>
+            <if test="parentId != null">
+                parent_id_ = #{parentId},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="img != null">
+                img_ = #{img},
+            </if>
+            <if test="desc != null">
+                desc_ = #{desc},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM goods_category WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="GoodsCategory" parameterType="map">
-		SELECT * FROM goods_category ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="GoodsCategory" parameterType="map">
+        SELECT * FROM goods_category ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM goods_category
 	</select>
 </mapper>

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

@@ -5,132 +5,132 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.GoodsDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.Goods" id="Goods">
-		<result column="id_" property="id" />
-		<result column="goods_category_id_" property="goodsCategoryId" />
-		<result column="sn_" property="sn" />
-		<result column="name_" property="name" />
-		<result column="brand_" property="brand" />
-		<result column="specification_" property="specification" />
-		<result column="image_" property="image" />
-		<result column="stock_count_" property="stockCount" />
-		<result column="sell_count_" property="sellCount" />
-		<result column="market_price_" property="marketPrice" />
-		<result column="discount_price_" property="discountPrice" />
-		<result column="group_purchase_price_" property="groupPurchasePrice" />
-		<result column="brief_" property="brief" />
-		<result column="desc_" property="desc" />
-		<result column="is_new_" property="isNew" />
-		<result column="is_top_" property="isTop" />
-		<result column="status_" property="status" />
-		<result column="memo_" property="memo" />
-		<result column="publish_time_" property="publishTime" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="Goods" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.Goods" id="Goods">
+        <result column="id_" property="id"/>
+        <result column="goods_category_id_" property="goodsCategoryId"/>
+        <result column="sn_" property="sn"/>
+        <result column="name_" property="name"/>
+        <result column="brand_" property="brand"/>
+        <result column="specification_" property="specification"/>
+        <result column="image_" property="image"/>
+        <result column="stock_count_" property="stockCount"/>
+        <result column="sell_count_" property="sellCount"/>
+        <result column="market_price_" property="marketPrice"/>
+        <result column="discount_price_" property="discountPrice"/>
+        <result column="group_purchase_price_" property="groupPurchasePrice"/>
+        <result column="brief_" property="brief"/>
+        <result column="desc_" property="desc"/>
+        <result column="is_new_" property="isNew"/>
+        <result column="is_top_" property="isTop"/>
+        <result column="status_" property="status"/>
+        <result column="memo_" property="memo"/>
+        <result column="publish_time_" property="publishTime"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="Goods">
 		SELECT * FROM goods WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="Goods">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="Goods">
 		SELECT * FROM goods ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO goods (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,create_time_,update_time_) VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},#{isNew},#{isTop},#{status},#{memo},#{publishTime},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.Goods">
-		UPDATE goods <set>
-<if test="specification != null">
-specification_ = #{specification},
-</if>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="isTop != null">
-is_top_ = #{isTop},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="sn != null">
-sn_ = #{sn},
-</if>
-<if test="marketPrice != null">
-market_price_ = #{marketPrice},
-</if>
-<if test="memo != null">
-memo_ = #{memo},
-</if>
-<if test="isNew != null">
-is_new_ = #{isNew},
-</if>
-<if test="groupPurchasePrice != null">
-group_purchase_price_ = #{groupPurchasePrice},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="stockCount != null">
-stock_count_ = #{stockCount},
-</if>
-<if test="goodsCategoryId != null">
-goods_category_id_ = #{goodsCategoryId},
-</if>
-<if test="brand != null">
-brand_ = #{brand},
-</if>
-<if test="brief != null">
-brief_ = #{brief},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="discountPrice != null">
-discount_price_ = #{discountPrice},
-</if>
-<if test="sellCount != null">
-sell_count_ = #{sellCount},
-</if>
-<if test="image != null">
-image_ = #{image},
-</if>
-<if test="desc != null">
-desc_ = #{desc},
-</if>
-<if test="publishTime != null">
-publish_time_ = #{publishTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO goods
+        (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,create_time_,update_time_)
+        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},#{isNew},#{isTop},#{status},#{memo},#{publishTime},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.Goods">
+        UPDATE goods
+        <set>
+            <if test="specification != null">
+                specification_ = #{specification},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="isTop != null">
+                is_top_ = #{isTop},
+            </if>
+            <if test="sn != null">
+                sn_ = #{sn},
+            </if>
+            <if test="marketPrice != null">
+                market_price_ = #{marketPrice},
+            </if>
+            <if test="memo != null">
+                memo_ = #{memo},
+            </if>
+            <if test="isNew != null">
+                is_new_ = #{isNew},
+            </if>
+            <if test="groupPurchasePrice != null">
+                group_purchase_price_ = #{groupPurchasePrice},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+            <if test="stockCount != null">
+                stock_count_ = #{stockCount},
+            </if>
+            <if test="goodsCategoryId != null">
+                goods_category_id_ = #{goodsCategoryId},
+            </if>
+            <if test="brand != null">
+                brand_ = #{brand},
+            </if>
+            <if test="brief != null">
+                brief_ = #{brief},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="discountPrice != null">
+                discount_price_ = #{discountPrice},
+            </if>
+            <if test="sellCount != null">
+                sell_count_ = #{sellCount},
+            </if>
+            <if test="image != null">
+                image_ = #{image},
+            </if>
+            <if test="desc != null">
+                desc_ = #{desc},
+            </if>
+            <if test="publishTime != null">
+                publish_time_ = #{publishTime},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM goods WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="Goods" parameterType="map">
-		SELECT * FROM goods ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="Goods" parameterType="map">
+        SELECT * FROM goods ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM goods
 	</select>
 </mapper>

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

@@ -5,112 +5,112 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.MusicGroupDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroup" id="MusicGroup">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="organ_id_" property="organId" />
-		<result column="school_id_" property="schoolId" />
-		<result column="apply_expire_date_" property="applyExpireDate" />
-		<result column="team_teacher_id_" property="teamTeacherId" />
-		<result column="educational_teacher_id_" property="educationalTeacherId" />
-		<result column="charge_type_id_" property="chargeTypeId" />
-		<result column="course_group_id_" property="courseGroupId" />
-		<result column="class_period_" property="classPeriod" />
-		<result column="free_class_period_" property="freeClassPeriod" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="status_" property="status" />
-		<result column="payment_expire_date_" property="paymentExpireDate" />
-		<result column="bill_start_date_" property="billStartDate" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroup" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.MusicGroup" id="MusicGroup">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="school_id_" property="schoolId"/>
+        <result column="apply_expire_date_" property="applyExpireDate"/>
+        <result column="team_teacher_id_" property="teamTeacherId"/>
+        <result column="educational_teacher_id_" property="educationalTeacherId"/>
+        <result column="charge_type_id_" property="chargeTypeId"/>
+        <result column="course_group_id_" property="courseGroupId"/>
+        <result column="class_period_" property="classPeriod"/>
+        <result column="free_class_period_" property="freeClassPeriod"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="status_" property="status"/>
+        <result column="payment_expire_date_" property="paymentExpireDate"/>
+        <result column="bill_start_date_" property="billStartDate"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="MusicGroup">
 		SELECT * FROM music_group WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroup">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="MusicGroup">
 		SELECT * FROM music_group ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup" 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 (id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_) VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status},#{paymentExpireDate},#{billStartDate})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroup">
-		UPDATE music_group <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="organId != null">
-organ_id_ = #{organId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="chargeTypeId != null">
-charge_type_id_ = #{chargeTypeId},
-</if>
-<if test="courseGroupId != null">
-course_group_id_ = #{courseGroupId},
-</if>
-<if test="educationalTeacherId != null">
-educational_teacher_id_ = #{educationalTeacherId},
-</if>
-<if test="classPeriod != null">
-class_period_ = #{classPeriod},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="freeClassPeriod != null">
-free_class_period_ = #{freeClassPeriod},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="paymentExpireDate != null">
-payment_expire_date_ = #{paymentExpireDate},
-</if>
-<if test="schoolId != null">
-school_id_ = #{schoolId},
-</if>
-<if test="applyExpireDate != null">
-apply_expire_date_ = #{applyExpireDate},
-</if>
-<if test="billStartDate != null">
-bill_start_date_ = #{billStartDate},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="teamTeacherId != null">
-team_teacher_id_ = #{teamTeacherId},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup" 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
+        (id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_)
+        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status},#{paymentExpireDate},#{billStartDate})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroup">
+        UPDATE music_group
+        <set>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="chargeTypeId != null">
+                charge_type_id_ = #{chargeTypeId},
+            </if>
+            <if test="courseGroupId != null">
+                course_group_id_ = #{courseGroupId},
+            </if>
+            <if test="educationalTeacherId != null">
+                educational_teacher_id_ = #{educationalTeacherId},
+            </if>
+            <if test="classPeriod != null">
+                class_period_ = #{classPeriod},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+            <if test="freeClassPeriod != null">
+                free_class_period_ = #{freeClassPeriod},
+            </if>
+            <if test="paymentExpireDate != null">
+                payment_expire_date_ = #{paymentExpireDate},
+            </if>
+            <if test="schoolId != null">
+                school_id_ = #{schoolId},
+            </if>
+            <if test="applyExpireDate != null">
+                apply_expire_date_ = #{applyExpireDate},
+            </if>
+            <if test="billStartDate != null">
+                bill_start_date_ = #{billStartDate},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="teamTeacherId != null">
+                team_teacher_id_ = #{teamTeacherId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM music_group WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroup" parameterType="map">
-		SELECT * FROM music_group ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="MusicGroup" parameterType="map">
+        SELECT * FROM music_group ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group
 	</select>
 </mapper>

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

@@ -5,88 +5,88 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.MusicGroupSubjectPlanDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" id="MusicGroupSubjectPlan">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="expected_student_num_" property="expectedStudentNum" />
-		<result column="apply_student_num_" property="applyStudentNum" />
-		<result column="fee_" property="fee" />
-		<result column="kit_group_purchase_type_" property="kitGroupPurchaseType" />
-		<result column="kit_fee_" property="kitFee" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroupSubjectPlan" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" id="MusicGroupSubjectPlan">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="expected_student_num_" property="expectedStudentNum"/>
+        <result column="apply_student_num_" property="applyStudentNum"/>
+        <result column="fee_" property="fee"/>
+        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"/>
+        <result column="kit_fee_" property="kitFee"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="MusicGroupSubjectPlan">
 		SELECT * FROM music_group_subject_plan WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroupSubjectPlan">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="MusicGroupSubjectPlan">
 		SELECT * FROM music_group_subject_plan ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" 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_subject_plan (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,kit_fee_,create_time_,update_time_) VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType},#{kitFee},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan">
-		UPDATE music_group_subject_plan <set>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="applyStudentNum != null">
-apply_student_num_ = #{applyStudentNum},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="fee != null">
-fee_ = #{fee},
-</if>
-<if test="kitGroupPurchaseType != null">
-kit_group_purchase_type_ = #{kitGroupPurchaseType},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="kitFee != null">
-kit_fee_ = #{kitFee},
-</if>
-<if test="expectedStudentNum != null">
-expected_student_num_ = #{expectedStudentNum},
-</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" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" 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_subject_plan
+        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,kit_fee_,create_time_,update_time_)
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType},#{kitFee},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan">
+        UPDATE music_group_subject_plan
+        <set>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="applyStudentNum != null">
+                apply_student_num_ = #{applyStudentNum},
+            </if>
+            <if test="fee != null">
+                fee_ = #{fee},
+            </if>
+            <if test="kitGroupPurchaseType != null">
+                kit_group_purchase_type_ = #{kitGroupPurchaseType},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="kitFee != null">
+                kit_fee_ = #{kitFee},
+            </if>
+            <if test="expectedStudentNum != null">
+                expected_student_num_ = #{expectedStudentNum},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM music_group_subject_plan WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupSubjectPlan" parameterType="map">
-		SELECT * FROM music_group_subject_plan ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="MusicGroupSubjectPlan" parameterType="map">
+        SELECT * FROM music_group_subject_plan ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_subject_plan
 	</select>
 </mapper>

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

@@ -5,84 +5,84 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.SchoolDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.School" id="School">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="organ_id_" property="organId" />
-		<result column="adress_" property="adress" />
-		<result column="contact_phone_" property="contactPhone" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="contact_name_" property="contactName" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="School" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.School" id="School">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="adress_" property="adress"/>
+        <result column="contact_phone_" property="contactPhone"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="contact_name_" property="contactName"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="School">
 		SELECT * FROM school WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="School">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="School">
 		SELECT * FROM school ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.School" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO school (id_,name_,organ_id_,adress_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_) VALUES(#{id},#{name},#{organId},#{adress},#{contactPhone},#{createTime},#{updateTime},#{delFlag},#{contactName})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.School">
-		UPDATE school <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="organId != null">
-organ_id_ = #{organId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="contactPhone != null">
-contact_phone_ = #{contactPhone},
-</if>
-<if test="adress != null">
-adress_ = #{adress},
-</if>
-<if test="contactName != null">
-contact_name_ = #{contactName},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.School" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO school
+        (id_,name_,organ_id_,adress_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_)
+        VALUES(#{id},#{name},#{organId},#{adress},#{contactPhone},#{createTime},#{updateTime},#{delFlag},#{contactName})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.School">
+        UPDATE school
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="contactPhone != null">
+                contact_phone_ = #{contactPhone},
+            </if>
+            <if test="adress != null">
+                adress_ = #{adress},
+            </if>
+            <if test="contactName != null">
+                contact_name_ = #{contactName},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM school WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="School" parameterType="map">
-		SELECT * FROM school ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="School" parameterType="map">
+        SELECT * FROM school ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM school
 	</select>
 </mapper>

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

@@ -5,88 +5,88 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.StudentAttendanceDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentAttendance" id="StudentAttendance">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="user_id_" property="userId" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="status_" property="status" />
-		<result column="create_time_" property="createTime" />
-		<result column="remark_" property="remark" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentAttendance" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.StudentAttendance" id="StudentAttendance">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="class_group_id_" property="classGroupId"/>
+        <result column="course_schedule_id_" property="courseScheduleId"/>
+        <result column="user_id_" property="userId"/>
+        <result column="teacher_id_" property="teacherId"/>
+        <result column="status_" property="status"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="remark_" property="remark"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="StudentAttendance">
 		SELECT * FROM student_attendance WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentAttendance">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="StudentAttendance">
 		SELECT * FROM student_attendance ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentAttendance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_attendance (id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_) VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status},#{createTime},#{remark})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentAttendance">
-		UPDATE student_attendance <set>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="remark != null">
-remark_ = #{remark},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="classGroupId != null">
-class_group_id_ = #{classGroupId},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="courseScheduleId != null">
-course_schedule_id_ = #{courseScheduleId},
-</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" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentAttendance" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO student_attendance
+        (id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status},#{createTime},#{remark})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentAttendance">
+        UPDATE student_attendance
+        <set>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="remark != null">
+                remark_ = #{remark},
+            </if>
+            <if test="classGroupId != null">
+                class_group_id_ = #{classGroupId},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="courseScheduleId != null">
+                course_schedule_id_ = #{courseScheduleId},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM student_attendance WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentAttendance" parameterType="map">
-		SELECT * FROM student_attendance ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="StudentAttendance" parameterType="map">
+        SELECT * FROM student_attendance ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_attendance
 	</select>
 </mapper>

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

@@ -5,112 +5,112 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.StudentRegistrationDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentRegistration" id="StudentRegistration">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="current_grade_" property="currentGrade" />
-		<result column="current_class_" property="currentClass" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="is_allow_adjust_" property="isAllowAdjust" />
-		<result column="kit_purchase_method_" property="kitPurchaseMethod" />
-		<result column="remark_" property="remark" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="parents_name_" property="parentsName" />
-		<result column="parents_company_" property="parentsCompany" />
-		<result column="payment_status_" property="paymentStatus" />
-		<result column="last_payment_date_" property="lastPaymentDate" />
-		<result column="next_payment_date_" property="nextPaymentDate" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentRegistration" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.StudentRegistration" id="StudentRegistration">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="current_grade_" property="currentGrade"/>
+        <result column="current_class_" property="currentClass"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="is_allow_adjust_" property="isAllowAdjust"/>
+        <result column="kit_purchase_method_" property="kitPurchaseMethod"/>
+        <result column="remark_" property="remark"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="parents_name_" property="parentsName"/>
+        <result column="parents_company_" property="parentsCompany"/>
+        <result column="payment_status_" property="paymentStatus"/>
+        <result column="last_payment_date_" property="lastPaymentDate"/>
+        <result column="next_payment_date_" property="nextPaymentDate"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="StudentRegistration">
 		SELECT * FROM student_registration WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentRegistration">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="StudentRegistration">
 		SELECT * FROM student_registration ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_registration (id_,user_id_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,last_payment_date_,next_payment_date_) VALUES(#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{remark},#{createTime},#{updateTime},#{parentsName},#{parentsCompany},#{paymentStatus},#{lastPaymentDate},#{nextPaymentDate})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentRegistration">
-		UPDATE student_registration <set>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="nextPaymentDate != null">
-next_payment_date_ = #{nextPaymentDate},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="currentGrade != null">
-current_grade_ = #{currentGrade},
-</if>
-<if test="lastPaymentDate != null">
-last_payment_date_ = #{lastPaymentDate},
-</if>
-<if test="currentClass != null">
-current_class_ = #{currentClass},
-</if>
-<if test="isAllowAdjust != null">
-is_allow_adjust_ = #{isAllowAdjust},
-</if>
-<if test="kitPurchaseMethod != null">
-kit_purchase_method_ = #{kitPurchaseMethod},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="remark != null">
-remark_ = #{remark},
-</if>
-<if test="paymentStatus != null">
-payment_status_ = #{paymentStatus},
-</if>
-<if test="parentsName != null">
-parents_name_ = #{parentsName},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="parentsCompany != null">
-parents_company_ = #{parentsCompany},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentRegistration" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO student_registration
+        (id_,user_id_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,last_payment_date_,next_payment_date_)
+        VALUES(#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{remark},#{createTime},#{updateTime},#{parentsName},#{parentsCompany},#{paymentStatus},#{lastPaymentDate},#{nextPaymentDate})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentRegistration">
+        UPDATE student_registration
+        <set>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="nextPaymentDate != null">
+                next_payment_date_ = #{nextPaymentDate},
+            </if>
+            <if test="currentGrade != null">
+                current_grade_ = #{currentGrade},
+            </if>
+            <if test="lastPaymentDate != null">
+                last_payment_date_ = #{lastPaymentDate},
+            </if>
+            <if test="currentClass != null">
+                current_class_ = #{currentClass},
+            </if>
+            <if test="isAllowAdjust != null">
+                is_allow_adjust_ = #{isAllowAdjust},
+            </if>
+            <if test="kitPurchaseMethod != null">
+                kit_purchase_method_ = #{kitPurchaseMethod},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="remark != null">
+                remark_ = #{remark},
+            </if>
+            <if test="paymentStatus != null">
+                payment_status_ = #{paymentStatus},
+            </if>
+            <if test="parentsName != null">
+                parents_name_ = #{parentsName},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="parentsCompany != null">
+                parents_company_ = #{parentsCompany},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM student_registration WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentRegistration" parameterType="map">
-		SELECT * FROM student_registration ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="StudentRegistration" parameterType="map">
+        SELECT * FROM student_registration ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_registration
 	</select>
 </mapper>

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

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

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

@@ -5,76 +5,75 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.SubjectDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.Subject" id="Subject">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="code_" property="code" />
-		<result column="parent_subject_id_" property="parentSubjectId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="Subject" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.Subject" id="Subject">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="code_" property="code"/>
+        <result column="parent_subject_id_" property="parentSubjectId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="del_flag_" property="delFlag"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="Subject">
 		SELECT * FROM subject WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="Subject">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="Subject">
 		SELECT * FROM subject ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.Subject" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.Subject">
-		UPDATE subject <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="parentSubjectId != null">
-parent_subject_id_ = #{parentSubjectId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="code != null">
-code_ = #{code},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Subject" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_,del_flag_)
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.Subject">
+        UPDATE subject
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
+            <if test="parentSubjectId != null">
+                parent_subject_id_ = #{parentSubjectId},
+            </if>
+            <if test="code != null">
+                code_ = #{code},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM subject WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="Subject" parameterType="map">
-		SELECT * FROM subject ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="Subject" parameterType="map">
+        SELECT * FROM subject ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM subject
 	</select>
 </mapper>

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

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

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

@@ -5,88 +5,88 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.TeacherAttendanceDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.TeacherAttendance" id="TeacherAttendance">
-		<result column="id_" property="id" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="sign_in_time_" property="signInTime" />
-		<result column="status_" property="status" />
-		<result column="remark_" property="remark" />
-		<result column="create_time_" property="createTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TeacherAttendance" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.TeacherAttendance" id="TeacherAttendance">
+        <result column="id_" property="id"/>
+        <result column="teacher_id_" property="teacherId"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="class_group_id_" property="classGroupId"/>
+        <result column="course_schedule_id_" property="courseScheduleId"/>
+        <result column="sign_in_time_" property="signInTime"/>
+        <result column="status_" property="status"/>
+        <result column="remark_" property="remark"/>
+        <result column="create_time_" property="createTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="TeacherAttendance">
 		SELECT * FROM teacher_attendance WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="TeacherAttendance">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="TeacherAttendance">
 		SELECT * FROM teacher_attendance ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO teacher_attendance (id_,teacher_id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_) VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status},#{remark},#{createTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance">
-		UPDATE teacher_attendance <set>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="remark != null">
-remark_ = #{remark},
-</if>
-<if test="signInTime != null">
-sign_in_time_ = #{signInTime},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="classGroupId != null">
-class_group_id_ = #{classGroupId},
-</if>
-<if test="courseScheduleId != null">
-course_schedule_id_ = #{courseScheduleId},
-</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" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO teacher_attendance
+        (id_,teacher_id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
+        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status},#{remark},#{createTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance">
+        UPDATE teacher_attendance
+        <set>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="remark != null">
+                remark_ = #{remark},
+            </if>
+            <if test="signInTime != null">
+                sign_in_time_ = #{signInTime},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="classGroupId != null">
+                class_group_id_ = #{classGroupId},
+            </if>
+            <if test="courseScheduleId != null">
+                course_schedule_id_ = #{courseScheduleId},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM teacher_attendance WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
-		SELECT * FROM teacher_attendance ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
+        SELECT * FROM teacher_attendance ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM teacher_attendance
 	</select>
 </mapper>

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

@@ -5,108 +5,108 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.TeacherDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.Teacher" id="Teacher">
-		<result column="user_id_" property="userId" />
-		<result column="organ_id_" property="organId" />
-		<result column="job_type_" property="jobType" />
-		<result column="job_category_" property="jobCategory" />
-		<result column="education_background_" property="educationBackground" />
-		<result column="graduate_school_" property="graduateSchool" />
-		<result column="technical_titles_" property="technicalTitles" />
-		<result column="work_unit_" property="workUnit" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="entry_date_" property="entryDate" />
-		<result column="certificate_type_" property="certificateType" />
-		<result column="certificate_num_" property="certificateNum" />
-		<result column="flow_organ_range_" property="flowOrganRange" />
-		<result column="update_time_" property="updateTime" />
-		<result column="create_time_" property="createTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="Teacher" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.Teacher" id="Teacher">
+        <result column="user_id_" property="userId"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="job_type_" property="jobType"/>
+        <result column="job_category_" property="jobCategory"/>
+        <result column="education_background_" property="educationBackground"/>
+        <result column="graduate_school_" property="graduateSchool"/>
+        <result column="technical_titles_" property="technicalTitles"/>
+        <result column="work_unit_" property="workUnit"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="entry_date_" property="entryDate"/>
+        <result column="certificate_type_" property="certificateType"/>
+        <result column="certificate_num_" property="certificateNum"/>
+        <result column="flow_organ_range_" property="flowOrganRange"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="create_time_" property="createTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="Teacher">
 		SELECT * FROM teacher WHERE user_id_ = #{userId} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="Teacher">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="Teacher">
 		SELECT * FROM teacher ORDER BY user_id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO teacher (user_id_,organ_id_,job_type_,job_category_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,update_time_,create_time_) VALUES(#{userId},#{organId},#{jobType},#{jobCategory},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.Teacher">
-		UPDATE teacher <set>
-<if test="graduateSchool != null">
-graduate_school_ = #{graduateSchool},
-</if>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="organId != null">
-organ_id_ = #{organId},
-</if>
-<if test="technicalTitles != null">
-technical_titles_ = #{technicalTitles},
-</if>
-<if test="entryDate != null">
-entry_date_ = #{entryDate},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="jobType != null">
-job_type_ = #{jobType},
-</if>
-<if test="flowOrganRange != null">
-flow_organ_range_ = #{flowOrganRange},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="certificateType != null">
-certificate_type_ = #{certificateType},
-</if>
-<if test="jobCategory != null">
-job_category_ = #{jobCategory},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="educationBackground != null">
-education_background_ = #{educationBackground},
-</if>
-<if test="certificateNum != null">
-certificate_num_ = #{certificateNum},
-</if>
-<if test="workUnit != null">
-work_unit_ = #{workUnit},
-</if>
-</set> WHERE user_id_ = #{userId} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO teacher
+        (user_id_,organ_id_,job_type_,job_category_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,update_time_,create_time_)
+        VALUES(#{userId},#{organId},#{jobType},#{jobCategory},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.Teacher">
+        UPDATE teacher
+        <set>
+            <if test="graduateSchool != null">
+                graduate_school_ = #{graduateSchool},
+            </if>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="technicalTitles != null">
+                technical_titles_ = #{technicalTitles},
+            </if>
+            <if test="entryDate != null">
+                entry_date_ = #{entryDate},
+            </if>
+            <if test="jobType != null">
+                job_type_ = #{jobType},
+            </if>
+            <if test="flowOrganRange != null">
+                flow_organ_range_ = #{flowOrganRange},
+            </if>
+            <if test="certificateType != null">
+                certificate_type_ = #{certificateType},
+            </if>
+            <if test="jobCategory != null">
+                job_category_ = #{jobCategory},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="educationBackground != null">
+                education_background_ = #{educationBackground},
+            </if>
+            <if test="certificateNum != null">
+                certificate_num_ = #{certificateNum},
+            </if>
+            <if test="workUnit != null">
+                work_unit_ = #{workUnit},
+            </if>
+        </set>
+        WHERE user_id_ = #{userId}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM teacher WHERE user_id_ = #{userId} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="Teacher" parameterType="map">
-		SELECT * FROM teacher ORDER BY user_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="Teacher" parameterType="map">
+        SELECT * FROM teacher ORDER BY user_id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM teacher
 	</select>
 </mapper>

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

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