diff --git a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ArtificialRecharge.mk b/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ArtificialRecharge.mk
index 6ecf5ff..79a8952 100644
--- a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ArtificialRecharge.mk
+++ b/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.projectName</name>
<type>string</type>
<ref>
<type></type>
- <name></name>
+ <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref>
<description></description>
</field>
diff --git a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ExpenseAdjust.mk b/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ExpenseAdjust.mk
index 9d64887..b4c3f2e 100644
--- a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ExpenseAdjust.mk
+++ b/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.projectName</name>
<type>string</type>
<ref>
<type></type>
- <name></name>
+ <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref>
<description></description>
</field>
diff --git a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RankRechargeDetail.mk b/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RankRechargeDetail.mk
index e25421f..6a85bce 100644
--- a/backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RankRechargeDetail.mk
+++ b/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.projectName</name>
<type>string</type>
<ref>
<type></type>
- <name></name>
+ <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref>
<description></description>
</field>
diff --git a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ArtificialRecharge.jmx b/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ArtificialRecharge.jmx
index 85387d9..428fe2c 100644
--- a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ArtificialRecharge.jmx
+++ b/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.projectName</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>
diff --git a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/BankRechargeDetail.jmx b/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/BankRechargeDetail.jmx
index 8be5a11..d05c708 100644
--- a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/BankRechargeDetail.jmx
+++ b/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.projectName</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>
diff --git a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ExpenseAdjust.jmx b/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ExpenseAdjust.jmx
index a2c6bd3..f4fa94f 100644
--- a/backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ExpenseAdjust.jmx
+++ b/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.projectName</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>
diff --git a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx
index 0624218..6b8c043 100644
--- a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx
+++ b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx
@@ -68,7 +68,7 @@
WHERE result.type = :?type
AND result.organizationId = :?organizationId
AND result.projectId = :?projectId
- AND result.organizationId = :?organizationId
+ AND result.type = :?type
AND result.planningCycleStartTime >= :?planningCycleStartTime
AND result.planningCycleEndTime <= :?planningCycleEndTime
</sql>
diff --git a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
index 5639069..9da0f26 100644
--- a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
+++ b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
@@ -44,17 +44,19 @@
"action": "query_export",
"title": "导出",
"type": ""
- },
- {
- "name": "queryRefresh",
- "title": "刷新",
- "action": "queryRefresh",
- "param": [],
- "type": "",
- "enable": "ALL"
}
],
"table": {
+ "actions": [
+ {
+ "param": [],
+ "enable": "ALL",
+ "name": "query_export",
+ "action": "query_export",
+ "title": "导出",
+ "type": ""
+ }
+ ],
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 10,