调整退费字段;

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/config/FinanceConfiguration.java

@@ -2,7 +2,7 @@ package com.xyst.dinas.finance.config;
 
 import org.springframework.context.annotation.Bean;
 
-import com.xyst.dinas.finance.processor.RefundApplyProcessor;
+import com.xyst.dinas.finance.processor.FinanceRefundProcessor;
 import com.xyst.dinas.finance.web.RefundController;
 
 public class FinanceConfiguration {
@@ -12,9 +12,9 @@ public class FinanceConfiguration {
 	public RefundController refundController() {
 		return new RefundController();
 	}
-	@Bean("com.xyst.dinas.finance.processor.RefundApplyProcessor")
-	public RefundApplyProcessor refundApplyProcessor() {
-		return new RefundApplyProcessor();
+	@Bean("com.xyst.dinas.finance.processor.FinanceRefundProcessor")
+	public FinanceRefundProcessor rinanceRefundProcessor() {
+		return new FinanceRefundProcessor();
 	}
 	
 	

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/processor/RefundApplyProcessor.java → backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/processor/FinanceRefundProcessor.java

@@ -20,7 +20,7 @@ import com.xyst.dinas.finance.enumeration.RefundStatusEnum;
  * @author Jackpot
  * @date 2021年4月20日
  */
-public class RefundApplyProcessor implements DataProcessor {
+public class FinanceRefundProcessor implements DataProcessor {
 
 	@Autowired
 	private DinasOrganizationService orgService;

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/datamodel/FinanceRefund.mk

@@ -17,6 +17,10 @@
  				<annotation id='ffa11f65-fcb2-429d-a590-40402fb8fde1' attributeId='9a1656c2-7a72-433b-ab6b-6fd19bf5af26' name='length' value='undefined'></annotation>
 				<annotation id='bf5d8736-9d14-40b8-bd2f-70899ee1491b' attributeId='e5516bce-9abf-46bf-a9a1-19694076464d' name='mappingType' value='many-to-one'></annotation>
 			</attribute>
+			<attribute id='1cbe2d59-e855-4a28-90eb-7ce85c28a525' name='purchaseSandCompany' columnName='purchase_sand_company' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
+ 				<annotation id='ffa11f65-fcb2-429d-a590-40402fb8fde1' attributeId='9a1656c2-7a72-433b-ab6b-6fd19bf5af26' name='length' value='undefined'></annotation>
+				<annotation id='bf5d8736-9d14-40b8-bd2f-70899ee1491b' attributeId='e5516bce-9abf-46bf-a9a1-19694076464d' name='mappingType' value='many-to-one'></annotation>
+			</attribute>
 			<attribute id='ba52ab30-c94b-4ade-8179-4ab47c16323c' name='contract' columnName='contract' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
  				<annotation id='0576ede6-b27b-4e6c-9bdb-f41bb8acd8d6' attributeId='0205a417-2cf6-4eec-84d1-1a9eecd1efd8' name='length' value='undefined'></annotation>
 				<annotation id='ada2d620-105b-47b4-88e2-ca1a20f77124' attributeId='ed744460-9e80-43fb-a1b1-541039f01dbd' name='mappingType' value='many-to-one'></annotation>

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RefundApply.mk → backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/FinanceRefund.mk

@@ -2,15 +2,15 @@
   <header>
     <type>inz.query.Query</type>
     <package>com.xyst.dinas.finance.query</package>
-    <name>RefundApply</name>
-    <title>退款申请</title>
+    <name>FinanceRefund</name>
+    <title>财务退款</title>
     <tags></tags>
     <description></description>
   </header>
   <content>
     <customQuery id='451f4875-82d2-486b-b624-345692e93b28'>
       <kclass>com.xyst.dinas.finance.datamodel.FinanceRefund</kclass>
-      <dataProcessor>com.xyst.dinas.finance.processor.RefundApplyProcessor</dataProcessor>
+      <dataProcessor>com.xyst.dinas.finance.processor.FinanceRefundProcessor</dataProcessor>
       <authorityItem></authorityItem>
       <innerScene title='全部'>
         <id>c775c023-9960-4039-9e9c-d3ff544308b5</id>
@@ -48,6 +48,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='购砂单位'>
+        <name>purchaseSandCompany.id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
+        </ref>
+        <description></description>
+      </field>
 
       <field title='退款状态'>
         <name>refundState</name>
@@ -133,6 +142,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='实际退费金额'>
+        <name>actualRefundAmount</name>
+        <type>float</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       
       
       <field title='创建时间'>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/datamodel/FinanceRefund.jmx

@@ -77,6 +77,32 @@
 							<m:properties>
 								<m:property>
 									<m:key>name</m:key>
+									<m:value>purchase_sand_company</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>1cbe2d59-e853-4a28-90eb-7ce85c28a525</m:id>
+					<m:name>purchaseSandCompany</m:name>
+					<m:title>购砂单位</m:title>
+					<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<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>contract</m:value>
 								</m:property>
 								<m:property>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/RefundApply.jmx → backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/FinanceRefund.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
 	<specification>1.0</specification>
 	<id>451f4875-82d2-486b-b624-345692e93b28</id>
-	<name>com.xyst.dinas.finance.query.RefundApply</name>
+	<name>com.xyst.dinas.finance.query.FinanceRefund</name>
 	<title>退款申请</title>
 	<define>inz.query.Query</define>
 	<define-version>1.0</define-version>
@@ -10,7 +10,7 @@
 	<content>
 		<m:query>
 			<m:type>com.xyst.dinas.finance.datamodel.FinanceRefund</m:type>
-			<m:dataProcessor>com.xyst.dinas.finance.processor.RefundApplyProcessor</m:dataProcessor>
+			<m:dataProcessor>com.xyst.dinas.finance.processor.FinanceRefundProcessor</m:dataProcessor>
 			<m:authorityItem></m:authorityItem>
 			<m:innerScenes>
 				<m:innerScene>

backend/xyst.dinas.finance/src/main/resources/config/FinanceRefund.hbm.xml

@@ -40,10 +40,12 @@
 			<column name="approve_state"></column>
 		</property>
 		
-		
 		<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
 			<column name="regional_company" not-null="false"></column>
 		</many-to-one>
+		<many-to-one name="purchaseSandCompany" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
+			<column name="purchase_sand_company" not-null="false"></column>
+		</many-to-one>
 		<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
 			<column name="contract" not-null="false"></column>
 		</many-to-one>
@@ -81,7 +83,6 @@
 			<column name="apply_time"></column>
 		</property>
 
-
 		<many-to-one name="acceptor" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
 			<column name="acceptor" not-null="false"></column>
 		</many-to-one>