财务相关查询字段变更

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ArtificialRecharge.mk

@@ -58,7 +58,7 @@
         <description></description>
       </field>
       <field title='购砂单位'>
-        <name>purchaseSandCompany.id</name>
+        <name>purchaseSandUnit.id</name>
         <type>uuid</type>
         <ref>
           <type></type>
@@ -67,7 +67,7 @@
         <description></description>
       </field>
       <field title='购砂单位name'>
-        <name>purchaseSandCompany.name</name>
+        <name>purchaseSandUnit.name</name>
         <type>string</type>
         <ref>
           <type></type>
@@ -85,11 +85,11 @@
         <description></description>
       </field>
       <field title='项目名称'>
-        <name>projectName</name>
+        <name>project.name</name>
         <type>string</type>
         <ref>
           <type></type>
-          <name></name>
+          <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
         </ref>
         <description></description>
       </field>

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ExpenseAdjust.mk

@@ -58,7 +58,7 @@
         <description></description>
       </field>
       <field title='购砂单位'>
-        <name>purchaseSandCompany.id</name>
+        <name>purchaseSandUnit.id</name>
         <type>uuid</type>
         <ref>
           <type></type>
@@ -67,7 +67,7 @@
         <description></description>
       </field>
       <field title='购砂单位name'>
-        <name>purchaseSandCompany.name</name>
+        <name>purchaseSandUnit.name</name>
         <type>string</type>
         <ref>
           <type></type>
@@ -85,11 +85,11 @@
         <description></description>
       </field>
       <field title='项目名称'>
-        <name>projectName</name>
+        <name>project.name</name>
         <type>string</type>
         <ref>
           <type></type>
-          <name></name>
+          <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
         </ref>
         <description></description>
       </field>

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RankRechargeDetail.mk

@@ -58,7 +58,7 @@
         <description></description>
       </field>
       <field title='购砂单位'>
-        <name>purchaseSandCompany.id</name>
+        <name>purchaseSandUnit.id</name>
         <type>uuid</type>
         <ref>
           <type></type>
@@ -67,7 +67,7 @@
         <description></description>
       </field>
       <field title='购砂单位name'>
-        <name>purchaseSandCompany.name</name>
+        <name>purchaseSandUnit.name</name>
         <type>string</type>
         <ref>
           <type></type>
@@ -85,11 +85,11 @@
         <description></description>
       </field>
       <field title='项目名称'>
-        <name>projectName</name>
+        <name>project.name</name>
         <type>string</type>
         <ref>
           <type></type>
-          <name></name>
+          <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
         </ref>
         <description></description>
       </field>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ArtificialRecharge.jmx

@@ -67,7 +67,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.id</m:name>
+					<m:name>purchaseSandUnit.id</m:name>
 					<m:title>购砂单位</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
@@ -77,7 +77,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.name</m:name>
+					<m:name>purchaseSandUnit.name</m:name>
 					<m:title>购砂单位name</m:title>
 					<m:type>string</m:type>
 					<m:ref>
@@ -97,11 +97,11 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>projectName</m:name>
+					<m:name>project.name</m:name>
 					<m:title>项目名称</m:title>
 					<m:type>string</m:type>
 					<m:ref>
-						<m:name></m:name>
+						<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
 						<m:type></m:type>
 					</m:ref>
 					<m:desc></m:desc>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/BankRechargeDetail.jmx

@@ -67,7 +67,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.id</m:name>
+					<m:name>purchaseSandUnit.id</m:name>
 					<m:title>购砂单位</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
@@ -77,7 +77,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.name</m:name>
+					<m:name>purchaseSandUnit.name</m:name>
 					<m:title>购砂单位name</m:title>
 					<m:type>string</m:type>
 					<m:ref>
@@ -97,11 +97,11 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>projectName</m:name>
+					<m:name>project.name</m:name>
 					<m:title>项目名称</m:title>
 					<m:type>string</m:type>
 					<m:ref>
-						<m:name></m:name>
+						<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
 						<m:type></m:type>
 					</m:ref>
 					<m:desc></m:desc>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ExpenseAdjust.jmx

@@ -67,7 +67,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.id</m:name>
+					<m:name>purchaseSandUnit.id</m:name>
 					<m:title>购砂单位</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
@@ -77,7 +77,7 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>purchaseSandCompany.name</m:name>
+					<m:name>purchaseSandUnit.name</m:name>
 					<m:title>购砂单位name</m:title>
 					<m:type>string</m:type>
 					<m:ref>
@@ -97,11 +97,11 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>projectName</m:name>
+					<m:name>project.name</m:name>
 					<m:title>项目名称</m:title>
 					<m:type>string</m:type>
 					<m:ref>
-						<m:name></m:name>
+						<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
 						<m:type></m:type>
 					</m:ref>
 					<m:desc></m:desc>