区域公司加部门

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/Organization.mk

@@ -37,6 +37,12 @@
  				<annotation id='27df6ead-3e3a-49b1-aa7c-12d9da85d731' attributeId='52e44d71-7372-4cda-b5b2-481172210181' name='length' value='500'>
  				</annotation>
 			</attribute>
+			<attribute id='8a9c2549-d7fd-4874-970f-a38c7eaf4955' name='department' columnName='department' title='部门' type='com.beecode.bap.department.datamodel.Department' default='' precision='' isArray='false'>
+ 				<annotation id='31b269b5-aa63-440d-8ca0-6e9a8d54e5d3' attributeId='b6231426-0fb5-47c3-a7ce-75408c4135b0' name='mappingType' value='many-to-one'>
+ 				</annotation>
+				<annotation id='e5e8f543-dab6-40da-95b5-c2baa57c77ba' attributeId='836d59a8-aab9-413b-88b2-7d533168b02a' name='length' value='undefined'>
+ 				</annotation>
+			</attribute>
 			<hibernate>/xyst.dinas.biz/src/main/resources/config/Organization.hbm.xml</hibernate>
 		</dataModel>
 	</content>

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/query/Organization.mk

@@ -140,6 +140,24 @@
         </ref>
         <description></description>
       </field>
+      <field title='所属部门id'>
+        <name>department.id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name>com.beecode.bap.department.datamodel.Department</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='所属部门名称'>
+        <name>department.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name>com.beecode.bap.department.datamodel.Department</name>
+        </ref>
+        <description></description>
+      </field>
     </customQuery>
   </content>
 </model>
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>a2cc3d5e-7dc3-4cb2-946c-705e4ff89aef</id>
+	<id>e88766b0-c5c0-4fb5-bae6-ed46df030630</id>
 	<name>com.xyst.dinas.biz.bill.Organization$sequence</name>
 	<title>组织机构$sequence</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>5989a00c-f64e-4086-9415-b79d1b2640ba</id>
+	<id>b368eed4-6214-45a1-8e8d-6051d38baa90</id>
 	<name>com.xyst.dinas.biz.bill.Organization$serial</name>
 	<title>组织机构$serial</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>42a96c63-e3ab-4340-8f63-411aa04f0986</id>
+	<id>d02a3019-ee62-4861-8819-93e50e78b8fa</id>
 	<name>com.xyst.dinas.biz.bill.Organization</name>
 	<title>组织机构</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Organization.jmx

@@ -10,6 +10,7 @@
 	<dependency>bcp.type.constraint.StringLength</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
+	<dependency>com.beecode.bap.department.datamodel.Department</dependency>
 	<content>
 		<m:class>
 			<m:parents>
@@ -101,6 +102,15 @@
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>
+				<m:attribute>
+					<m:annotations/>
+					<m:id>8a9c2549-d7fd-4874-970f-a38c7eaf4955</m:id>
+					<m:name>department</m:name>
+					<m:title>部门</m:title>
+					<m:type>com.beecode.bap.department.datamodel.Department</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
 			</m:attributes>
 		</m:class>
 	</content>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/Organization.jmx

@@ -160,6 +160,26 @@
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
+				<m:field>
+					<m:name>department.id</m:name>
+					<m:title>所属部门id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.beecode.bap.department.datamodel.Department</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>department.name</m:name>
+					<m:title>所属部门名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.beecode.bap.department.datamodel.Department</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
 			</m:fields>
 		</m:query>
 	</content>

backend/xyst.dinas.biz/src/main/resources/config/Organization.hbm.xml

@@ -54,6 +54,9 @@
 		<property name="address" type="nstring" not-null="false">
 			<column name="address" length="100"></column>
 		</property>
+		<many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
+			<column name="department"  not-null="false"/>
+		</many-to-one>
 		<property name="description" type="nstring" not-null="false">
 			<column name="description" length="500"></column>
 		</property>