用户管理功能

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

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

@@ -3,6 +3,7 @@ package com.xt.js.gkaq.frame.mappers;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.GroupModel;
 import com.xt.js.gkaq.frame.model.GroupModelDto;
 
@@ -15,4 +16,6 @@ public interface GroupModelMapper extends BaseMapper<GroupModel> {
      * @return
      */
     List<GroupModelDto> selectAllByCond(GroupModel model);
+
+    List<ComboBoxDto> selectByCombo();
 }

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

@@ -1,7 +1,13 @@
 package com.xt.js.gkaq.frame.mappers;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.UserGroupModel;
 
 public interface UserGroupModelMapper extends BaseMapper<UserGroupModel> {
+
+    List<UserGroupModel> selectByUserId(String userId);
+    
+    int deleteByUserId(String userId);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/UserInfoModelMapper.java

@@ -0,0 +1,8 @@
+package com.xt.js.gkaq.frame.mappers;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.frame.model.UserInfoModel;
+
+public interface UserInfoModelMapper extends BaseMapper<UserInfoModel> {
+
+}

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

@@ -30,4 +30,12 @@ public interface UserModelMapper extends BaseMapper<UserModel> {
      */
     List<String> selectAuthButtonByUserid(String userId);
 
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    List<UserModel> selectAllByCond(UserModel model);
+
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserGroupModel.java

@@ -1,28 +1,17 @@
 package com.xt.js.gkaq.frame.model;
 
-import java.util.Date;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-public class UserGroupModel {
-	private String id;
+public class UserGroupModel extends BaseUUIDModel {
+	/**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -1801398077924334382L;
 
 	private String groupId;
 
 	private String userId;
 
-	private Date createTime;
-
-	private Date updateTime;
-
-	private String state;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id == null ? null : id.trim();
-	}
-
 	public String getGroupId() {
 		return groupId;
 	}
@@ -39,27 +28,4 @@ public class UserGroupModel {
 		this.userId = userId == null ? null : userId.trim();
 	}
 
-	public Object getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Object getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state == null ? null : state.trim();
-	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserInfoModel.java

@@ -0,0 +1,251 @@
+package com.xt.js.gkaq.frame.model;
+
+import java.util.Date;
+
+public class UserInfoModel extends UserModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 3582866311227602898L;
+
+    private String ifSaftey;
+
+    private String ifLogin;
+
+    private String ifMapview;
+
+    private String ifOverseer;
+
+    private String ifOperator;
+
+    private String ifAdmin;
+
+    private String ifApprove;
+
+    private String ifShip;
+
+    private String ifJob;
+
+    private String belongsOrg;
+
+    private String belongsShip;
+
+    private String approveSet;
+
+    private String declarerCid;
+
+    private String belongsOperator;
+
+    private String safetyAssessOrg;
+
+    private String developmentOrg;
+
+    private Date birthday;
+
+    private String politicsStatus;
+
+    private String educationBackground;
+
+    private String duty;
+
+    private String planning;
+
+    private String userState;
+
+    private String fax;
+
+    private String address;
+
+    public String getIfSaftey() {
+        return ifSaftey;
+    }
+
+    public void setIfSaftey(String ifSaftey) {
+        this.ifSaftey = ifSaftey == null ? null : ifSaftey.trim();
+    }
+
+    public String getIfLogin() {
+        return ifLogin;
+    }
+
+    public void setIfLogin(String ifLogin) {
+        this.ifLogin = ifLogin == null ? null : ifLogin.trim();
+    }
+
+    public String getIfMapview() {
+        return ifMapview;
+    }
+
+    public void setIfMapview(String ifMapview) {
+        this.ifMapview = ifMapview == null ? null : ifMapview.trim();
+    }
+
+    public String getIfOverseer() {
+        return ifOverseer;
+    }
+
+    public void setIfOverseer(String ifOverseer) {
+        this.ifOverseer = ifOverseer == null ? null : ifOverseer.trim();
+    }
+
+    public String getIfOperator() {
+        return ifOperator;
+    }
+
+    public void setIfOperator(String ifOperator) {
+        this.ifOperator = ifOperator == null ? null : ifOperator.trim();
+    }
+
+    public String getIfAdmin() {
+        return ifAdmin;
+    }
+
+    public void setIfAdmin(String ifAdmin) {
+        this.ifAdmin = ifAdmin == null ? null : ifAdmin.trim();
+    }
+
+    public String getIfApprove() {
+        return ifApprove;
+    }
+
+    public void setIfApprove(String ifApprove) {
+        this.ifApprove = ifApprove == null ? null : ifApprove.trim();
+    }
+
+    public String getIfShip() {
+        return ifShip;
+    }
+
+    public void setIfShip(String ifShip) {
+        this.ifShip = ifShip == null ? null : ifShip.trim();
+    }
+
+    public String getIfJob() {
+        return ifJob;
+    }
+
+    public void setIfJob(String ifJob) {
+        this.ifJob = ifJob == null ? null : ifJob.trim();
+    }
+
+    public String getBelongsOrg() {
+        return belongsOrg;
+    }
+
+    public void setBelongsOrg(String belongsOrg) {
+        this.belongsOrg = belongsOrg == null ? null : belongsOrg.trim();
+    }
+
+    public String getBelongsShip() {
+        return belongsShip;
+    }
+
+    public void setBelongsShip(String belongsShip) {
+        this.belongsShip = belongsShip == null ? null : belongsShip.trim();
+    }
+
+    public String getApproveSet() {
+        return approveSet;
+    }
+
+    public void setApproveSet(String approveSet) {
+        this.approveSet = approveSet == null ? null : approveSet.trim();
+    }
+
+    public String getDeclarerCid() {
+        return declarerCid;
+    }
+
+    public void setDeclarerCid(String declarerCid) {
+        this.declarerCid = declarerCid == null ? null : declarerCid.trim();
+    }
+
+    public String getBelongsOperator() {
+        return belongsOperator;
+    }
+
+    public void setBelongsOperator(String belongsOperator) {
+        this.belongsOperator = belongsOperator == null ? null : belongsOperator.trim();
+    }
+
+    public String getSafetyAssessOrg() {
+        return safetyAssessOrg;
+    }
+
+    public void setSafetyAssessOrg(String safetyAssessOrg) {
+        this.safetyAssessOrg = safetyAssessOrg == null ? null : safetyAssessOrg.trim();
+    }
+
+    public String getDevelopmentOrg() {
+        return developmentOrg;
+    }
+
+    public void setDevelopmentOrg(String developmentOrg) {
+        this.developmentOrg = developmentOrg == null ? null : developmentOrg.trim();
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getPoliticsStatus() {
+        return politicsStatus;
+    }
+
+    public void setPoliticsStatus(String politicsStatus) {
+        this.politicsStatus = politicsStatus == null ? null : politicsStatus.trim();
+    }
+
+    public String getEducationBackground() {
+        return educationBackground;
+    }
+
+    public void setEducationBackground(String educationBackground) {
+        this.educationBackground = educationBackground == null ? null : educationBackground.trim();
+    }
+
+    public String getDuty() {
+        return duty;
+    }
+
+    public void setDuty(String duty) {
+        this.duty = duty == null ? null : duty.trim();
+    }
+
+    public String getPlanning() {
+        return planning;
+    }
+
+    public void setPlanning(String planning) {
+        this.planning = planning == null ? null : planning.trim();
+    }
+
+    public String getUserState() {
+        return userState;
+    }
+
+    public void setUserState(String userState) {
+        this.userState = userState == null ? null : userState.trim();
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax == null ? null : fax.trim();
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/GroupService.java

@@ -3,6 +3,7 @@ package com.xt.js.gkaq.frame.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.GroupModel;
 import com.xt.js.gkaq.frame.model.GroupModelDto;
 
@@ -14,5 +15,7 @@ public interface GroupService extends BaseService<GroupModel> {
      * @param model
      * @return
      */
-    List<GroupModelDto> findAllByCond(GroupModel model);
+    public List<GroupModelDto> findAllByCond(GroupModel model);
+
+    public List<ComboBoxDto> findByCombo();
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/UserGroupService.java

@@ -0,0 +1,17 @@
+package com.xt.js.gkaq.frame.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.frame.model.UserGroupModel;
+
+/**
+ * Óû§·Ö×éÐÅÏ¢·þÎñ½Ó¿Ú
+ * 
+ */
+public interface UserGroupService extends BaseService<UserGroupModel> {
+
+    public List<UserGroupModel> findByUserId(String userId);
+    
+    public int deleteByUserId(String userId);
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/UserInfoService.java

@@ -0,0 +1,12 @@
+package com.xt.js.gkaq.frame.service;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.frame.model.UserInfoModel;
+
+/**
+ * Óû§»ù´¡ÐÅÏ¢·þÎñ½Ó¿Ú
+ * 
+ */
+public interface UserInfoService extends BaseService<UserInfoModel> {
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/UserService.java

@@ -36,4 +36,6 @@ public interface UserService extends BaseUUIDModelService<UserModel> {
      * @return
      */
     List<String> selectAuthButtonByUserid(String userId);
+
+    public List<UserModel> findAllByCond(UserModel model);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/GroupServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.GroupModelMapper;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.GroupModel;
 import com.xt.js.gkaq.frame.model.GroupModelDto;
 import com.xt.js.gkaq.frame.service.GroupService;
@@ -25,4 +26,8 @@ public class GroupServiceImpl extends BaseUUIDModelServiceImpl<GroupModel> imple
     public List<GroupModelDto> findAllByCond(GroupModel model) {
         return mapper.selectAllByCond(model);
     }
+
+    public List<ComboBoxDto> findByCombo() {
+        return mapper.selectByCombo();
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/UserGroupServiceImpl.java

@@ -0,0 +1,32 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.frame.mappers.UserGroupModelMapper;
+import com.xt.js.gkaq.frame.model.UserGroupModel;
+import com.xt.js.gkaq.frame.service.UserGroupService;
+
+@Service
+public class UserGroupServiceImpl extends BaseUUIDModelServiceImpl<UserGroupModel> implements UserGroupService {
+    @Autowired
+    private UserGroupModelMapper mapper;
+
+    @Override
+    protected BaseMapper<UserGroupModel> getMapper() {
+        return mapper;
+    }
+
+    public List<UserGroupModel> findByUserId(String userId) {
+        return mapper.selectByUserId(userId);
+    }
+    
+    public int deleteByUserId(String userId) {
+        return mapper.deleteByUserId(userId);
+        
+    }
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/UserInfoServiceImpl.java

@@ -0,0 +1,23 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
+import com.xt.js.gkaq.frame.mappers.UserInfoModelMapper;
+import com.xt.js.gkaq.frame.model.UserInfoModel;
+import com.xt.js.gkaq.frame.service.UserInfoService;
+
+@Service
+public class UserInfoServiceImpl extends BaseServiceImpl<UserInfoModel> implements UserInfoService {
+
+    @Autowired
+	private UserInfoModelMapper mapper;
+
+	@Override
+	protected BaseMapper<UserInfoModel> getMapper() {
+		return mapper;
+	}
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/UserServiceImpl.java

@@ -32,4 +32,8 @@ public class UserServiceImpl extends BaseUUIDModelServiceImpl<UserModel> impleme
     public List<String> selectAuthButtonByUserid(String userId) {
         return mapper.selectAuthButtonByUserid(userId);
     }
+
+    public List<UserModel> findAllByCond(UserModel model) {
+        return mapper.selectAllByCond(model);
+    }
 }

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

@@ -16,6 +16,10 @@
     <result column="ORG_NAME" property="orgName" jdbcType="VARCHAR" />
     <result column="ROLE_NAME" property="roleName" jdbcType="VARCHAR" />
   </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="VARCHAR" />
+    <result column="REMARK" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_GROUP
     where ID = #{id,jdbcType=VARCHAR}
@@ -64,4 +68,8 @@
     </where>
     order by O.CODE, R.CODE
   </select>
+  <select id="selectByCombo" resultMap="ComboBoxMap" >
+    select ID, REMARK
+    from AQ_BASIC_FRAME_GROUP
+  </select>
 </mapper>

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

@@ -76,10 +76,10 @@
     from AQ_BASIC_FRAME_ORG C left join AQ_BASIC_FRAME_ORG P on C.PID = P.ID
     <where>
 	    <if test="pid != null and pid != ''">
-	        P.ID = #{pid,jdbcType=VARCHAR}
+	        and P.ID = #{pid,jdbcType=VARCHAR}
 	    </if>
 	    <if test="pcode != null and pcode != ''">
-	        P.CODE = #{pcode,jdbcType=VARCHAR}
+	        and P.CODE = #{pcode,jdbcType=VARCHAR}
 	    </if>
 	    <if test="code != null and code != ''">
 	        and C.CODE = #{code,jdbcType=VARCHAR}

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

@@ -42,5 +42,14 @@
   <select id="selectAll" resultMap="BaseResultMap">
     select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_USER_GROUP
-  </select>
+  </select>
+  <select id="selectByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select ID, GROUP_ID, USER_ID
+    from AQ_BASIC_FRAME_USER_GROUP
+    where USER_ID = #{userId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByUserId" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_USER_GROUP
+    where USER_ID = #{userId,jdbcType=VARCHAR}
+  </delete>
 </mapper>

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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.frame.mappers.UserInfoModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserInfoModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="REAL_NAME" property="realName" jdbcType="VARCHAR" />
+    <result column="LOGIN_NAME" property="loginName" jdbcType="VARCHAR" />
+    <result column="ORGID" property="orgid" jdbcType="VARCHAR" />
+    <result column="IF_SAFTEY" property="ifSaftey" jdbcType="CHAR" />
+    <result column="IF_LOGIN" property="ifLogin" jdbcType="CHAR" />
+    <result column="IF_MAPVIEW" property="ifMapview" jdbcType="CHAR" />
+    <result column="IF_OVERSEER" property="ifOverseer" jdbcType="CHAR" />
+    <result column="IF_OPERATOR" property="ifOperator" jdbcType="CHAR" />
+    <result column="IF_ADMIN" property="ifAdmin" jdbcType="CHAR" />
+    <result column="IF_APPROVE" property="ifApprove" jdbcType="CHAR" />
+    <result column="IF_SHIP" property="ifShip" jdbcType="CHAR" />
+    <result column="IF_JOB" property="ifJob" jdbcType="CHAR" />
+    <result column="BELONGS_ORG" property="belongsOrg" jdbcType="VARCHAR" />
+    <result column="BELONGS_SHIP" property="belongsShip" jdbcType="VARCHAR" />
+    <result column="APPROVE_SET" property="approveSet" jdbcType="VARCHAR" />
+    <result column="DECLARER_CID" property="declarerCid" jdbcType="VARCHAR" />
+    <result column="BELONGS_OPERATOR" property="belongsOperator" jdbcType="VARCHAR" />
+    <result column="SAFETY_ASSESS_ORG" property="safetyAssessOrg" jdbcType="VARCHAR" />
+    <result column="DEVELOPMENT_ORG" property="developmentOrg" jdbcType="VARCHAR" />
+    <result column="BIRTHDAY" property="birthday" jdbcType="TIMESTAMP" />
+    <result column="SEX" property="sex" jdbcType="CHAR" />
+    <result column="POLITICS_STATUS" property="politicsStatus" jdbcType="CHAR" />
+    <result column="EDUCATION_BACKGROUND" property="educationBackground" jdbcType="CHAR" />
+    <result column="DUTY" property="duty" jdbcType="CHAR" />
+    <result column="PLANNING" property="planning" jdbcType="CHAR" />
+    <result column="USER_STATE" property="userState" jdbcType="CHAR" />
+    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
+    <result column="EMAIL" property="email" jdbcType="VARCHAR" />
+    <result column="FAX" property="fax" jdbcType="VARCHAR" />
+    <result column="ADDRESS" property="address" jdbcType="VARCHAR" />
+    <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" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_USERINFO
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserInfoModel" >
+    insert into AQ_BASIC_FRAME_USERINFO (ID, REAL_NAME, LOGIN_NAME, 
+      ORGID, IF_SAFTEY, IF_LOGIN, 
+      IF_MAPVIEW, IF_OVERSEER, IF_OPERATOR, 
+      IF_ADMIN, IF_APPROVE, IF_SHIP, 
+      IF_JOB, BELONGS_ORG, BELONGS_SHIP, 
+      APPROVE_SET, DECLARER_CID, BELONGS_OPERATOR, 
+      SAFETY_ASSESS_ORG, DEVELOPMENT_ORG, BIRTHDAY, 
+      SEX, POLITICS_STATUS, EDUCATION_BACKGROUND, 
+      DUTY, PLANNING, USER_STATE, PHONE, 
+      EMAIL, FAX, ADDRESS, 
+      STATE, CREATE_TIME, UPDATE_TIME, 
+      CREATE_USER, UPDATE_USER)
+    values (#{id,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
+      #{orgid,jdbcType=VARCHAR}, #{ifSaftey,jdbcType=CHAR}, #{ifLogin,jdbcType=CHAR}, 
+      #{ifMapview,jdbcType=CHAR}, #{ifOverseer,jdbcType=CHAR}, #{ifOperator,jdbcType=CHAR}, 
+      #{ifAdmin,jdbcType=CHAR}, #{ifApprove,jdbcType=CHAR}, #{ifShip,jdbcType=CHAR}, 
+      #{ifJob,jdbcType=CHAR}, #{belongsOrg,jdbcType=VARCHAR}, #{belongsShip,jdbcType=VARCHAR}, 
+      #{approveSet,jdbcType=VARCHAR}, #{declarerCid,jdbcType=VARCHAR}, #{belongsOperator,jdbcType=VARCHAR}, 
+      #{safetyAssessOrg,jdbcType=VARCHAR}, #{developmentOrg,jdbcType=VARCHAR}, #{birthday,jdbcType=TIMESTAMP}, 
+      #{sex,jdbcType=CHAR}, #{politicsStatus,jdbcType=CHAR}, #{educationBackground,jdbcType=CHAR}, 
+      #{duty,jdbcType=CHAR}, #{planning,jdbcType=CHAR}, #{userState,jdbcType=CHAR}, #{phone,jdbcType=VARCHAR}, 
+      #{email,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
+      #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR})
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserInfoModel" >
+    update AQ_BASIC_FRAME_USERINFO
+    set REAL_NAME = #{realName,jdbcType=VARCHAR},
+      LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
+      ORGID = #{orgid,jdbcType=VARCHAR},
+      IF_SAFTEY = #{ifSaftey,jdbcType=CHAR},
+      IF_LOGIN = #{ifLogin,jdbcType=CHAR},
+      IF_MAPVIEW = #{ifMapview,jdbcType=CHAR},
+      IF_OVERSEER = #{ifOverseer,jdbcType=CHAR},
+      IF_OPERATOR = #{ifOperator,jdbcType=CHAR},
+      IF_ADMIN = #{ifAdmin,jdbcType=CHAR},
+      IF_APPROVE = #{ifApprove,jdbcType=CHAR},
+      IF_SHIP = #{ifShip,jdbcType=CHAR},
+      IF_JOB = #{ifJob,jdbcType=CHAR},
+      BELONGS_ORG = #{belongsOrg,jdbcType=VARCHAR},
+      BELONGS_SHIP = #{belongsShip,jdbcType=VARCHAR},
+      APPROVE_SET = #{approveSet,jdbcType=VARCHAR},
+      DECLARER_CID = #{declarerCid,jdbcType=VARCHAR},
+      BELONGS_OPERATOR = #{belongsOperator,jdbcType=VARCHAR},
+      SAFETY_ASSESS_ORG = #{safetyAssessOrg,jdbcType=VARCHAR},
+      DEVELOPMENT_ORG = #{developmentOrg,jdbcType=VARCHAR},
+      BIRTHDAY = #{birthday,jdbcType=TIMESTAMP},
+      SEX = #{sex,jdbcType=CHAR},
+      POLITICS_STATUS = #{politicsStatus,jdbcType=CHAR},
+      EDUCATION_BACKGROUND = #{educationBackground,jdbcType=CHAR},
+      DUTY = #{duty,jdbcType=CHAR},
+      PLANNING = #{planning,jdbcType=CHAR},
+      USER_STATE = #{userState,jdbcType=CHAR},
+      PHONE = #{phone,jdbcType=VARCHAR},
+      EMAIL = #{email,jdbcType=VARCHAR},
+      FAX = #{fax,jdbcType=VARCHAR},
+      ADDRESS = #{address,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_TIME = #{createTime,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, REAL_NAME, LOGIN_NAME, ORGID, IF_SAFTEY, IF_LOGIN, IF_MAPVIEW, IF_OVERSEER, 
+    IF_OPERATOR, IF_ADMIN, IF_APPROVE, IF_SHIP, IF_JOB, BELONGS_ORG, BELONGS_SHIP, APPROVE_SET, 
+    DECLARER_CID, BELONGS_OPERATOR, SAFETY_ASSESS_ORG, DEVELOPMENT_ORG, BIRTHDAY, SEX, 
+    POLITICS_STATUS, EDUCATION_BACKGROUND, DUTY, PLANNING, USER_STATE, PHONE, EMAIL, 
+    FAX, ADDRESS, STATE, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER
+    from AQ_BASIC_FRAME_USERINFO
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, REAL_NAME, LOGIN_NAME, ORGID, IF_SAFTEY, IF_LOGIN, IF_MAPVIEW, IF_OVERSEER, 
+    IF_OPERATOR, IF_ADMIN, IF_APPROVE, IF_SHIP, IF_JOB, BELONGS_ORG, BELONGS_SHIP, APPROVE_SET, 
+    DECLARER_CID, BELONGS_OPERATOR, SAFETY_ASSESS_ORG, DEVELOPMENT_ORG, BIRTHDAY, SEX, 
+    POLITICS_STATUS, EDUCATION_BACKGROUND, DUTY, PLANNING, USER_STATE, PHONE, EMAIL, 
+    FAX, ADDRESS, STATE, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER
+    from AQ_BASIC_FRAME_USERINFO
+  </select>
+</mapper>

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

@@ -101,4 +101,17 @@
 			)
 		)
 	</select>
+  	<select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.UserModel" >
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL
+		from AQ_BASIC_FRAME_USER
+    	<where>
+		    <if test="realName != null and realName != ''">
+		        and REAL_NAME like #{realName,jdbcType=VARCHAR}
+		    </if>
+		    <if test="loginName != null and loginName != ''">
+		        and LOGIN_NAME like #{loginName,jdbcType=VARCHAR}
+		    </if>
+    	</where>
+    	order by CREATE_TIME desc
+  	</select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/generatorConfig.xml

@@ -70,7 +70,6 @@
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
 		</table>
-		  -->
 		<table tableName="AQ_BASIC_FRAME_GROUP_MENU" domainObjectName="GroupMenuModel">
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
@@ -79,5 +78,7 @@
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
 		</table>
+		  -->
+		  <table tableName="AQ_BASIC_FRAME_USERINFO" domainObjectName="UserInfoModel"></table>
 	</context>
 </generatorConfiguration>