Commit f744b188 by liuyang

调整驾驶舱设备时长显示

parent aae00522
...@@ -50,7 +50,8 @@ public class ServiceHGSB010 extends ServiceEPBase { ...@@ -50,7 +50,8 @@ public class ServiceHGSB010 extends ServiceEPBase {
public EiInfo queryBySbStatus(EiInfo inInfo) { public EiInfo queryBySbStatus(EiInfo inInfo) {
Map params = EiInfoUtils.getFirstRow(inInfo); Map params = EiInfoUtils.getFirstRow(inInfo);
if (params.containsKey("date")){ if (params.containsKey("date")){
params.put("date", DateUtils.formatShort(params.get("date"))); params.remove("date");
//params.put("date", DateUtils.formatShort(params.get("date")));
} }
List<Map> result = DaoBase.getInstance().query("HGSB010.queryBySbStatus", params); List<Map> result = DaoBase.getInstance().query("HGSB010.queryBySbStatus", params);
inInfo.set("result",result); inInfo.set("result",result);
......
...@@ -186,17 +186,18 @@ ...@@ -186,17 +186,18 @@
INNER join ( INNER join (
select EQUIPMENT_CODE, LOG_VALUE select EQUIPMENT_CODE, LOG_VALUE
from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE' from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="accountCode"> and CREATED_TIME =(
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="date">
CREATED_TIME =(
select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010 select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010
where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date# where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty prepend=" AND " property="accountCode"> <isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode# ACCOUNT_CODE = #accountCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="date">
left(CREATED_TIME,8) = #date#
</isNotEmpty>
) )
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty> </isNotEmpty>
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where a.DELETE_FLAG = 0 and a.DEVICE_STATUS = 1 where a.DELETE_FLAG = 0 and a.DEVICE_STATUS = 1
......
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