合同数据模型添加字段，查询元数据添加字段

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk

@@ -107,10 +107,14 @@
 			<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='valid' columnName='valid' title='是否生效' type='boolean' default='' precision='' isArray='false'>
  				<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='1'></annotation>
 			</attribute>
+			<attribute id='f780b924-bf9a-4786-96f1-50e89c26a26c' name='attId' columnName='att_id' title='附件id' type='uuid' default='' precision='' isArray='false'>
+ 				<annotation id='8218f944-40c1-468c-85af-530c5188d3ff' attributeId='bfac3d55-b94c-49b9-af31-8a7216f6ceea' name='length' value='undefined'>
+ 				</annotation>
+			</attribute>
 			
 			
        		<childModel id='57fa34cf-59f3-4be6-98bb-3e87853471ee' attributeId='06a76145-09c6-4e83-b91e-66aec616b9ca' refParentAttributeId='233c82e2-e7b6-49fc-96cc-bb947ba2cc99' 
-       			name='ContractDetail' tableName='xyst_dinas_contract_detail' domainInherit='' title='合同子表' >
+       			name='contractDetail' tableName='xyst_dinas_contract_detail' domainInherit='' title='合同子表' >
        			
        			<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
        			<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='contractId' columnName='contract_id' title='合同表ID' type='uuid' default='' precision='' isArray='false'>

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/Contract.mk

@@ -50,6 +50,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='项目名称'>
+        <name>project.projectName</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       
       <field title='区域公司ID'>
         <name>regionCompany.id</name>
@@ -100,6 +109,11 @@
         <type>string</type>
         <description></description>
       </field>
+      <field title='审批状态'>
+	    <name>approveState</name>
+	    <type>string</type>
+        <description></description>
+	  </field>
       <field title='收货地址'>
         <name>addrReceive</name>
         <type>string</type>
@@ -170,6 +184,15 @@
         <description></description>
       </field> 
       
+      <field title='创建时间'>
+        <name>createTime</name>
+        <type>datetime</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='创建人'>
         <name>creator.name</name>
         <type>string</type>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract$ContractDetail.jmx → backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract$contractDetail.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>57fa34cf-59f3-4be6-98bb-3e87853471ee</id>
-	<name>com.xyst.dinas.contract.datamodel.Contract$ContractDetail</name>
+	<name>com.xyst.dinas.contract.datamodel.Contract$contractDetail</name>
 	<title>合同子表</title>
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx

@@ -14,8 +14,8 @@
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>bcp.type.constraint.Numeric</dependency>
-	<dependency>com.xyst.dinas.contract.datamodel.Contract$ContractDetail</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
+	<dependency>com.xyst.dinas.contract.datamodel.Contract$contractDetail</dependency>
 	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
 	<content>
 		<m:class>
@@ -375,15 +375,24 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
+					<m:annotations/>
+					<m:id>f780b924-bf9a-4786-96f1-50e89c26a26c</m:id>
+					<m:name>attId</m:name>
+					<m:title>附件id</m:title>
+					<m:type>uuid</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>
 						</m:annotation>
 					</m:annotations>
 					<m:id>06a76145-09c6-4e83-b91e-66aec616b9ca</m:id>
-					<m:name>ContractDetails</m:name>
+					<m:name>contractDetails</m:name>
 					<m:title>合同子表</m:title>
-					<m:type>com.xyst.dinas.contract.datamodel.Contract$ContractDetail[]</m:type>
+					<m:type>com.xyst.dinas.contract.datamodel.Contract$contractDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/Contract.jmx

@@ -60,6 +60,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>project.projectName</m:name>
+					<m:title>项目名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>regionCompany.id</m:name>
 					<m:title>区域公司ID</m:title>
 					<m:type>uuid</m:type>
@@ -130,6 +140,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>approveState</m:name>
+					<m:title>审批状态</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>addrReceive</m:name>
 					<m:title>收货地址</m:title>
 					<m:type>string</m:type>
@@ -260,6 +280,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>createTime</m:name>
+					<m:title>创建时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>creator.name</m:name>
 					<m:title>创建人</m:title>
 					<m:type>string</m:type>

backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml

@@ -3,11 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
 		http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
-		
 	<class entity-name="com.xyst.dinas.contract.datamodel.Contract" table="xyst_dinas_contract_master" optimistic-lock="version">
-	
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
-		
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="uuid2" />
         </id>
@@ -42,7 +39,6 @@
         <property name="approveState" type="integer" not-null="false">
             <column name="approve_state"></column>
         </property>
-        
         <property name="contractId" type="uuid-binary" not-null="false">
             <column name="contract_id" length="16"></column>
         </property>
@@ -76,8 +72,6 @@
 		<property name="contractState" type="nstring" not-null="false">
 			<column name="contract_state" length="50"></column>
 		</property>
-		
-		
 		<property name="addrReceive" type="nstring" not-null="false">
 			<column name="addr_receive" length="100"></column>
 		</property>
@@ -126,16 +120,16 @@
 		<property name="valid" type="boolean" not-null="false">
 			<column name="valid" length="1"></column>
 		</property>
-		
-		
-		
-
+		<property name="attId" type="uuid-binary" not-null="false" length="16">
+			<column name="att_id" not-null="false"></column>
+		</property>
+		<bag name="contractDetails" lazy="true" fetch="select" inverse="true">
+			<key column="master_id" not-null="true" />
+			<one-to-many entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" />
+		</bag>
 	</class>
-	
-	<class entity-name="com.xyst.dinas.contract.datamodel.Contract$ContractDetail" table="xyst_dinas_contract_detail">
-	
+	<class entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" table="xyst_dinas_contract_detail">
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
-		
         <id name="id" type="uuid-binary" column="id" length="16">
             <generator class="assigned" />
         </id>
@@ -157,7 +151,5 @@
         <property name="amount" type="big_decimal" not-null="false">
             <column name="amount" precision="10" scale="2"></column>
         </property>
-        
-        
 	</class>
 </hibernate-mapping>
\ No newline at end of file