git-svn-id: https://192.168.57.71/svn/jsgkj@720 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/GroupModelMapper.xml

@@ -9,6 +9,8 @@
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="STATE" property="state" jdbcType="CHAR" />
+	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_GROUP
@@ -17,10 +19,10 @@
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
     insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
       REMARK, CREATE_TIME, UPDATE_TIME, 
-      STATE)
+      STATE,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{state,jdbcType=CHAR})
+      #{state,jdbcType=CHAR},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
     update AQ_BASIC_FRAME_GROUP
@@ -29,16 +31,18 @@
       REMARK = #{remark,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      STATE = #{state,jdbcType=CHAR}
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_USER= #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER= #{updateUser,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_GROUP
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_GROUP
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/OrgModelMapper.xml

@@ -16,6 +16,8 @@
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="XZQH" property="xzqh" jdbcType="VARCHAR" />
     <result column="LEVEL" property="level" jdbcType="VARCHAR" />
+	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
@@ -26,12 +28,12 @@
       REMARK, PID, SORTNO, 
       CODE, SZD, SZD_NAME, 
       STATE, CREATE_TIME, UPDATE_TIME, 
-      XZQH, LEVEL)
+      XZQH, LEVEL,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{sortno,jdbcType=DECIMAL}, 
       #{code,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szdName,jdbcType=VARCHAR}, 
       #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{xzqh,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR})
+      #{xzqh,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
     update AQ_BASIC_FRAME_ORG
@@ -47,18 +49,20 @@
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       XZQH = #{xzqh,jdbcType=VARCHAR},
-      LEVEL = #{level,jdbcType=VARCHAR}
+      LEVEL = #{level,jdbcType=VARCHAR},
+      CREATE_USER= #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER= #{updateUser,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE, CREATE_TIME, 
-    UPDATE_TIME, XZQH, LEVEL
+    UPDATE_TIME, XZQH, LEVEL, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ORG
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
     select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE, CREATE_TIME, 
-    UPDATE_TIME, XZQH, LEVEL
+    UPDATE_TIME, XZQH, LEVEL, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ORG
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/ParamModelMapper.xml

@@ -10,6 +10,8 @@
     <result column="STATE" property="state" jdbcType="CHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_PARAM
@@ -18,10 +20,10 @@
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.ParamModel" >
     insert into AQ_BASIC_FRAME_PARAM (ID, KEY, VALUE, 
       CLAZZ, DISP, STATE, CREATE_TIME, 
-      UPDATE_TIME)
+      UPDATE_TIME,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{key,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
       #{clazz,jdbcType=VARCHAR}, #{disp,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.ParamModel" >
     update AQ_BASIC_FRAME_PARAM
@@ -31,16 +33,18 @@
       DISP = #{disp,jdbcType=VARCHAR},
       STATE = #{state,jdbcType=CHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_USER= #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER= #{updateUser,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME
+    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME,CREATE_USER,UPDATE_USER
     from AQ_BASIC_FRAME_PARAM
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME
+    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME,CREATE_USER,UPDATE_USER
     from AQ_BASIC_FRAME_PARAM
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/RoleModelMapper.xml

@@ -6,10 +6,12 @@
     <result column="NAME" property="name" jdbcType="VARCHAR" />
     <result column="CODE" property="code" jdbcType="VARCHAR" />
     <result column="REMARK" property="remark" jdbcType="VARCHAR" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="OTHER" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="OTHER" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="STATE" property="state" jdbcType="CHAR" />
     <result column="SORTNO" property="sortno" jdbcType="DECIMAL" />
+	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ROLE
@@ -18,33 +20,35 @@
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.RoleModel" >
     insert into AQ_BASIC_FRAME_ROLE (ID, NAME, CODE, 
       REMARK, CREATE_TIME, UPDATE_TIME, 
-      STATE, SORTNO)
+      STATE, SORTNO,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, 
-      #{state,jdbcType=CHAR}, #{sortno,jdbcType=DECIMAL})
+      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=CHAR}, #{sortno,jdbcType=DECIMAL},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.RoleModel" >
     update AQ_BASIC_FRAME_ROLE
     set NAME = #{name,jdbcType=VARCHAR},
       CODE = #{code,jdbcType=VARCHAR},
       REMARK = #{remark,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       STATE = #{state,jdbcType=CHAR},
-      SORTNO = #{sortno,jdbcType=DECIMAL}
+      SORTNO = #{sortno,jdbcType=DECIMAL},
+      CREATE_USER= #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER= #{updateUser,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
+    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ROLE
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
+    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ROLE
   </select>
   <select id="selectByUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    SELECT R.ID, R.NAME, R.CODE, R.REMARK, R.CREATE_TIME, R.UPDATE_TIME, R.STATE, R.SORTNO
+    SELECT R.ID, R.NAME, R.CODE, R.REMARK, R.CREATE_TIME, R.UPDATE_TIME, R.STATE, R.SORTNO,R.CREATE_USER, R.UPDATE_USER
     FROM AQ_BASIC_FRAME_ROLE R
     WHERE EXISTS(
     SELECT 1 

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserGroupModelMapper.xml

@@ -7,18 +7,20 @@
     <result column="USER_ID" jdbcType="VARCHAR" property="userId" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="STATE" jdbcType="CHAR" property="state" />
+    <result column="STATE" jdbcType="CHAR" property="state" />
+	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from AQ_BASIC_FRAME_USER_GROUP
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
-    insert into AQ_BASIC_FRAME_USER_GROUP (ID, GROUP_ID, USER_ID, 
-      CREATE_TIME, UPDATE_TIME, STATE
-      )
+    insert into AQ_BASIC_FRAME_USER_GROUP (ID, GROUP_ID, USER_ID, 
+     CREATE_TIME, UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER)
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR}
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR},
+      #{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
@@ -27,16 +29,18 @@
       USER_ID = #{userId,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      STATE = #{state,jdbcType=CHAR}
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_USER= #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER= #{updateUser,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
+    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_USER_GROUP
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap">
-    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
+    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_USER_GROUP
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserModelMapper.xml

@@ -10,9 +10,11 @@
 		<result column="SEX" jdbcType="CHAR" property="sex" />
 		<result column="PHONE" jdbcType="VARCHAR" property="phone" />
 		<result column="EMAIL" jdbcType="VARCHAR" property="email" />
-		<result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
-		<result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
-		<result column="STATE" jdbcType="CHAR" property="state" />
+		<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="STATE" jdbcType="CHAR" property="state" />
+		<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+		<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
 	</resultMap>
 	<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
 		delete from AQ_BASIC_FRAME_USER
@@ -22,13 +24,13 @@
 		insert into AQ_BASIC_FRAME_USER (ID, REAL_NAME, LOGIN_NAME,
 		LOGIN_PASSWORD, ORGID, SEX,
 		PHONE, EMAIL, CREATE_TIME,
-		UPDATE_TIME, STATE)
+		UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER)
 		values (#{id,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR},
 		#{loginName,jdbcType=VARCHAR},
 		#{loginPassword,jdbcType=VARCHAR}, #{orgid,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR},
 		#{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
-		#{createTime,jdbcType=OTHER},
-		#{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR})
+		#{createTime,jdbcType=TIMESTAMP},
+		#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserModel">
 		update AQ_BASIC_FRAME_USER
@@ -39,31 +41,30 @@
 		SEX = #{sex,jdbcType=CHAR},
 		PHONE = #{phone,jdbcType=VARCHAR},
 		EMAIL = #{email,jdbcType=VARCHAR},
-		CREATE_TIME = #{createTime,jdbcType=OTHER},
-		UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-		STATE = #{state,jdbcType=CHAR}
+		CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+		UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+		STATE = #{state,jdbcType=CHAR},
+		CREATE_USER = #{createUser,jdbcType=VARCHAR},
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}
 		where ID = #{id,jdbcType=VARCHAR}
 	</update>
 	<select id="selectByPrimaryKey" parameterType="java.lang.String"
 		resultMap="BaseResultMap">
 		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
-		CREATE_TIME,
-		UPDATE_TIME, STATE
+		CREATE_TIME,UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER
 		from AQ_BASIC_FRAME_USER
 		where ID = #{id,jdbcType=VARCHAR}
 	</select>
 	<select id="selectByLoginName" parameterType="java.lang.String"
 		resultMap="BaseResultMap">
 		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
-		CREATE_TIME,
-		UPDATE_TIME, STATE
+		CREATE_TIME,UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER
 		from AQ_BASIC_FRAME_USER
 		where LOGIN_NAME = #{loginName,jdbcType=VARCHAR}
 	</select>
 	<select id="selectAll" resultMap="BaseResultMap">
 		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
-		CREATE_TIME,
-		UPDATE_TIME, STATE
+		CREATE_TIME,UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER
 		from AQ_BASIC_FRAME_USER
 	</select>
 	<!-- 根据用户ID查询授权的菜单 -->