安全日志记录添加场站字段

backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/SafeLog.jmx

@@ -17,6 +17,7 @@
 	<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
 	<dependency>javax.persistence.Column</dependency>
 	<dependency>javax.persistence.Table</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.safe.datamodel.SafeLogAssociatedStaffDetail</dependency>
@@ -70,6 +71,32 @@
 				<m:attribute>
 					<m:annotations>
 						<m:annotation>
+							<m:type>javax.persistence.ManyToOne</m:type>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.JoinColumn</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>station_id</m:value>
+								</m:property>
+								<m:property>
+									<m:key>referencedColumnName</m:key>
+									<m:value>ID</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
+					<m:id>55d6b108-a847-47fe-8342-c8f2104fe512</m:id>
+					<m:name>station</m:name>
+					<m:title>所属场站</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
 							<m:type>javax.persistence.Column</m:type>
 							<m:properties>
 								<m:property>

backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/SafeLog.jmx

@@ -51,6 +51,26 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>station.id</m:name>
+					<m:title></m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>station.stationName</m:name>
+					<m:title></m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>id</m:name>
 					<m:title>id</m:title>
 					<m:type>uuid</m:type>

backend/xyst.dinas.safe/src/main/resources/config/SafeLog.hbm.xml

@@ -21,6 +21,9 @@
         <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="modifier_id"  not-null="false"/>
         </many-to-one>
+        <many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
+            <column name="station_id"  not-null="false"/>
+        </many-to-one>
         <property name="billState" type="nstring" not-null="false">
             <column name="bill_state" length="100"/>
         </property>