Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

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

@@ -68,6 +68,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='备注'>
+        <name>memo</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='实际值'>
         <name>min</name>
         <type>string</type>

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

@@ -70,6 +70,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>memo</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>target</m:name>
 					<m:title>预警指标</m:title>
 					<m:type>string</m:type>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMining$SandMiningStationDetail.jmx

@@ -32,7 +32,7 @@
 						</m:annotation>
 					</m:annotations>
 					<m:id>23fc82e2-e7b6-49fc-96cc-bb947ba2cc99</m:id>
-					<m:name>sandMining</m:name>
+					<m:name>master</m:name>
 					<m:title>采砂许可证</m:title>
 					<m:type>com.xyst.dinas.production.datamodel.SandMining</m:type>
 					<m:description></m:description>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMining.jmx

@@ -15,6 +15,7 @@
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.SandMiningArea</dependency>
+	<dependency>com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail</dependency>
 	<content>
 		<m:class>
 			<m:parents>
@@ -148,8 +149,8 @@
 					</m:annotations>
 					<m:id>923fc243-b92b-45d5-8876-a8cad89b5ac5</m:id>
 					<m:name>stationDetails</m:name>
-					<m:title>包含场站</m:title>
-					<m:type>com.xyst.dinas.biz.datamodel.Station[]</m:type>
+					<m:title>包含场站子表</m:title>
+					<m:type>com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.production/src/main/resources/config/SandMining.hbm.xml

@@ -107,8 +107,8 @@
         </property>
 
         <bag name="stationDetails" lazy="true" fetch="select" inverse="true">
-            <key column="sand_mining_id" not-null="true" />
-            <one-to-many entity-name="com.xyst.dinas.project.datamodel.SandMining$SandMiningStationDetail" />
+            <key column="master_id" not-null="true" />
+            <one-to-many entity-name="com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail" />
         </bag>
         <property name="sandMiningRange" type="nstring" not-null="false">
             <column name="sand_mining_range" length="3000" >
@@ -142,13 +142,13 @@
         </property>
     </class>
 
-    <class entity-name="com.xyst.dinas.project.datamodel.SandMining$SandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_detail">
+    <class entity-name="com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_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>
-        <many-to-one name="sandMining" entity-name="com.xyst.dinas.production.datamodel.SandMining" fetch="select">
-            <column name="sand_mining_id" not-null="true"/>
+        <many-to-one name="master" entity-name="com.xyst.dinas.production.datamodel.SandMining" fetch="select">
+            <column name="master_id" not-null="true"/>
         </many-to-one>
         <many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
             <column name="station_id"  not-null="true"/>