组织管理功能

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

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.CodeModel;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 
 public interface CodeModelMapper extends BaseMapper<CodeModel> {
 
@@ -21,4 +22,13 @@ public interface CodeModelMapper extends BaseMapper<CodeModel> {
      * @return
      */
     int deleteByPid(String pid);
+
+    /**
+     * 根据父类编码查询子类字典
+     * 
+     * @param pcode
+     * @return
+     */
+    List<ComboBoxDto> selectByPcode(String pcode);
+
 }

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

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

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

@@ -0,0 +1,20 @@
+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.XzqhModel;
+
+public interface XzqhModelMapper extends BaseMapper<XzqhModel> {
+
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    List<XzqhModel> selectAllByCond(XzqhModel model);
+
+    List<ComboBoxDto> selectByCombo(String code);
+}

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

@@ -0,0 +1,32 @@
+package com.xt.js.gkaq.frame.model;
+
+import java.io.Serializable;
+
+public class ComboBoxDto implements Serializable {
+
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -5602802433019387588L;
+
+    private String optVal;
+    
+    private String optName;
+
+    public String getOptVal() {
+        return optVal;
+    }
+
+    public void setOptVal(String optVal) {
+        this.optVal = optVal;
+    }
+
+    public String getOptName() {
+        return optName;
+    }
+
+    public void setOptName(String optName) {
+        this.optName = optName;
+    }
+
+}

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

@@ -0,0 +1,29 @@
+package com.xt.js.gkaq.frame.model;
+
+public class OrgModelDto extends OrgModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 582537769163228639L;
+
+    private String pcode;
+    
+    private String pname;
+
+    public String getPcode() {
+        return pcode;
+    }
+
+    public void setPcode(String pcode) {
+        this.pcode = pcode;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+    
+}

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

@@ -0,0 +1,41 @@
+package com.xt.js.gkaq.frame.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class XzqhModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 6585084512807768590L;
+
+    private String code;
+
+    private String name;
+
+    private Short xh;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Short getXh() {
+        return xh;
+    }
+
+    public void setXh(Short xh) {
+        this.xh = xh;
+    }
+
+}

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

@@ -4,13 +4,22 @@ import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.CodeModel;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 
 /**
  * 俚듕륩蛟쌈왯
  */
 public interface CodeService extends BaseUUIDModelService<CodeModel> {
 
-    public List<CodeModel> selectInitDict();
+    public List<CodeModel> initDict();
 
     public int deleteByPid(String pid);
+
+    /**
+     * 몽앴만잚긍쯤꿴璂綾잚俚듕
+     * 
+     * @param pcode
+     * @return
+     */
+    public List<ComboBoxDto> findByPcode(String pcode);
 }

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

@@ -10,7 +10,7 @@ import com.xt.js.gkaq.frame.model.MenuModel;
  */
 public interface MenuService extends BaseUUIDModelService<MenuModel> {
 
-    public List<MenuModel> selectInitMenu();
+    public List<MenuModel> initMenu();
 
     public int deleteByPid(String pid);
 }

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

@@ -0,0 +1,23 @@
+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.OrgModelDto;
+
+/**
+ * 组织服务接口
+ * 
+ * @author yuanxd
+ *
+ */
+public interface OrgService extends BaseUUIDModelService<OrgModelDto> {
+
+    /**
+     * 根据条件查询数据集合
+     * 
+     * @param model
+     * @return
+     */
+    public List<OrgModelDto> findAllByCond(OrgModelDto model);
+}

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

@@ -6,10 +6,7 @@ import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.ParamModel;
 
 /**
- * 参数角色服务接口
- * 
- * @author yuanxd
- *
+ * 参数服务接口
  */
 public interface ParamService extends BaseUUIDModelService<ParamModel> {
 
@@ -19,5 +16,5 @@ public interface ParamService extends BaseUUIDModelService<ParamModel> {
      * @param model
      * @return
      */
-    public List<ParamModel> selectAllByCond(ParamModel model);
+    public List<ParamModel> findAllByCond(ParamModel model);
 }

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

@@ -0,0 +1,23 @@
+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.XzqhModel;
+
+/**
+ * 行政区划服务接口
+ */
+public interface XzqhService extends BaseUUIDModelService<XzqhModel> {
+
+    /**
+     * 根据条件查询数据集合
+     * 
+     * @param model
+     * @return
+     */
+    public List<XzqhModel> findAllByCond(XzqhModel model);
+
+    public List<ComboBoxDto> findByCombo(String code);
+}

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

@@ -9,6 +9,7 @@ import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.CodeModelMapper;
 import com.xt.js.gkaq.frame.model.CodeModel;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.service.CodeService;
 
 @Service
@@ -21,7 +22,7 @@ public class CodeServiceImpl extends BaseUUIDModelServiceImpl<CodeModel> impleme
         return mapper;
     }
 
-    public List<CodeModel> selectInitDict() {
+    public List<CodeModel> initDict() {
         return mapper.selectInitDict();
     }
 
@@ -29,4 +30,8 @@ public class CodeServiceImpl extends BaseUUIDModelServiceImpl<CodeModel> impleme
         return mapper.deleteByPid(pid);
     }
 
+    public List<ComboBoxDto> findByPcode(String pcode) {
+        return mapper.selectByPcode(pcode);
+    }
+
 }

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

@@ -21,7 +21,7 @@ public class MenuServiceImpl extends BaseUUIDModelServiceImpl<MenuModel> impleme
         return mapper;
     }
 
-    public List<MenuModel> selectInitMenu() {
+    public List<MenuModel> initMenu() {
         return mapper.selectInitMenu();
     }
 

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

@@ -0,0 +1,27 @@
+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.OrgModelMapper;
+import com.xt.js.gkaq.frame.model.OrgModelDto;
+import com.xt.js.gkaq.frame.service.OrgService;
+
+@Service
+public class OrgServiceImpl extends BaseUUIDModelServiceImpl<OrgModelDto> implements OrgService {
+	@Autowired
+	private OrgModelMapper mapper;
+
+	@Override
+	protected BaseMapper<OrgModelDto> getMapper() {
+		return mapper;
+	}
+
+    public List<OrgModelDto> findAllByCond(OrgModelDto model) {
+        return mapper.selectAllByCond(model);
+    }
+}

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

@@ -21,7 +21,7 @@ public class ParamServiceImpl extends BaseUUIDModelServiceImpl<ParamModel> imple
 		return mapper;
 	}
 
-    public List<ParamModel> selectAllByCond(ParamModel model) {
+    public List<ParamModel> findAllByCond(ParamModel model) {
         return mapper.selectAllByCond(model);
     }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/XzqhServiceImpl.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.XzqhModelMapper;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.XzqhModel;
+import com.xt.js.gkaq.frame.service.XzqhService;
+
+@Service
+public class XzqhServiceImpl extends BaseUUIDModelServiceImpl<XzqhModel> implements XzqhService {
+	@Autowired
+	private XzqhModelMapper mapper;
+
+	@Override
+	protected BaseMapper<XzqhModel> getMapper() {
+		return mapper;
+	}
+
+    public List<XzqhModel> findAllByCond(XzqhModel model) {
+        return mapper.selectAllByCond(model);
+    }
+
+    public List<ComboBoxDto> findByCombo(String code) {
+        return mapper.selectByCombo(code);
+    }
+}

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

@@ -15,6 +15,10 @@
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="STATE" property="state" jdbcType="CHAR" />
   </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="VAL" property="optVal" jdbcType="VARCHAR" />
+    <result column="TEXT" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_CODE
     where ID = #{id,jdbcType=VARCHAR}
@@ -64,4 +68,9 @@
     delete from AQ_BASIC_FRAME_CODE
     where PID = #{pid,jdbcType=VARCHAR}
   </delete>
+  <select id="selectByPcode" resultMap="ComboBoxMap" parameterType="java.lang.String" >
+	select TEXT, VAL from AQ_BASIC_FRAME_CODE 
+	where pcode = #{pcode,jdbcType=VARCHAR}
+	order by SORTNO
+  </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/OrgModelMapper.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.OrgModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.OrgModel" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.OrgModelDto" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
     <result column="NAME" property="name" jdbcType="VARCHAR" />
     <result column="ORG_TYPE" property="orgType" jdbcType="VARCHAR" />
@@ -18,24 +18,26 @@
     <result column="LEVEL" property="level" jdbcType="VARCHAR" />
 	<result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
 	<result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
+    <result column="PCODE" property="pcode" jdbcType="VARCHAR" />
+    <result column="PNAME" property="pname" jdbcType="VARCHAR" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.OrgModelDto" >
     insert into AQ_BASIC_FRAME_ORG (ID, NAME, ORG_TYPE, 
       REMARK, PID, SORTNO, 
       CODE, SZD, SZD_NAME, 
       STATE, CREATE_TIME, UPDATE_TIME, 
-      XZQH, LEVEL,CREATE_USER,UPDATE_USER)
+      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},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
   </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModelDto" >
     update AQ_BASIC_FRAME_ORG
     set NAME = #{name,jdbcType=VARCHAR},
       ORG_TYPE = #{orgType,jdbcType=VARCHAR},
@@ -49,20 +51,36 @@
       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, CREATE_USER, UPDATE_USER
+    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, CREATE_USER, UPDATE_USER
+    UPDATE_TIME, XZQH, "LEVEL", CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ORG
   </select>
+  <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.OrgModelDto" >
+    select C.ID, C.CODE, C.NAME, P.ID PID, P.CODE PCODE, P.NAME PNAME, C.ORG_TYPE, C.SZD, C.SZD_NAME, C.XZQH, C."LEVEL", C.REMARK, C.SORTNO
+    from AQ_BASIC_FRAME_ORG C left join AQ_BASIC_FRAME_ORG P on C.PID = P.ID
+    <where>
+	    <if test="pcode != null and pcode != ''">
+	        P.CODE = #{pcode,jdbcType=VARCHAR}
+	    </if>
+	    <if test="code != null and code != ''">
+	        and C.CODE = #{code,jdbcType=VARCHAR}
+	    </if>
+	    <if test="name != null and name != ''">
+	        and C.NAME like #{name,jdbcType=VARCHAR}
+	    </if>
+    </where>
+    order by P.CODE, C.CODE, C.SORTNO
+  </select>
 </mapper>

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

@@ -0,0 +1,71 @@
+<?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.XzqhModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.XzqhModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="CODE" property="code" jdbcType="VARCHAR" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="XH" property="xh" jdbcType="DECIMAL" />
+    <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" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="CODE" property="optVal" jdbcType="VARCHAR" />
+    <result column="NAME" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_XZQHDM
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.XzqhModel" >
+    insert into AQ_BASIC_FRAME_XZQHDM (ID, CODE, NAME, 
+      XH, CREATE_TIME, UPDATE_TIME, 
+      STATE, CREATE_USER, UPDATE_USER
+      )
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{xh,jdbcType=DECIMAL}, #{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.XzqhModel" >
+    update AQ_BASIC_FRAME_XZQHDM
+    set CODE = #{code,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      XH = #{xh,jdbcType=DECIMAL},
+      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" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, CODE, NAME, XH, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    from AQ_BASIC_FRAME_XZQHDM
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, CODE, NAME, XH, CREATE_TIME, UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    from AQ_BASIC_FRAME_XZQHDM
+  </select>
+  <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.XzqhModel" >
+    select ID, CODE, NAME, XH
+    from AQ_BASIC_FRAME_XZQHDM
+    <where>
+	    <if test="code != null and code != ''">
+	        CODE like #{code,jdbcType=VARCHAR}
+	    </if>
+	    <if test="name != null and name != ''">
+	        and NAME like #{name,jdbcType=VARCHAR}
+	    </if>
+    </where>
+    order by XH
+  </select>
+  <select id="selectByCombo" resultMap="ComboBoxMap" parameterType="java.lang.String" >
+	select CODE, NAME from AQ_BASIC_FRAME_XZQHDM
+	order by XH
+  </select>
+</mapper>

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

@@ -54,10 +54,14 @@
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
 		</table>
-		  -->
 		<table tableName="AQ_BASIC_FRAME_CODE" domainObjectName="CodeModel">
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
 		</table>
+		  -->
+		<table tableName="AQ_BASIC_FRAME_XZQHDM" domainObjectName="XzqhModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
 	</context>
 </generatorConfiguration>