数据改回

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/constant/ContractConstant.java

@@ -17,9 +17,9 @@ public class ContractConstant {
 	/** 区域公司名称  */
 	public static final String REGION_COMPANY_NAME = "regionCompanyName";
 	/** 购砂单位 */
-	public static final String PURCHASE_SAND_UNIT = "purchaseSandCompany";
+	public static final String PURCHASE_SAND_UNIT = "purchaseSandUnit";
 	/** 购砂单位名称 */
-	public static final String PURCHASE_SAND_UNIT_NAME = "purchaseSandCompanyName";
+	public static final String PURCHASE_SAND_UNIT_NAME = "purchaseSandUnitName";
 	/** 合同名称 */
 	public static final String CONTRACT_NAME = "contractName";
 	/** 合同编号 */

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

@@ -29,11 +29,11 @@
  				<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
  				</annotation>
 			</attribute>
-			<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='purchaseSandCompany' columnName='purchase_sand_company_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
+			<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='purchaseSandUnit' columnName='purchase_sand_Unit_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
  				<annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation>
 				<annotation id='95a6dd6d-c676-4265-9c8b-d115c13b472f' attributeId='43768653-e259-4b0f-8c9d-8739f030675b' name='mappingType' value='many-to-one'></annotation>
 			</attribute>
-			<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='purchaseSandCompanyName' columnName='purchase_sand_company_name' title='购砂单位名称' type='string' default='' precision='' isArray='false'>
+			<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='purchaseSandUnitName' columnName='purchase_sand_Unit_name' title='购砂单位名称' type='string' default='' precision='' isArray='false'>
  				<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
  				</annotation>
 			</attribute>

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

@@ -42,11 +42,11 @@
 							<m:properties>
 								<m:property>
 									<m:key>precision</m:key>
-									<m:value>10</m:value>
+									<m:value>12</m:value>
 								</m:property>
 								<m:property>
 									<m:key>scale</m:key>
-									<m:value>2</m:value>
+									<m:value>4</m:value>
 								</m:property>
 							</m:properties>
 						</m:annotation>
@@ -65,7 +65,7 @@
 							<m:properties>
 								<m:property>
 									<m:key>precision</m:key>
-									<m:value>10</m:value>
+									<m:value>12</m:value>
 								</m:property>
 								<m:property>
 									<m:key>scale</m:key>
@@ -88,7 +88,7 @@
 							<m:properties>
 								<m:property>
 									<m:key>precision</m:key>
-									<m:value>10</m:value>
+									<m:value>12</m:value>
 								</m:property>
 								<m:property>
 									<m:key>scale</m:key>

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

@@ -73,7 +73,7 @@
 				<m:attribute>
 					<m:annotations/>
 					<m:id>c4154a1b-f727-48cf-9ef0-ad1bee512504</m:id>
-					<m:name>purchaseSandCompany</m:name>
+					<m:name>purchaseSandUnit</m:name>
 					<m:title>购砂单位</m:title>
 					<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
 					<m:description></m:description>
@@ -87,7 +87,7 @@
 						</m:annotation>
 					</m:annotations>
 					<m:id>cbb5b983-299b-4259-97d9-6470651bb18b</m:id>
-					<m:name>purchaseSandCompanyName</m:name>
+					<m:name>purchaseSandUnitName</m:name>
 					<m:title>购砂单位名称</m:title>
 					<m:type>string</m:type>
 					<m:description></m:description>

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

@@ -54,11 +54,11 @@
 		<property name="regionCompanyName" type="nstring" not-null="false">
 			<column name="region_company_name" length="50"></column>
 		</property>
-		<many-to-one name="purchaseSandCompany" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
-            <column name="purchase_sand_company_id"  not-null="false"/>
+		<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
+            <column name="purchase_sand_unit_id"  not-null="false"/>
         </many-to-one>
-		<property name="purchaseSandCompanyName" type="nstring" not-null="false">
-			<column name="purchase_sand_company_name" length="50"></column>
+		<property name="purchaseSandUnitName" type="nstring" not-null="false">
+			<column name="purchase_sand_unit_name" length="50"></column>
 		</property>
 		<property name="contractName" type="nstring" not-null="false">
 			<column name="contract_name" length="50"></column>