Skip to content

H
hp-smart
Commit 38a6cafc by lyy
Options

Merge branch 'dev' of http://129.211.46.84:8800/platform/hp-smart into dev-sx

parents a25fd53f ebcbb546
Showing with 34 additions and 25 deletions
src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI003.xml
...@@ -818,8 +818,11 @@ ...@@ -818,8 +818,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -828,9 +831,7 @@ ...@@ -828,9 +831,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -851,8 +852,11 @@ ...@@ -851,8 +852,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -861,9 +865,7 @@ ...@@ -861,9 +865,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -884,8 +886,11 @@ ...@@ -884,8 +886,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -894,9 +899,7 @@ ...@@ -894,9 +899,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -917,8 +920,11 @@ ...@@ -917,8 +920,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -927,9 +933,7 @@ ...@@ -927,9 +933,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -950,8 +954,11 @@ ...@@ -950,8 +954,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -960,9 +967,7 @@ ...@@ -960,9 +967,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -983,8 +988,11 @@ ...@@ -983,8 +988,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
...@@ -993,9 +1001,7 @@ ...@@ -993,9 +1001,7 @@
</isNotEmpty> </isNotEmpty>
group by EQUIPMENT_CODE group by EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
a.DELETE_FLAG = 0
and DEVICE_STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -1016,8 +1022,11 @@ ...@@ -1016,8 +1022,11 @@
select select
EQUIPMENT_CODE, EQUIPMENT_CODE,
count(1) as NUM count(1) as NUM
from hpjx.t_hpsb002 from ${hpjxSchema}.t_hpsb002
where EQUIPMENT_TYPE = 'STARUS_TYPE' where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="logValues"> <isNotEmpty prepend=" AND " property="logValues">
LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate> LOG_VALUE IN <iterate close=")" open="(" conjunction="," property="logValues">#logValues[]#</iterate>
</isNotEmpty> </isNotEmpty>
......
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