diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..03a73da 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,7 +119,7 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) query.ge("CREATE_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..03a73da 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,7 +119,7 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) query.ge("CREATE_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index db6f058..8883953 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -70,11 +70,11 @@ casic-service-car ${pro.version} - + com.casic casic-service-infrastructure diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..03a73da 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,7 +119,7 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) query.ge("CREATE_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index db6f058..8883953 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -70,11 +70,11 @@ casic-service-car ${pro.version} - + com.casic casic-service-infrastructure diff --git a/pom.xml b/pom.xml index c668051..cc4fc7f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ casic-service-person casic-service-toilet casic-service-support - casic-service-job-monitor + org.springframework.boot