回退代码

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -674,18 +674,12 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 }
             }
         }
-        // QueryWrapper<DemFireStatistics> query = Wrappers.query();
-        // query.select("MONTH (fire_time) monthTime", "COUNT(1) AS aCount")
-        //         .like(StringUtils.isNotBlank(address), "fire_address", address)
-        //         .in(CollectionUtils.isNotEmpty(fireNumberList), "fire_number", fireNumberList)
-        //         .between(startTime != null && endTime != null, "fire_time", startTime, endTime)
-        //         .groupBy("monthTime");
         QueryWrapper<DemFireStatistics> query = Wrappers.query();
-        query.select("MONTH(fire_time) AS monthTime", "COUNT(1) AS aCount")
+        query.select("MONTH (fire_time) monthTime", "COUNT(1) AS aCount")
                 .like(StringUtils.isNotBlank(address), "fire_address", address)
                 .in(CollectionUtils.isNotEmpty(fireNumberList), "fire_number", fireNumberList)
                 .between(startTime != null && endTime != null, "fire_time", startTime, endTime)
-                .groupBy("MONTH(fire_time)");
+                .groupBy("monthTime");
         List<Map<String, Object>> list = this.listMaps(query);
         List<Object> avgList = new ArrayList<>();
         for (int i = 1; i <= 12; i++) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReservePlanServiceImpl.java

@@ -83,6 +83,7 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
         queryWrapper.select(ReservePlan::getId, ReservePlan::getReserveName, ReservePlan::getReserveUrl, ReservePlan::getReserveType,
                 ReservePlan::getCreator, ReservePlan::getCreateTime, ReservePlan::getCompanyId)
                 .eq(ReservePlan::getEnable, 1)
+                .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate)
                 .orderByDesc(ReservePlan::getId);