From 178c71496d5508dae69110f4d988cf128723d740 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 14:58:41 +0800
Subject: [PATCH] 配置Modbus协议：增加能耗信息
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index 3148d51..8ab552a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -92,12 +92,11 @@
*/
public List<InoutRecord> listInoutRecord(Phone35InoutCommonParam param) {
String hql = " from " + InoutRecord.class.getName() + " where companyId =:companyId"
- + " and recordStatus <>:recordStatus1 and recordStatus <>:recordStatus2";
+ + " and recordStatus <>:recordStatus1 ";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", param.getCompanyId());
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
if (StringUtils.isNotEmpty(param.getDeptId())) {
hql += " and deptId =:deptId";
@@ -142,12 +141,11 @@
* @return
*/
public InoutRecord getInoutRecord(String companyId, String deptId, String id, String intelCard) {
- String hql = " from " + InoutRecord.class.getName() + " where" + " recordStatus <>:recordStatus1 and recordStatus <>:recordStatus2";
+ String hql = " from " + InoutRecord.class.getName() + " where" + " recordStatus <>:recordStatus1 ";
Map<String, Object> args = new HashMap<String, Object>();
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
if (StringUtils.isNotEmpty(companyId)) {
hql += " and companyId =:companyId";
@@ -165,7 +163,7 @@
hql += " and intelCard =:intelCard";
args.put("intelCard", intelCard);
}
- hql += " order by registerTime";
+ hql += " order by registerTime desc";
List<InoutRecord> list = this.query(hql, args);
if (null == list || list.isEmpty()) {
--
Gitblit v1.9.3