稳压泵统计问题修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/interceptor/PluginInterceptor.java

@@ -71,19 +71,22 @@ public class PluginInterceptor implements Interceptor {
                 par = (HashMap) ((HashMap<?, ?>) parameter).get("map");
             }
 
-            LinkedHashMap<String, String> fieldsValue = (LinkedHashMap<String, String>) par.get("fieldsValue");
-            Iterator<String> iterator = fieldsValue.keySet().stream().iterator();
-
-            while (iterator.hasNext()) {
-                String next = iterator.next();
-                sql = sql.replaceFirst("item", next).replaceFirst("ietmValue", new StringBuffer().append("'").append(fieldsValue.get(next)).append("'").toString());
+            try {
+                LinkedHashMap<String, String> fieldsValue = (LinkedHashMap<String, String>) par.get("fieldsValue");
+                Iterator<String> iterator = fieldsValue.keySet().stream().iterator();
+
+                while (iterator.hasNext()) {
+                    String next = iterator.next();
+                    sql = sql.replaceFirst("item", next).replaceFirst("ietmValue", new StringBuffer().append("'").append(fieldsValue.get(next)).append("'").toString());
+                }
+                //通过反射修改sql语句
+                Field field = boundSql.getClass().getDeclaredField("sql");
+                ReflectionUtils.makeAccessible(field);
+                field.set(boundSql, sql);
+                return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
+            } catch (Exception e) {
+                return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
             }
-
-            //通过反射修改sql语句
-            Field field = boundSql.getClass().getDeclaredField("sql");
-            ReflectionUtils.makeAccessible(field);
-            field.set(boundSql, sql);
-            return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
         } else if ("com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.listAll".equals(id) ||
                 "com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.listOneDayDutyPerson".equals(id) ||
                 "com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.pageList".equals(id)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java

@@ -142,7 +142,7 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
                 try {
                     Date date = DateUtils.convertStrToDate(time, DateUtils.DATE_PATTERN);
                     //  结束日期不包含今天，获取3天前数据
-                    if (DateUtils.dateCompare(date, startDate) >= 0 && DateUtils.dateCompare(endDate, date) > 0) {
+                    if (DateUtils.dateCompare(date, startDate) >= 0 && DateUtils.dateCompare(endDate, date) >= 0) {
                         list.add(JSON.parseObject(redisUtils.get(x).toString(), PressurePumpCountVo.class));
                     }
                 } catch (ParseException e) {