设备管理查看列表

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -273,6 +273,13 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
             org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
+            Integer equipmentId = object.optInt("equipmentId");
+            String startTime = object.optString("startTime");
+            String endTime = object.optString("endTime");
+            
+            if("" != equipmentId+""){
+            	ew.eq("equipment_id", equipmentId);
+            }
             if (StringUtils.isNotBlank(object.optString("type"))) {
             	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx") || object.optString("type").equals("sbly")){
             		ew.like("type",object.optString("type"));
@@ -296,17 +303,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 ew.eq("depot_id", object.optString("depotId"));
             }
 
-            if (StringUtils.isNotBlank(object.optString("startTime")) || StringUtils.isNotBlank(object.optString("endTime"))) {
-                if (StringUtils.isNotBlank(object.optString("startTime")) && StringUtils.isNotBlank(object.optString("endTime")) &&
-                        object.optString("startTime").equals(object.optString("endTime"))) {
-                    ew.apply("date_format(apply_time,'%Y-%m-%d')='" + object.optString("startTime") + "'");
+            if (StringUtils.isNotBlank(startTime) || StringUtils.isNotBlank(endTime)) {
+                if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) &&
+                        startTime.equals(endTime)) {
+                    ew.apply("date_format(apply_time,'%Y-%m-%d')='" + startTime + "'");
                 } else {
-                    ew.between("apply_time", object.optString("startTime"), object.optString("endTime"));
+                    ew.between("apply_time", startTime, endTime);
                 }
-
             }
 
-
         }
 
         ew.orderByDesc("id");