分组管理功能

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

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

@@ -0,0 +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.GroupButtonModel;
+
+public interface GroupButtonModelMapper extends BaseMapper<GroupButtonModel> {
+
+    public List<GroupButtonModel> selectByGroupId(String groupId);
+    
+    public int deleteByGroupId(String groupId);
+}

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

@@ -0,0 +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.GroupMenuModel;
+
+public interface GroupMenuModelMapper extends BaseMapper<GroupMenuModel> {
+
+    public List<GroupMenuModel> selectByGroupId(String groupId);
+    
+    public int deleteByGroupId(String groupId);
+}

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

@@ -1,7 +1,18 @@
 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.GroupModel;
+import com.xt.js.gkaq.frame.model.GroupModelDto;
 
 public interface GroupModelMapper extends BaseMapper<GroupModel> {
+
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    List<GroupModelDto> selectAllByCond(GroupModel model);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/OrgModelMapper.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.OrgModelDto;
 
 public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
@@ -22,4 +23,6 @@ public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
      * @return
      */
     List<OrgModelDto> selectAllByCond(OrgModelDto model);
+
+    List<ComboBoxDto> selectByCombo();
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/RoleModelMapper.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.RoleModel;
 
 public interface RoleModelMapper extends BaseMapper<RoleModel> {
@@ -21,4 +22,6 @@ public interface RoleModelMapper extends BaseMapper<RoleModel> {
      * @return
      */
     List<RoleModel> selectAllByCond(RoleModel model);
+
+    List<ComboBoxDto> selectByCombo();
 }

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

@@ -0,0 +1,63 @@
+package com.xt.js.gkaq.frame.model;
+
+public class GroupButtonModel {
+    private String id;
+
+    private String groupId;
+
+    private String buttonId;
+
+    private String state;
+
+    private Object createTime;
+
+    private Object updateTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getButtonId() {
+        return buttonId;
+    }
+
+    public void setButtonId(String buttonId) {
+        this.buttonId = buttonId == null ? null : buttonId.trim();
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    public Object getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Object createTime) {
+        this.createTime = createTime;
+    }
+
+    public Object getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Object updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.xt.js.gkaq.frame.model;
+
+public class GroupMenuModel {
+    private String id;
+
+    private String groupId;
+
+    private String menuId;
+
+    private String state;
+
+    private Object createTime;
+
+    private Object updateTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId == null ? null : menuId.trim();
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    public Object getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Object createTime) {
+        this.createTime = createTime;
+    }
+
+    public Object getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Object updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.xt.js.gkaq.frame.model;
+
+public class GroupModelDto extends GroupModel {
+
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -8237166799254691955L;
+
+    private String orgCode;
+
+    private String roleCode;
+
+    private String orgName;
+
+    private String roleName;
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getRoleCode() {
+        return roleCode;
+    }
+
+    public void setRoleCode(String roleCode) {
+        this.roleCode = roleCode;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+}

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

@@ -0,0 +1,13 @@
+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.GroupButtonModel;
+
+public interface GroupButtonService extends BaseService<GroupButtonModel> {
+
+    public List<GroupButtonModel> findByGroupId(String groupId);
+    
+    public int deleteByGroupId(String groupId);
+}

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

@@ -0,0 +1,13 @@
+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.GroupMenuModel;
+
+public interface GroupMenuService extends BaseService<GroupMenuModel> {
+
+    public List<GroupMenuModel> findByGroupId(String groupId);
+    
+    public int deleteByGroupId(String groupId);
+}

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

@@ -1,8 +1,18 @@
 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.GroupModel;
+import com.xt.js.gkaq.frame.model.GroupModelDto;
 
 public interface GroupService extends BaseService<GroupModel> {
 
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    List<GroupModelDto> findAllByCond(GroupModel model);
 }

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

@@ -3,6 +3,7 @@ package com.xt.js.gkaq.frame.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.OrgModelDto;
 
 /**
@@ -22,4 +23,6 @@ public interface OrgService extends BaseUUIDModelService<OrgModelDto> {
      * @return
      */
     public List<OrgModelDto> findAllByCond(OrgModelDto model);
+
+    public List<ComboBoxDto> findByCombo();
 }

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

@@ -3,6 +3,7 @@ package com.xt.js.gkaq.frame.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.RoleModel;
 
 /**
@@ -27,4 +28,6 @@ public interface RoleService extends BaseUUIDModelService<RoleModel> {
      * @return
      */
     public List<RoleModel> findAllByCond(RoleModel model);
+
+    public List<ComboBoxDto> findByCombo();
 }

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

@@ -0,0 +1,51 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.IdGenerator;
+import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.frame.mappers.GroupButtonModelMapper;
+import com.xt.js.gkaq.frame.model.GroupButtonModel;
+import com.xt.js.gkaq.frame.service.GroupButtonService;
+
+@Service
+public class GroupButtonServiceImpl extends BaseServiceImpl<GroupButtonModel> implements GroupButtonService {
+    /** IDÖ÷¼üÉú³ÉÆ÷ */
+    private IdGenerator idGenerator = new UUIDGenerator();
+
+    @Autowired
+	private GroupButtonModelMapper mapper;
+
+	@Override
+	protected BaseMapper<GroupButtonModel> getMapper() {
+		return mapper;
+	}
+
+    @Transactional
+    @Override
+    public int add(GroupButtonModel record) {
+        record.setId(idGenerator.generateStringId());
+        Date now = new Date();
+        record.setCreateTime(now);
+        record.setUpdateTime(now);
+        record.setState(BaseUUIDModel.STATE_ADD);
+        return mapper.insert(record);
+    }
+
+    public List<GroupButtonModel> findByGroupId(String groupId) {
+        return mapper.selectByGroupId(groupId);
+    }
+
+    public int deleteByGroupId(String groupId) {
+        return mapper.deleteByGroupId(groupId);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.IdGenerator;
+import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.frame.mappers.GroupMenuModelMapper;
+import com.xt.js.gkaq.frame.model.GroupMenuModel;
+import com.xt.js.gkaq.frame.service.GroupMenuService;
+
+@Service
+public class GroupMenuServiceImpl extends BaseServiceImpl<GroupMenuModel> implements GroupMenuService {
+    /** IDÖ÷¼üÉú³ÉÆ÷ */
+    private IdGenerator idGenerator = new UUIDGenerator();
+
+    @Autowired
+	private GroupMenuModelMapper mapper;
+
+	@Override
+	protected BaseMapper<GroupMenuModel> getMapper() {
+		return mapper;
+	}
+
+    @Transactional
+    @Override
+    public int add(GroupMenuModel record) {
+        record.setId(idGenerator.generateStringId());
+        Date now = new Date();
+        record.setCreateTime(now);
+        record.setUpdateTime(now);
+        record.setState(BaseUUIDModel.STATE_ADD);
+        return mapper.insert(record);
+    }
+
+    public List<GroupMenuModel> findByGroupId(String groupId) {
+        return mapper.selectByGroupId(groupId);
+    }
+
+    public int deleteByGroupId(String groupId) {
+        return mapper.deleteByGroupId(groupId);
+    }
+
+}

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

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -7,6 +9,7 @@ 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.GroupModel;
+import com.xt.js.gkaq.frame.model.GroupModelDto;
 import com.xt.js.gkaq.frame.service.GroupService;
 
 @Service
@@ -18,4 +21,8 @@ public class GroupServiceImpl extends BaseUUIDModelServiceImpl<GroupModel> imple
     protected BaseMapper<GroupModel> getMapper() {
         return mapper;
     }
+
+    public List<GroupModelDto> findAllByCond(GroupModel model) {
+        return mapper.selectAllByCond(model);
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/OrgServiceImpl.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.OrgModelMapper;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.OrgModelDto;
 import com.xt.js.gkaq.frame.service.OrgService;
 
@@ -28,4 +29,8 @@ public class OrgServiceImpl extends BaseUUIDModelServiceImpl<OrgModelDto> implem
     public int deleteByPid(String pid) {
         return mapper.deleteByPid(pid);
     }
+
+    public List<ComboBoxDto> findByCombo() {
+        return mapper.selectByCombo();
+    }
 }

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

@@ -41,7 +41,6 @@ public class RoleButtonServiceImpl extends BaseServiceImpl<RoleButtonModel> impl
     }
 
     public int deleteByRoleId(String roleId) {
-        // TODO Auto-generated method stub
         return mapper.deleteByRoleId(roleId);
     }
 

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/RoleServiceImpl.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.RoleModelMapper;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.RoleModel;
 import com.xt.js.gkaq.frame.service.RoleService;
 
@@ -28,4 +29,8 @@ public class RoleServiceImpl extends BaseUUIDModelServiceImpl<RoleModel> impleme
     public List<RoleModel> findAllByCond(RoleModel model) {
         return mapper.selectAllByCond(model);
     }
+
+    public List<ComboBoxDto> findByCombo() {
+        return mapper.selectByCombo();
+    }
 }

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

@@ -0,0 +1,51 @@
+<?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.GroupButtonModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupButtonModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR" />
+    <result column="BUTTON_ID" property="buttonId" 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" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_GROUP_BUTTON
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupButtonModel" >
+    insert into AQ_BASIC_FRAME_GROUP_BUTTON (ID, GROUP_ID, BUTTON_ID, 
+      STATE, CREATE_TIME, UPDATE_TIME
+      )
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{buttonId,jdbcType=VARCHAR}, 
+      #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupButtonModel" >
+    update AQ_BASIC_FRAME_GROUP_BUTTON
+    set GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      BUTTON_ID = #{buttonId,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, GROUP_ID, BUTTON_ID, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_GROUP_BUTTON
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, GROUP_ID, BUTTON_ID, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_GROUP_BUTTON
+  </select>
+  <select id="selectByGroupId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, GROUP_ID, BUTTON_ID
+    from AQ_BASIC_FRAME_GROUP_BUTTON
+    where GROUP_ID = #{groupId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByGroupId" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_GROUP_BUTTON
+    where GROUP_ID = #{groupId,jdbcType=VARCHAR}
+  </delete>
+</mapper>

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

@@ -0,0 +1,51 @@
+<?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.GroupMenuModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupMenuModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR" />
+    <result column="MENU_ID" property="menuId" 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" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_GROUP_MENU
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupMenuModel" >
+    insert into AQ_BASIC_FRAME_GROUP_MENU (ID, GROUP_ID, MENU_ID, 
+      STATE, CREATE_TIME, UPDATE_TIME
+      )
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{menuId,jdbcType=VARCHAR}, 
+      #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupMenuModel" >
+    update AQ_BASIC_FRAME_GROUP_MENU
+    set GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      MENU_ID = #{menuId,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, GROUP_ID, MENU_ID, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_GROUP_MENU
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, GROUP_ID, MENU_ID, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_GROUP_MENU
+  </select>
+  <select id="selectByGroupId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, GROUP_ID, MENU_ID
+    from AQ_BASIC_FRAME_GROUP_MENU
+    where GROUP_ID = #{groupId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByGroupId" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_GROUP_MENU
+    where GROUP_ID = #{groupId,jdbcType=VARCHAR}
+  </delete>
+</mapper>

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

@@ -1,7 +1,7 @@
 <?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.GroupModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModelDto" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
     <result column="ORG_ID" property="org" jdbcType="VARCHAR" />
     <result column="ROLE_ID" property="role" jdbcType="VARCHAR" />
@@ -11,6 +11,10 @@
     <result column="STATE" property="state" jdbcType="CHAR" />
 	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
 	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
+    <result column="ORG_CODE" property="orgCode" jdbcType="VARCHAR" />
+    <result column="ROLE_CODE" property="roleCode" jdbcType="VARCHAR" />
+    <result column="ORG_NAME" property="orgName" jdbcType="VARCHAR" />
+    <result column="ROLE_NAME" property="roleName" jdbcType="VARCHAR" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_GROUP
@@ -45,4 +49,19 @@
     select ID, ORG_ID, ROLE_ID, REMARK, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_GROUP
   </select>
+  <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
+    select G.ID, G.ORG_ID, O.CODE ORG_CODE, O.NAME ORG_NAME, G.ROLE_ID, R.CODE ROLE_CODE, R.NAME ROLE_NAME, G.REMARK
+    from AQ_BASIC_FRAME_GROUP G
+    left join AQ_BASIC_FRAME_ORG O on G.ORG_ID = O.ID
+    left join AQ_BASIC_FRAME_ROLE R on G.ROLE_ID = R.ID
+    <where>
+	    <if test="org != null and org != ''">
+	        and G.ORG_ID = #{org,jdbcType=VARCHAR}
+	    </if>
+	    <if test="role != null and role != ''">
+	        and G.ROLE_ID like #{role,jdbcType=VARCHAR}
+	    </if>
+    </where>
+    order by O.CODE, R.CODE
+  </select>
 </mapper>

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

@@ -21,6 +21,10 @@
     <result column="PCODE" property="pcode" jdbcType="VARCHAR" />
     <result column="PNAME" property="pname" jdbcType="VARCHAR" />
   </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="VARCHAR" />
+    <result column="NAME" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
     where ID = #{id,jdbcType=VARCHAR}
@@ -90,4 +94,9 @@
     delete from AQ_BASIC_FRAME_ORG
     where PID = #{pid,jdbcType=VARCHAR}
   </delete>
+  <select id="selectByCombo" resultMap="ComboBoxMap" >
+    select ID, NAME, CODE
+    from AQ_BASIC_FRAME_ORG
+    order by PID, SORTNO
+  </select>
 </mapper>

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

@@ -13,6 +13,10 @@
 	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
 	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="VARCHAR" />
+    <result column="NAME" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ROLE
     where ID = #{id,jdbcType=VARCHAR}
@@ -69,4 +73,9 @@
     </where>
     order by SORTNO
   </select>
+  <select id="selectByCombo" resultMap="ComboBoxMap" >
+    select ID, NAME, CODE
+    from AQ_BASIC_FRAME_ROLE
+    order by SORTNO
+  </select>
 </mapper>

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

@@ -62,7 +62,6 @@
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
 		</table>
-		  -->
 		<table tableName="AQ_BASIC_FRAME_ROLE_MENU" domainObjectName="RoleMenuModel">
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
@@ -71,5 +70,14 @@
 			<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"/>  
+		</table>
+		<table tableName="AQ_BASIC_FRAME_GROUP_BUTTON" domainObjectName="GroupButtonModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
 	</context>
 </generatorConfiguration>