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
924d2b72
Commit
924d2b72
authored
Jun 07, 2021
by
wukaiqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分增加 discard 判断
parent
8122f164
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
45 additions
and
10 deletions
+45
-10
ContractAmountStatisticsAdvQuery.jmx
...tatistics/advanquery/ContractAmountStatisticsAdvQuery.jmx
+1
-0
ContractByRegionalCompanyStatisticsAdvQuery.jmx
...dvanquery/ContractByRegionalCompanyStatisticsAdvQuery.jmx
+6
-0
ContractDinasAmountStatisticsAdvQuery.jmx
...tics/advanquery/ContractDinasAmountStatisticsAdvQuery.jmx
+1
-0
ContractDinasTypeAmountStatisticsAdvQuery.jmx
.../advanquery/ContractDinasTypeAmountStatisticsAdvQuery.jmx
+1
-0
ContractDinasTypeStatisticsAdvQuery.jmx
...istics/advanquery/ContractDinasTypeStatisticsAdvQuery.jmx
+1
-0
ContractNumberTrendStatisticsAdvQuery.jmx
...tics/advanquery/ContractNumberTrendStatisticsAdvQuery.jmx
+3
-1
ContractStatisticsAdvQuery.jmx
...inas/statistics/advanquery/ContractStatisticsAdvQuery.jmx
+1
-0
ContractTopDescStatisticsAdvQuery.jmx
...atistics/advanquery/ContractTopDescStatisticsAdvQuery.jmx
+1
-0
FinanceCollectionChartByDaySummaryAdvQuery.jmx
...advanquery/FinanceCollectionChartByDaySummaryAdvQuery.jmx
+1
-1
ProjectDinasTypeByTypeStatisticsAdvQuery.jmx
...s/advanquery/ProjectDinasTypeByTypeStatisticsAdvQuery.jmx
+2
-0
ProjectDinasTypeStatisticsAdvQuery.jmx
...tistics/advanquery/ProjectDinasTypeStatisticsAdvQuery.jmx
+3
-2
ProjectDistrictStatisticsAdvQuery.jmx
...atistics/advanquery/ProjectDistrictStatisticsAdvQuery.jmx
+1
-0
ProjectNumberTrendStatisticsAdvQuery.jmx
...stics/advanquery/ProjectNumberTrendStatisticsAdvQuery.jmx
+4
-1
ProjectStatisticsAdvQuery.jmx
...dinas/statistics/advanquery/ProjectStatisticsAdvQuery.jmx
+5
-1
ProjectTypeStatisticsAdvQuery.jmx
...s/statistics/advanquery/ProjectTypeStatisticsAdvQuery.jmx
+3
-1
RegionalCompanyProjectStatisticsAdvQuery.jmx
...s/advanquery/RegionalCompanyProjectStatisticsAdvQuery.jmx
+6
-2
SalesAmountByRegionalCompanyStatisticsAdvQuery.jmx
...nquery/SalesAmountByRegionalCompanyStatisticsAdvQuery.jmx
+1
-0
SalesAmountStatisticsAdvQuery.jmx
...s/statistics/advanquery/SalesAmountStatisticsAdvQuery.jmx
+1
-0
SalesDealAmountStatisticsAdvQuery.jmx
...atistics/advanquery/SalesDealAmountStatisticsAdvQuery.jmx
+1
-1
SalesProjectAmountTopStatisticsAdvQuery.jmx
...cs/advanquery/SalesProjectAmountTopStatisticsAdvQuery.jmx
+1
-0
SalesRegionalCompanyStatisticsAdvQuery.jmx
...ics/advanquery/SalesRegionalCompanyStatisticsAdvQuery.jmx
+1
-0
No files found.
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractAmountStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -19,6 +19,7 @@
WHERE 1=1
AND contract.approveState = 2
AND contract.contractState
<>
'MODIFIED'
AND contract.discard
<>
1
GROUP BY contract.regionalCompany
</sql>
</template>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractByRegionalCompanyStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -31,6 +31,7 @@
WHERE
1 = 1
AND contract.contractState = 'EXECUTING'
AND contract.discard
<>
1
GROUP BY
contract.regionalCompany
) AS executingNumber ON executingNumber.regionalCompany = xystOrganization.id
...
...
@@ -43,6 +44,7 @@
WHERE
1 = 1
AND contract.contractState = 'UN_EXECUTE'
AND contract.discard
<>
1
GROUP BY
contract.regionalCompany
) AS unexecuteNumber ON unexecuteNumber.regionalCompany = xystOrganization.id
...
...
@@ -55,6 +57,7 @@
WHERE
1 = 1
AND contract.contractState = 'COMPLETED'
AND contract.discard
<>
1
GROUP BY
contract.regionalCompany
) AS completedNumber ON completedNumber.regionalCompany = xystOrganization.id
...
...
@@ -72,6 +75,7 @@
WHERE
1 = 1
AND contract.contractState
<>
'MODIFIED'
AND contract.discard
<>
1
) AS purchaseSandUnit
GROUP BY
purchaseSandUnit.regionalCompany
...
...
@@ -90,6 +94,7 @@
WHERE
1 = 1
AND contract.contractState
<>
'MODIFIED'
AND contract.discard
<>
1
) AS project
GROUP BY
project.regionalCompany
...
...
@@ -97,6 +102,7 @@
WHERE 1=1
AND xystOrganization.type
<>
'GROUP_COMPANY'
AND xystOrganization.id = :?regionalCompany
AND xystOrganization.discard
<>
1
</sql>
</template>
</content>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractDinasAmountStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -19,6 +19,7 @@
WHERE 1=1
AND contract.approveState = 2
AND contract.contractState
<>
'MODIFIED'
AND contract.discard
<>
1
GROUP BY contract.regionalCompany
</sql>
</template>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractDinasTypeAmountStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -22,6 +22,7 @@
LEFT JOIN Contract AS contract on contractAssociatedcontractDetail.master = contract.id
WHERE 1=1
AND contract.approveState = 2
AND contract.discard
<>
1
AND contract.contractState
<>
'MODIFIED'
AND contract.regionalCompany = :?regionalCompany
GROUP BY contractAssociatedcontractDetail.dinasType
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractDinasTypeStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -22,6 +22,7 @@
LEFT JOIN Contract AS contract on contractAssociatedcontractDetail.master = contract.id
WHERE 1=1
AND contract.approveState = 2
AND contract.discard
<>
1
AND contract.contractState
<>
'MODIFIED'
AND contract.regionalCompany = :?regionalCompany
GROUP BY contractAssociatedcontractDetail.dinasType
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractNumberTrendStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -20,7 +20,9 @@
contract1.id as id ,
contract1.createTime as createTime
from Contract as contract1
where contract1.approveState = 2
where 1=1
AND contract1.approveState = 2
AND contract1.discard
<>
1
)AS contract
RIGHT JOIN PlanningCycle AS planningCycle ON 1=1
AND yearof(contract.createTime) = yearof(planningCycle.startTime)
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -18,6 +18,7 @@
Contract AS contract
WHERE 1=1
AND contract.approveState = 2
AND contract.discard
<>
1
AND contract.contractState
<>
'MODIFIED'
</sql>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractTopDescStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -24,6 +24,7 @@
LEFT JOIN PurchaseSandCompany AS purchaseSandCompany on purchaseSandCompany.id = contract.purchaseSandUnit
where 1=1
AND contract.approveState = 2
AND contract.discard
<>
1
AND contract.contractState
<>
'MODIFIED'
AND contract.regionalCompany = :?regionalCompany
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/FinanceCollectionChartByDaySummaryAdvQuery.jmx
View file @
924d2b72
...
...
@@ -49,7 +49,7 @@
FROM
PlanningCycle AS planningCycle
JOIN xystOrganization AS xystOrganization ON 1=1 AND planningCycle.cycleType
<>
'WEEK'
AND xystOrganization.type
<>
'GROUP_COMPANY'
AND xystOrganization.type
<>
'GROUP_COMPANY'
AND xystOrganization.discard
<>
1
LEFT JOIN
(
SELECT
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectDinasTypeByTypeStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -21,11 +21,13 @@
ProjectFiled AS projectFiled
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
AND contract.approveState = 2
AND contract.discard
<>
1
AND contract.contractState
<>
'MODIFIED'
LEFT JOIN ContractAssociatedcontractDetail AS contractDetail ON contractDetail.master = contract.id
LEFT JOIN DinasType AS dinasType ON contractDetail.dinasType = dinasType.id
WHERE 1=1 AND dinasType.type IS NOT NULL
AND projectFiled.regionalCompany = :?regionalCompany
AND projectFiled.discard
<>
1
GROUP BY
dinasType.type
</sql>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectDinasTypeStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -19,8 +19,9 @@
LEFT JOIN ProjectFiledAssociatedProjectFiledDinasDetail AS projectFiledDinasDetail ON projectFiledDinasDetail.master = projectFiled.id
LEFT JOIN DinasType AS dinasType ON projectFiledDinasDetail.dinasType = dinasType.id
WHERE 1=1
and projectFiledDinasDetail.dinasType is not null
and projectFiled.regionalCompany = :?regionalCompany
AND projectFiledDinasDetail.dinasType is not null
AND projectFiled.regionalCompany = :?regionalCompany
AND projectFiled.discard
<>
1
GROUP BY
projectFiledDinasDetail.dinasType
</sql>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectDistrictStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -26,6 +26,7 @@
FROM
ProjectFiled AS projectFiled
WHERE 1=1
AND projectFiled.discard
<>
1
AND projectFiled.regionalCompany = :?regionalCompany
) AS projectFiledDetial
GROUP BY projectFiledDetial.district
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectNumberTrendStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -21,7 +21,10 @@
select projectFiled1.createTime as createTime,
projectFiled1.id as id
from ProjectFiled as projectFiled1 where projectFiled1.regionalCompany = :?regionalCompany
from ProjectFiled as projectFiled1
where 1=1
AND projectFiled1.discard
<>
1
AND projectFiled1.regionalCompany = :?regionalCompany
) AS projectFiled ON 1=1
AND yearof(projectFiled.createTime) = yearof(planningCycle.startTime)
AND monthof(projectFiled.createTime) = monthof(planningCycle.startTime)
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -36,7 +36,9 @@
FROM
ProjectFiled AS projectFiled
LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
WHERE 1=1
AND projectFiled.discard
<>
1
) AS project
LEFT JOIN (
SELECT
...
...
@@ -49,6 +51,8 @@
ProjectFiled AS projectFiled
LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
WHERE 1=1
AND projectFiled.discard
<>
1
) AS project1 ON project.id = project1.id
AND project.createtime
<
project1.createtime
WHERE
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectTypeStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -17,7 +17,9 @@
FROM
ProjectFiled AS projectFiled
left join ProjectType as projectType on projectFiled.projectType = projectType.id
WHERE 1=1 and projectFiled.regionalCompany = :?regionalCompany
WHERE 1=1
AND projectFiled.discard
<>
1
AND projectFiled.regionalCompany = :?regionalCompany
GROUP BY
projectFiled.projectType
</sql>
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/RegionalCompanyProjectStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -41,7 +41,9 @@
LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
WHERE 1=1 AND xystOrganization.type
<>
'GROUP_COMPANY'
WHERE 1=1
AND xystOrganization.discard
<>
1
AND xystOrganization.type
<>
'GROUP_COMPANY'
) AS project
LEFT JOIN (
SELECT
...
...
@@ -56,7 +58,9 @@
LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
WHERE 1=1 AND xystOrganization.type
<>
'GROUP_COMPANY'
WHERE 1=1
AND xystOrganization.discard
<>
1
AND xystOrganization.type
<>
'GROUP_COMPANY'
) AS project1 ON project.ID = project1.ID
AND project.createTime
<
project1.createTime
WHERE
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesAmountByRegionalCompanyStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -28,6 +28,7 @@
LEFT JOIN xystOrganization AS xystOrganization on xystOrganization.id = salesRecord.regionalCompany
WHERE 1=1
AND xystOrganization.type
<>
'GROUP_COMPANY'
AND xystOrganization.discard
<>
1
AND salesRecord.syncTime
>
= :?startDate
AND salesRecord.syncTime
<
= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesAmountStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -29,6 +29,7 @@
LEFT JOIN ProjectFiled as projectFiled on projectFiled.id = salesRecord.project
LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
WHERE 1=1
AND projectFiled.discard
<>
1
AND salesRecord.syncTime
>
= :?startDate
AND salesRecord.syncTime
<
= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDealAmountStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -24,7 +24,7 @@
xystOrganization.name AS regionalCompanyName
FROM
DinasType AS dinasType
JOIN xystOrganization AS xystOrganization ON 1=1
JOIN xystOrganization AS xystOrganization ON 1=1
AND xystOrganization.discard
<>
1
LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id
AND xystOrganization.id = salesRecord.regionalCompany
WHERE 1=1
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesProjectAmountTopStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -19,6 +19,7 @@
SalesRecord AS salesRecord
LEFT JOIN ProjectFiled as projectFiled on projectFiled.id = salesRecord.project
WHERE 1=1
AND projectFiled.discard
<>
1
AND salesRecord.syncTime
>
= :?startDate
AND salesRecord.syncTime
<
= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
...
...
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesRegionalCompanyStatisticsAdvQuery.jmx
View file @
924d2b72
...
...
@@ -19,6 +19,7 @@
LEFT JOIN Station AS station on station.id = salesSummary.station
LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = station.regionalCompany
WHERE 1=1
AND xystOrganization.discard
<>
1
AND xystOrganization.type
<>
'GROUP_COMPANY'
AND salesSummary.dealTime
>
= :?startDate
AND salesSummary.dealTime
<
= :?endDate
...
...
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