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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/gq/GqModel.as

@@ -97,7 +97,6 @@ package com.jtgh.yjpt.model.gq
 			gq.gqmc=editView.gqmc.text;
 //			gq.gqszsylx=editView.gqszsylx.selectedItem as CodeVo;
 			gq.gqszsylx=editView.gqszsylx.selectedVO as CodeVo;
-			gq.szsx=editView.szsx.selectedVO as CodeVo;
 			gq.gqmj=editView.gqmj.text;
 			gq.lymj=editView.lymj.text;
 			gq.syfw=editView.syfw.text;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/gq/Gq.mxml

@@ -4,7 +4,7 @@
 		  xmlns:cus="com.jtgh.yjpt.common.cus.*"
 		  xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%"
 		  xmlns:ui="com.jtgh.yjpt.common.component.ui.*" paddingTop="10" paddingLeft="10" paddingBottom="10" paddingRight="10">
-
+	
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.TypeBase;
@@ -15,7 +15,7 @@
 			public var thisModel:GqModel = new GqModel;
 			public var gq_id:Number;
 			public var functionId:Number;
-
+			
 			protected function numberCheck(event:KeyboardEvent):void
 			{
 				var input:QTextInput=event.currentTarget as QTextInput
@@ -24,24 +24,20 @@
 			}
 		]]>
 	</fx:Script>
-
+	
 	<s:VGroup id="form" width="100%">
 		<s:HGroup width="100%">
-			<cus:QLabel text="{resourceManager.getString('gq','gq.gqmc')}"  textAlign="right" width="128"/>
-			<cus:QTextInput id="gqmc" width="300" />
-			</s:HGroup>
-		<s:HGroup width="100%">
 			<cus:QLabel text="{resourceManager.getString('gq','gq.ssgk')}" textAlign="right" width="128"/>
 			<cus:QComboBox id="ssgk" width="300" comboxClass="SzdEditSelect" parentId="{Global.szd.id}" 
 						   selectedVO="{thisModel.gq.szd==null?Global.user.szd:thisModel.gq.szd}" />
 			<s:Spacer width="100%"/>
+			<cus:QLabel text="{resourceManager.getString('gq','gq.gqmc')}"  textAlign="right" width="128"/>
+			<cus:QTextInput id="gqmc" width="300" />
+		</s:HGroup>
+		<s:HGroup width="100%">
 			<cus:QLabel text="{resourceManager.getString('gq','gq.gqszsylx')}"  textAlign="right" width="128"/>
 			<cus:QComboBox id="gqszsylx" width="300" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SYLX}" 
 						   hasBlank="true"/>
-		</s:HGroup>
-		<s:HGroup width="100%">
-			<cus:QLabel text="{resourceManager.getString('gq','gq.szsx')}"  textAlign="right" width="128"/>
-			<cus:QComboBox id="szsx" width="300" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SXLX}"  hasBlank="true"/>
 			<s:Spacer width="100%"/>
 			<cus:QLabel text="{resourceManager.getString('gq','gq.gqmj')}" keyUp="numberCheck(event)" textAlign="right" width="128"/>
 			<cus:QTextInput id="gqmj" width="300"/>
@@ -92,7 +88,7 @@
 			<cus:QLabel text="{resourceManager.getString('gq','gq.bz')}" textAlign="right" width="128"/>
 			<cus:QTextArea id="bz" width="100%"/>
 		</s:HGroup>
-
+		
 		<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#00FFFF" visible="false" includeInLayout="false">
 			<s:layout>
 				<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
@@ -103,16 +99,16 @@
 		</s:BorderContainer>
 		<s:DataGrid id="mtDataGrid" width="100%" dataProvider="{thisModel.mtList}" editable="true"  visible="false" includeInLayout="false">
 			<s:columns><s:ArrayList>
-					<s:GridColumn dataField="mtmc" headerText="{resourceManager.getString('gq','mt.mtmc')}"/>
-					<s:GridColumn dataField="nhwtgnl" headerText="{resourceManager.getString('gq','mt.nhwtgnl')}"/>
-					<s:GridColumn dataField="mtsjqyss"  headerText="{resourceManager.getString('gq','mt.mtsjqyss')}"/>
-					<s:GridColumn dataField="gisid" headerText="{resourceManager.getString('gq','mt.gisid')}"/>
-					<ui:DataGridColumn headerText="{resourceManager.getString('common','btn.del')}" type="{TypeBase.MULTIBUTTON}" 
-									   editFunction="{thisModel.mtEdit}" delFunction="{thisModel.mtDel}"/>
-				</s:ArrayList></s:columns>
+						   <s:GridColumn dataField="mtmc" headerText="{resourceManager.getString('gq','mt.mtmc')}"/>
+						   <s:GridColumn dataField="nhwtgnl" headerText="{resourceManager.getString('gq','mt.nhwtgnl')}"/>
+						   <s:GridColumn dataField="mtsjqyss"  headerText="{resourceManager.getString('gq','mt.mtsjqyss')}"/>
+						   <s:GridColumn dataField="gisid" headerText="{resourceManager.getString('gq','mt.gisid')}"/>
+						   <ui:DataGridColumn headerText="{resourceManager.getString('common','btn.del')}" type="{TypeBase.MULTIBUTTON}" 
+											  editFunction="{thisModel.mtEdit}" delFunction="{thisModel.mtDel}"/>
+					   </s:ArrayList></s:columns>
 		</s:DataGrid>
 	</s:VGroup>
-
+	
 	<ui:ButtonBox width="100%" horizontalAlign="center">
 		<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="{thisModel.doSave(event)}" skinClass="skins.cus.ButtonSkin"/>
 		<s:Button id="close" label="{resourceManager.getString('common','btn.close')}" click="{thisModel.doPopupClose(event)}" skinClass="skins.cus.ButtonSkin"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/gkgq/GqVo.as

@@ -15,8 +15,6 @@ package com.jtgh.yjpt.vo.gkgq
 		public var  szd:            CodeVo;
 		public var  gqmc:           String;
 		public var  gqszsylx:       CodeVo;
-		//所在水系
-		public var szsx:					CodeVo;
 		public var  gqmj:           String;
 		public var  lymj:           String;
 		public var  syfw:           String;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/gkgq/GqEntity.java

@@ -26,8 +26,7 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 	// private CodeEntity szd;
 	private String gqmc;
 	private CodeEntity gqszsylx;
-	//所在水系
-	private CodeEntity szsx;
+
 	private String gqmj;
 	private String lymj;
 	private String syfw;
@@ -92,8 +91,6 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 		entity.gqmj = this.gqmj;
 		if (this.gqszsylx != null)
 			entity.gqszsylx = this.gqszsylx.clone();
-		if (this.szsx != null)
-			entity.szsx = this.szsx.clone();
 		entity.gqzraxcd = this.gqzraxcd;
 		return entity;
 	}
@@ -221,15 +218,4 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 		this.bz = bz;
 	}
 
-	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
-	@JoinColumn(name = "szsx")
-	@RemotingExclude
-	public CodeEntity getSzsx() {
-		return szsx;
-	}
-
-	public void setSzsx(CodeEntity szsx) {
-		this.szsx = szsx;
-	}
-
 }