项目备案加区域公司

backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/datamodel/ProjectFiled.mk

@@ -51,6 +51,12 @@
  				<annotation id='afb0f8ea-3837-4b13-ad4f-3ea90352a686' attributeId='52c8bbab-ba7f-4e39-8524-e20939465e68' name='length' value='3000'>
  				</annotation>
 			</attribute>
+			<attribute id='7de6369c-04b7-42d7-b144-077b5375489d' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.Organization' default='' precision='' isArray='false'>
+ 				<annotation id='223281db-bda4-4f4f-abc1-e23e41f65515' attributeId='e7d8ba30-d59b-4886-96fc-81c547b262c3' name='length' value='undefined'>
+ 				</annotation>
+				<annotation id='ba572b97-84e3-477c-af1f-e020d05607d3' attributeId='22812966-2834-4435-816e-0c81ea0ea0eb' name='mappingType' value='many-to-one'>
+ 				</annotation>
+			</attribute>
 			<childModel id='57fa34cf-59f3-4be6-98bb-3e87858871ee' attributeId='06a76145-09c6-4e88-b91e-66aec616b9ca' refParentAttributeId='23fc82e2-e7b6-49fc-96cc-bb947ba2cc99' name='ProjectFiledDinasDetail' tableName='xyst_dinas_project_filed_dinas_detail' domainInherit='' title='砂石明细表' >
  				<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
 				<attribute id='db24a0fd-1481-41e0-b2e7-c02793455f0a' name='dinasType' columnName='dinas_type' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>

backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/query/ProjectFiled.mk

@@ -50,6 +50,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='区域公司'>
+        <name>regionalCompany</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.Organization</name>
+        </ref>
+        <description></description>
+      </field>
       <field title='项目编号'>
         <name>projectNum</name>
         <type>string</type>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/datamodel/ProjectFiled.jmx

@@ -8,6 +8,7 @@
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>
 	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
 	<dependency>bcp.type.constraint.StringLength</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
@@ -143,6 +144,15 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
+					<m:annotations/>
+					<m:id>7de6369c-04b7-42d7-b144-077b5375489d</m:id>
+					<m:name>regionalCompany</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
 					<m:annotations>
 						<m:annotation>
 							<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/query/ProjectFiled.jmx

@@ -61,6 +61,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>regionalCompany</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>projectNum</m:name>
 					<m:title>项目编号</m:title>
 					<m:type>string</m:type>

backend/xyst.dinas.project/src/main/resources/config/ProjectFiled.hbm.xml

@@ -45,6 +45,9 @@
 		<many-to-one name="projectType" entity-name="com.xyst.dinas.project.dict.datamodel.ProjectType" fetch="select">
 			<column name="project_type" not-null="false"></column>
 		</many-to-one>
+		<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
+			<column name="regional_company" not-null="false"></column>
+		</many-to-one>
 		<property name="projectNum" type="nstring" not-null="false">
 			<column name="project_num" length="100"></column>
 		</property>