Commit 48e14d57 by 王衍超

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

parents 1278898e e52bc4a8
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位'> <field title='购砂单位'>
<name>purchaseSandCompany.id</name> <name>purchaseSandUnit.id</name>
<type>uuid</type> <type>uuid</type>
<ref> <ref>
<type></type> <type></type>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位name'> <field title='购砂单位name'>
<name>purchaseSandCompany.name</name> <name>purchaseSandUnit.name</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
...@@ -85,11 +85,11 @@ ...@@ -85,11 +85,11 @@
<description></description> <description></description>
</field> </field>
<field title='项目名称'> <field title='项目名称'>
<name>projectName</name> <name>project.projectName</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
<name></name> <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref> </ref>
<description></description> <description></description>
</field> </field>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位'> <field title='购砂单位'>
<name>purchaseSandCompany.id</name> <name>purchaseSandUnit.id</name>
<type>uuid</type> <type>uuid</type>
<ref> <ref>
<type></type> <type></type>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位name'> <field title='购砂单位name'>
<name>purchaseSandCompany.name</name> <name>purchaseSandUnit.name</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
...@@ -85,11 +85,11 @@ ...@@ -85,11 +85,11 @@
<description></description> <description></description>
</field> </field>
<field title='项目名称'> <field title='项目名称'>
<name>projectName</name> <name>project.projectName</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
<name></name> <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref> </ref>
<description></description> <description></description>
</field> </field>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位'> <field title='购砂单位'>
<name>purchaseSandCompany.id</name> <name>purchaseSandUnit.id</name>
<type>uuid</type> <type>uuid</type>
<ref> <ref>
<type></type> <type></type>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<description></description> <description></description>
</field> </field>
<field title='购砂单位name'> <field title='购砂单位name'>
<name>purchaseSandCompany.name</name> <name>purchaseSandUnit.name</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
...@@ -85,11 +85,11 @@ ...@@ -85,11 +85,11 @@
<description></description> <description></description>
</field> </field>
<field title='项目名称'> <field title='项目名称'>
<name>projectName</name> <name>project.projectName</name>
<type>string</type> <type>string</type>
<ref> <ref>
<type></type> <type></type>
<name></name> <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref> </ref>
<description></description> <description></description>
</field> </field>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.id</m:name> <m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title> <m:title>购砂单位</m:title>
<m:type>uuid</m:type> <m:type>uuid</m:type>
<m:ref> <m:ref>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.name</m:name> <m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位name</m:title> <m:title>购砂单位name</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
...@@ -97,11 +97,11 @@ ...@@ -97,11 +97,11 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>projectName</m:name> <m:name>project.projectName</m:name>
<m:title>项目名称</m:title> <m:title>项目名称</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
<m:name></m:name> <m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type> <m:type></m:type>
</m:ref> </m:ref>
<m:desc></m:desc> <m:desc></m:desc>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.id</m:name> <m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title> <m:title>购砂单位</m:title>
<m:type>uuid</m:type> <m:type>uuid</m:type>
<m:ref> <m:ref>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.name</m:name> <m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位name</m:title> <m:title>购砂单位name</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
...@@ -97,11 +97,11 @@ ...@@ -97,11 +97,11 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>projectName</m:name> <m:name>project.projectName</m:name>
<m:title>项目名称</m:title> <m:title>项目名称</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
<m:name></m:name> <m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type> <m:type></m:type>
</m:ref> </m:ref>
<m:desc></m:desc> <m:desc></m:desc>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.id</m:name> <m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title> <m:title>购砂单位</m:title>
<m:type>uuid</m:type> <m:type>uuid</m:type>
<m:ref> <m:ref>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandCompany.name</m:name> <m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位name</m:title> <m:title>购砂单位name</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
...@@ -97,11 +97,11 @@ ...@@ -97,11 +97,11 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>projectName</m:name> <m:name>project.projectName</m:name>
<m:title>项目名称</m:title> <m:title>项目名称</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
<m:name></m:name> <m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type> <m:type></m:type>
</m:ref> </m:ref>
<m:desc></m:desc> <m:desc></m:desc>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
WHERE result.type = :?type WHERE result.type = :?type
AND result.organizationId = :?organizationId AND result.organizationId = :?organizationId
AND result.projectId = :?projectId AND result.projectId = :?projectId
AND result.organizationId = :?organizationId AND result.type = :?type
AND result.planningCycleStartTime &gt;= :?planningCycleStartTime AND result.planningCycleStartTime &gt;= :?planningCycleStartTime
AND result.planningCycleEndTime &lt;= :?planningCycleEndTime AND result.planningCycleEndTime &lt;= :?planningCycleEndTime
</sql> </sql>
......
...@@ -44,17 +44,19 @@ ...@@ -44,17 +44,19 @@
"action": "query_export", "action": "query_export",
"title": "导出", "title": "导出",
"type": "" "type": ""
},
{
"name": "queryRefresh",
"title": "刷新",
"action": "queryRefresh",
"param": [],
"type": "",
"enable": "ALL"
} }
], ],
"table": { "table": {
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": ""
}
],
"selectType": "MULTI", "selectType": "MULTI",
"serialNumber": "series", "serialNumber": "series",
"pageSize": 10, "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