Skip to content

C
cloud-fb
Commit 48e14d57 by 王衍超
Options

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

parents 1278898e e52bc4a8
Showing with 35 additions and 33 deletions
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>
......
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>
......
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>
......
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>
......
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>
......
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>
......
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 &gt;= :?planningCycleStartTime
AND result.planningCycleEndTime &lt;= :?planningCycleEndTime
</sql>
......
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment