Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
cloud-fb
Commits
fcfb2b95
Commit
fcfb2b95
authored
3 years ago
by
wukaiqiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop
parents
18fbfb36
ff49b164
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
9 deletions
+54
-9
DefaultFunctionTree.jmx
...m/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
+14
-0
RetailInfoWarningExe.jmx
...sources/com/xyst/dinas/biz/query/RetailInfoWarningExe.jmx
+8
-8
StationInfoApply.jmx
...n/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx
+30
-1
SalesRecordStatisticsAdvQuery.jmx
...s/statistics/advanquery/SalesRecordStatisticsAdvQuery.jmx
+2
-0
No files found.
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
View file @
fcfb2b95
...
...
@@ -1595,6 +1595,20 @@
</m:function-definition>
<m:icon>
iconfont iconqiyeshezhi1x
</m:icon>
</m:function-node>
<m:function-node>
<m:id>
47f27d7f-eeb1-4485-87fc-e00ecfdf9995
</m:id>
<m:name>
billManage
</m:name>
<m:title>
报表设置
</m:title>
<m:index>
9000
</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role>
bizManagerRole
</m:role>
<m:function-definition>
<m:view>
function-bill-manage
</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>
iconfont iconhetongzhihangfenxi1x
</m:icon>
</m:function-node>
<m:function-node>
<m:id>
1f075780-2cf0-4d7d-a3af-c0bd5fc813ae
</m:id>
<m:name>
logMgr
</m:name>
...
...
This diff is collapsed.
Click to expand it.
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/RetailInfoWarningExe.jmx
View file @
fcfb2b95
...
...
@@ -80,8 +80,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
me
mo
</m:name>
<m:title>
备注
</m:title>
<m:name>
me
ssage
</m:name>
<m:title>
预警消息
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
@@ -90,8 +90,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
m
ax
</m:name>
<m:title>
预警值
</m:title>
<m:name>
m
emo
</m:name>
<m:title>
备注
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
@@ -100,8 +100,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
actualValue
</m:name>
<m:title>
实际
值
</m:title>
<m:name>
max
</m:name>
<m:title>
预警
值
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
@@ -110,8 +110,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
messag
e
</m:name>
<m:title>
预警消息
</m:title>
<m:name>
actualValu
e
</m:name>
<m:title>
实际值
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
This diff is collapsed.
Click to expand it.
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx
View file @
fcfb2b95
...
...
@@ -58,6 +58,36 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
stationCoordinate
</m:name>
<m:title>
场站坐标
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
linkMan
</m:name>
<m:title>
联系人
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
telephone
</m:name>
<m:title>
联系电话
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
stationAddress
</m:name>
<m:title>
场站地址
</m:title>
<m:type>
string
</m:type>
...
...
@@ -157,7 +187,6 @@
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
del
</m:name>
<m:title>
是否删除
</m:title>
...
...
This diff is collapsed.
Click to expand it.
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesRecordStatisticsAdvQuery.jmx
View file @
fcfb2b95
...
...
@@ -24,6 +24,8 @@
WHERE 1=1
AND salesRecord.syncTime
>
= :?startDate
AND salesRecord.syncTime
<
= :?endDate
ORDER BY salesRecord.syncTime
LIMIT :?limitNum
</sql>
</template>
</content>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment