BUG对应

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

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/GroupModelMapper.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.GroupModel;
@@ -17,7 +19,7 @@ public interface GroupModelMapper extends BaseMapper<GroupModel> {
      */
     List<GroupModelDto> selectAllByCond(GroupModel model);
 
-    List<ComboBoxDto> selectByCombo();
+    List<ComboBoxDto> selectByCombo(@Param(value="orgid") String orgid);
 
     GroupModelDto selectByUser(String userId);
 }

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

@@ -27,7 +27,7 @@ public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
      */
     List<OrgModelDto> selectAllByCond(OrgModelDto model);
 
-    List<ComboBoxDto> selectByCombo();
+    List<ComboBoxDto> selectByCombo(@Param(value="pid") String pid);
 
     List<OrgModel> selectOrgTree();
 

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

@@ -17,7 +17,7 @@ public interface GroupService extends BaseUUIDModelService<GroupModel> {
      */
     public List<GroupModelDto> findAllByCond(GroupModel model);
 
-    public List<ComboBoxDto> findByCombo();
+    public List<ComboBoxDto> findByCombo(String orgid);
 
     public GroupModelDto selectByUser(String userId);
 }

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

@@ -25,7 +25,7 @@ public interface OrgService extends BaseUUIDModelService<OrgModelDto> {
      */
     public List<OrgModelDto> findAllByCond(OrgModelDto model);
 
-    public List<ComboBoxDto> findByCombo();
+    public List<ComboBoxDto> findByCombo(String pid);
 
     public List<OrgModel> initOrgTree(String pid, boolean allFlag);
 }

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

@@ -27,8 +27,8 @@ public class GroupServiceImpl extends BaseUUIDModelServiceImpl<GroupModel> imple
         return mapper.selectAllByCond(model);
     }
 
-    public List<ComboBoxDto> findByCombo() {
-        return mapper.selectByCombo();
+    public List<ComboBoxDto> findByCombo(String orgid) {
+        return mapper.selectByCombo(orgid);
     }
 
     public GroupModelDto selectByUser(String userId) {

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

@@ -2,6 +2,7 @@ package com.xt.js.gkaq.frame.service.impl;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,8 +32,8 @@ public class OrgServiceImpl extends BaseUUIDModelServiceImpl<OrgModelDto> implem
         return mapper.deleteByPid(pid);
     }
 
-    public List<ComboBoxDto> findByCombo() {
-        return mapper.selectByCombo();
+    public List<ComboBoxDto> findByCombo(String pid) {
+        return mapper.selectByCombo(pid);
     }
 
     public List<OrgModel> initOrgTree(String pid, boolean allFlag) {

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

@@ -70,12 +70,21 @@
     </where>
     order by O.CODE, R.CODE
   </select>
-  <select id="selectByCombo" resultMap="ComboBoxMap" >
+  <select id="selectByCombo" resultMap="ComboBoxMap" parameterType="java.lang.String">
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
-    select ID, REMARK
-    from AQ_BASIC_FRAME_GROUP
-    where STATE != #{STATE_DEL}
-    order by ORG_ID
+    select G.ID, G.REMARK || '[' || O.NAME || ']' REMARK
+    from AQ_BASIC_FRAME_GROUP G inner join 
+   	(
+   	select ID, substr(sys_connect_by_path(NAME, '>'), 2) NAME
+   	from AQ_BASIC_FRAME_ORG where STATE != #{STATE_DEL}
+    <if test="orgid == null or orgid == ''">
+    	start with PID is null connect by prior ID = PID
+    </if>
+    <if test="orgid != null and orgid != ''">
+    	start with ID = #{orgid,jdbcType=VARCHAR} connect by prior ID = PID
+    </if>
+   	) O on G.ORG_ID = O.ID
+    where G.STATE != #{STATE_DEL}
   </select>
   <select id="selectByUser" resultMap="BaseResultMap" parameterType="java.lang.String" >
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>

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

@@ -85,10 +85,12 @@
     select ID, PID, NAME, CODE, ORG_TYPE, SORTNO
     from AQ_BASIC_FRAME_ORG
     where STATE != #{STATE_DEL}
+    <if test="pid == null or pid == ''">
+    	start with PID is null connect by prior ID = PID
+    </if>
     <if test="pid != null and pid != ''">
-        start with PID = #{pid,jdbcType=VARCHAR} connect by prior ID = PID
+        start with ID = #{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" >
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
@@ -118,11 +120,18 @@
     delete from AQ_BASIC_FRAME_ORG
     where PID = #{pid,jdbcType=VARCHAR}
   </delete>
-  <select id="selectByCombo" resultMap="ComboBoxMap" >
+  <select id="selectByCombo" resultMap="ComboBoxMap" parameterType="java.lang.String">
   	<bind name="STATE_DEL" value="@com.xt.js.gkaq.common.BaseUUIDModel@STATE_DELETE"/>
-    select ID, NAME, CODE
+  	<bind name="ORG_TYPE_1" value="@com.xt.js.gkaq.common.Constants@ORG_TYPE_1"/>
+    select ID, substr(sys_connect_by_path(NAME,'>'),2) NAME, CODE
     from AQ_BASIC_FRAME_ORG
     where STATE != #{STATE_DEL}
-    order by PID desc, SORTNO
+    and ORG_TYPE != #{ORG_TYPE_1}
+    <if test="pid == null or pid == ''">
+    	start with PID is null connect by prior ID = PID
+    </if>
+    <if test="pid != null and pid != ''">
+    	start with ID = #{pid,jdbcType=VARCHAR} connect by prior ID = PID
+    </if>
   </select>
 </mapper>

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

@@ -25,12 +25,12 @@
 	<insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserModel">
 		insert into AQ_BASIC_FRAME_USER (ID, REAL_NAME, LOGIN_NAME,
 		LOGIN_PASSWORD, ORGID, SEX,
-		PHONE, EMAIL, CREATE_TIME,
+		PHONE, EMAIL, RYLX, SXSJ, CREATE_TIME,
 		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},
+		#{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{rylx,jdbcType=VARCHAR}, #{sxsj,jdbcType=TIMESTAMP},
 		#{createTime,jdbcType=TIMESTAMP},
 		#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR},#{createUser,jdbcType=VARCHAR},#{updateUser,jdbcType=VARCHAR})
 	</insert>
@@ -42,7 +42,9 @@
 		ORGID = #{orgid,jdbcType=VARCHAR},
 		SEX = #{sex,jdbcType=CHAR},
 		PHONE = #{phone,jdbcType=VARCHAR},
-		EMAIL = #{email,jdbcType=VARCHAR},
+		EMAIL = #{email,jdbcType=VARCHAR},
+		RYLX = #{rylx,jdbcType=VARCHAR},
+		SXSJ = #{sxsj,jdbcType=TIMESTAMP},
 		CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
 		UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
 		STATE = #{state,jdbcType=CHAR},
@@ -66,7 +68,7 @@
 		where LOGIN_NAME = #{loginName,jdbcType=VARCHAR} and STATE != #{STATE_DEL}
 	</select>
 	<select id="selectAll" 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
 	</select>
@@ -106,7 +108,7 @@
 	</select>
   	<select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.UserModel" >
 		<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
 		from AQ_BASIC_FRAME_USER
     	<where>
 			STATE != #{STATE_DEL}
@@ -117,7 +119,9 @@
 		        and LOGIN_NAME like #{loginName,jdbcType=VARCHAR}
 		    </if>
 		    <if test="orgid != null and orgid != ''">
-		        and ORGID = #{orgid,jdbcType=VARCHAR}
+		        and ORGID in (
+		        	select ID from AQ_BASIC_FRAME_ORG
+					start with ID = #{orgid,jdbcType=VARCHAR} connect by prior ID = PID) 
 		    </if>
     	</where>
     	order by CREATE_TIME desc