From b87cfce785e4c177ce9956a19e94e2f49dd9c995 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 16 五月 2023 00:53:16 +0800
Subject: [PATCH] 优化定时任务手工测试
---
service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java b/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
index 2e316ca..1d45357 100644
--- a/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
+++ b/service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java
@@ -21,6 +21,23 @@
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ if(queryStatisticsDto.getObjName().contains("-")){
+ String[] objNames = queryStatisticsDto.getObjName().split("-");
+ if(objNames.length == 2){
+ roomDto.setFloorNum(objNames[0]);
+ roomDto.setUnitNum("0");
+ roomDto.setRoomNum(objNames[1]);
+ }
+ objNames = queryStatisticsDto.getObjName().split("-",3);
+ if(objNames.length == 3){
+ roomDto.setFloorNum(objNames[0]);
+ roomDto.setUnitNum(objNames[1]);
+ roomDto.setRoomNum(objNames[2]);
+ }
+ }else{
+ roomDto.setRoomNumLike(queryStatisticsDto.getObjName());
+ }
return roomV1InnerServiceSMOImpl.queryRoomsCount(roomDto);
}
@@ -29,6 +46,23 @@
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
roomDto.setState(RoomDto.STATE_FREE);
+ roomDto.setFloorId(queryStatisticsDto.getFloorId());
+ if(queryStatisticsDto.getObjName().contains("-")){
+ String[] objNames = queryStatisticsDto.getObjName().split("-");
+ if(objNames.length == 2){
+ roomDto.setFloorNum(objNames[0]);
+ roomDto.setUnitNum("0");
+ roomDto.setRoomNum(objNames[1]);
+ }
+ objNames = queryStatisticsDto.getObjName().split("-",3);
+ if(objNames.length == 3){
+ roomDto.setFloorNum(objNames[0]);
+ roomDto.setUnitNum(objNames[1]);
+ roomDto.setRoomNum(objNames[2]);
+ }
+ }else{
+ roomDto.setRoomNumLike(queryStatisticsDto.getObjName());
+ }
return roomV1InnerServiceSMOImpl.queryRoomsCount(roomDto);
}
}
--
Gitblit v1.8.0