update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -29,9 +29,6 @@ public class MenuController extends BaseController {
         if(menuByPermission != null){
             return failed("权限标识不能重复");
         }
-        Date date = new Date();
-        sysMenu.setUpdateTime(date);
-        sysMenu.setCreateTime(date);
         return succeed(sysMenuService.insert(sysMenu));
     }
 

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

@@ -41,8 +41,8 @@
         </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})
+        (id_,name_,permission_,path,parent_id_,icon_,component_,sort,keep_alive_,type_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -124,7 +124,7 @@
 
     <!-- 根据权限标识查菜单 -->
     <select id="findMenuByPermission" resultMap="SysMenu">
-        SELECT * FROM `sys_role_menu` WHERE `permission_` = #{permission} AND sm.del_flag_ = 0
+        SELECT * FROM `sys_role_menu` WHERE `permission_` = #{permission} AND del_flag_ = 0
     </select>
     <sql id="queryTree">
         <where>

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

@@ -34,8 +34,8 @@
         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 INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -63,8 +63,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
-        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
+        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
+        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{lockFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -29,8 +29,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeType" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO charge_type (id_,name_,del_flag_,description_,course_form_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{description},#{courseForm},now(),now())
+        INSERT INTO charge_type (id_,name_,description_,course_form_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{description},#{courseForm},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -5,98 +5,98 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseHomeworkTemplateDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" id="CourseHomeworkTemplate">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="content_" property="content" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="class_group_type_" property="classGroupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="subject_id_" property="subjectId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseHomeworkTemplate" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" id="CourseHomeworkTemplate">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="content_" property="content"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="class_group_type_" property="classGroupType"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="subject_id_" property="subjectId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseHomeworkTemplate">
 		SELECT * FROM course_homework_template WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseHomeworkTemplate">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseHomeworkTemplate">
 		SELECT * FROM course_homework_template ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_homework_template (id_,name_,content_,del_flag_,create_time_,update_time_,class_group_type_,subject_id_) VALUES(#{id},#{name},#{content},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate">
-		UPDATE course_homework_template <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = now(),
-</if>
-<if test="content != null">
-content_ = #{content},
-</if>
-<if test="classGroupType != null">
-class_group_type_ = #{classGroupType},
-</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.CourseHomeworkTemplate" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO course_homework_template
+        (id_,name_,content_,create_time_,update_time_,class_group_type_,subject_id_)
+        VALUES(#{id},#{name},#{content},now(),now(),#{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate">
+        UPDATE course_homework_template
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = now(),
+            </if>
+            <if test="content != null">
+                content_ = #{content},
+            </if>
+            <if test="classGroupType != null">
+                class_group_type_ = #{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		UPDATE course_homework_template SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
-	<sql id="queryCondition">
-		<where>
-			<if test="subjectIDs != null">
-				and subject_id_ IN
-				<foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
-					#{subjectID}
-				</foreach>
-			</if>
-		</where>
-	</sql>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
-		SELECT * FROM course_homework_template
-		<include refid="queryCondition"/>
-		ORDER BY id_
-		<include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+    <sql id="queryCondition">
+        <where>
+            <if test="subjectIDs != null">
+                and subject_id_ IN
+                <foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
+                    #{subjectID}
+                </foreach>
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
+        SELECT * FROM course_homework_template
+        <include refid="queryCondition"/>
+        ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_homework_template
 	</select>
 
-	<select id="getSubjectIDs" resultType="java.lang.String">
+    <select id="getSubjectIDs" resultType="java.lang.String">
 		SELECT
 			cg.subject_id_list_
 		FROM

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

@@ -33,8 +33,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO leave_category (id_,name_,del_flag_,remark_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now(),now())
+        INSERT INTO leave_category (id_,name_,remark_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{remark},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -38,8 +38,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO organization (id_,name_,code_,create_time_,update_time_,del_flag_,parent_organ_id_,register_date_,linkman_,mobile_,address_)
-        VALUES(#{id},#{name},#{code},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId},#{registerDate},#{linkman},#{mobile},#{address})
+        INSERT INTO organization (id_,name_,code_,create_time_,update_time_,parent_organ_id_,register_date_,linkman_,mobile_,address_)
+        VALUES(#{id},#{name},#{code},now(),now(),#{parentOrganId},#{registerDate},#{linkman},#{mobile},#{address})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -39,8 +39,8 @@
         </selectKey>
         -->
         INSERT INTO school
-        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_,longitude_latitude_,subsidy_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude},#{subsidy})
+        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_)
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -34,8 +34,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO sys_area (id_,name_,code_,create_time_,update_time_,del_flag_,parent_organ_id_)
-        VALUES(#{id},#{name},#{code},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId})
+        INSERT INTO sys_area (id_,name_,code_,create_time_,update_time_,parent_organ_id_)
+        VALUES(#{id},#{name},#{code},now(),now(),#{parentOrganId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->