组织管理功能

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

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

@@ -2,6 +2,8 @@ package com.xt.js.gkaq.frame.mappers;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.OrgModel;
@@ -28,4 +30,6 @@ public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
     List<ComboBoxDto> selectByCombo();
 
     List<OrgModel> selectOrgTree();
+
+    List<OrgModel> selectOrgPidTree(@Param(value="pid") String pid);
 }

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

@@ -27,5 +27,5 @@ public interface OrgService extends BaseUUIDModelService<OrgModelDto> {
 
     public List<ComboBoxDto> findByCombo();
 
-    public List<OrgModel> initOrgTree();
+    public List<OrgModel> initOrgTree(String pid, boolean allFlag);
 }

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

@@ -35,7 +35,10 @@ public class OrgServiceImpl extends BaseUUIDModelServiceImpl<OrgModelDto> implem
         return mapper.selectByCombo();
     }
 
-    public List<OrgModel> initOrgTree() {
-        return mapper.selectOrgTree();
+    public List<OrgModel> initOrgTree(String pid, boolean allFlag) {
+        if (!allFlag) {
+            return mapper.selectOrgTree();
+        }
+        return mapper.selectOrgPidTree(pid);
     }
 }

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

@@ -85,10 +85,12 @@
     order by C.PCODE desc, C.SORTNO
   </select>
   <select id="selectDictTree" resultMap="BaseResultMap" >
+    <bind name="LEAF_NO" value="@com.xt.js.gkaq.common.Constants@LEAF_NO"/>
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
     select ID, PID, TEXT, CODE, LEAF, SORTNO
     from AQ_BASIC_FRAME_CODE
     where STATE != #{STATE_DEL}
+    and LEAF = #{LEAF_NO}
     order by PCODE desc, SORTNO
   </select>
   <delete id="deleteByPid" parameterType="java.lang.String" >

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

@@ -140,6 +140,6 @@
 	    select MENU_ID from AQ_BASIC_FRAME_ROLE_MENU where ROLE_ID = #{role,jdbcType=VARCHAR} and STATE != #{STATE_DEL}
 	)
 	and STATE != #{STATE_DEL}
-   	order by PID, SORTNO
+   	order by PID desc, SORTNO
   </select>
 </mapper>

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

@@ -71,11 +71,23 @@
     UPDATE_TIME, XZQH, "LEVEL", CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ORG
   </select>
-  <select id="selectOrgTree" resultMap="BaseResultMap" >
+  <select id="selectOrgTree" resultMap="BaseResultMap">
+  	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
+  	<bind name="ORG_TYPE_9" value="@com.xt.js.gkaq.common.Constants@ORG_TYPE_9"/>
+    select ID, PID, NAME, CODE, ORG_TYPE, SORTNO, SZD, SZD_NAME, XZQH
+    from AQ_BASIC_FRAME_ORG
+    where STATE != #{STATE_DEL}
+    and ORG_TYPE != #{ORG_TYPE_9}
+    order by PID desc, SORTNO
+  </select>
+  <select id="selectOrgPidTree" resultMap="BaseResultMap" parameterType="java.lang.String" >
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
     select ID, PID, NAME, CODE, ORG_TYPE, SORTNO
     from AQ_BASIC_FRAME_ORG
     where STATE != #{STATE_DEL}
+    <if test="pid != null and pid != ''">
+        start with PID = #{pid,jdbcType=VARCHAR} connect by prior ID = PID
+    </if>
     order by PID desc, SORTNO
   </select>
   <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.OrgModelDto" >

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

@@ -9,7 +9,9 @@
 		<result column="ORGID" jdbcType="VARCHAR" property="orgid" />
 		<result column="SEX" jdbcType="CHAR" property="sex" />
 		<result column="PHONE" jdbcType="VARCHAR" property="phone" />
-		<result column="EMAIL" jdbcType="VARCHAR" property="email" />
+		<result column="EMAIL" jdbcType="VARCHAR" property="email" />
+		<result column="RYLX" jdbcType="VARCHAR" property="rylx" />
+		<result column="SXSJ" jdbcType="TIMESTAMP" property="sxsj" />
 		<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
 		<result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
 		<result column="STATE" jdbcType="CHAR" property="state" />
@@ -50,7 +52,7 @@
 	</update>
 	<select id="selectByPrimaryKey" parameterType="java.lang.String"
 		resultMap="BaseResultMap">
-		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, RYLX, SXSJ,
 		CREATE_TIME,UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER
 		from AQ_BASIC_FRAME_USER
 		where ID = #{id,jdbcType=VARCHAR}
@@ -58,7 +60,7 @@
 	<select id="selectByLoginName" parameterType="java.lang.String"
 		resultMap="BaseResultMap">
 		<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
-		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL,
+		select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, RYLX, SXSJ,
 		CREATE_TIME,UPDATE_TIME, STATE,CREATE_USER,UPDATE_USER
 		from AQ_BASIC_FRAME_USER
 		where LOGIN_NAME = #{loginName,jdbcType=VARCHAR} and STATE != #{STATE_DEL}