diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/StaticsController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/StaticsController.java index 693abfc..027b83d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/StaticsController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/StaticsController.java @@ -2,10 +2,8 @@ package com.ruoyi.cms.controller.cms; import com.ruoyi.cms.domain.query.Staticsquery; import com.ruoyi.cms.service.StaticsqueryService; -import com.ruoyi.cms.util.DateValidateUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -111,11 +109,6 @@ public class StaticsController extends BaseController { if(staticsquery==null){ return error("参数为空!"); } - //判断时间 - String timeError = DateValidateUtil.validateStartAndEndTime(staticsquery.getStartTime(),staticsquery.getEndTime()); - if (StringUtils.isNotBlank(timeError)) { - return error(timeError); - } Map result = service.qygwtjCount(staticsquery); return success(result); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/StaticsqueryServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/StaticsqueryServiceImpl.java index 9b0a638..3653dfa 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/StaticsqueryServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/StaticsqueryServiceImpl.java @@ -8,6 +8,7 @@ import com.ruoyi.cms.domain.query.Staticsquery; import com.ruoyi.cms.mapper.StaticsMapper; import com.ruoyi.cms.service.StaticsqueryService; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -552,8 +553,10 @@ public class StaticsqueryServiceImpl extends ServiceImpl @Override public Map qygwtjCount(Staticsquery staticsquery) { - String eneTime= DateUtils.addOneDay(staticsquery.getEndTime(),DateUtils.YYYY_MM_DD,DateUtils.YYYY_MM_DD); - staticsquery.setEndTime(eneTime); + if(!StringUtils.isBlank(staticsquery.getEndTime())){ + String eneTime= DateUtils.addOneDay(staticsquery.getEndTime(),DateUtils.YYYY_MM_DD,DateUtils.YYYY_MM_DD); + staticsquery.setEndTime(eneTime); + } HashMap result = new HashMap<>(); StaticsJob staticsJob=staticsMapper.qygwtjCount(staticsquery); List list=staticsMapper.getGroutCityJobs(staticsquery); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/StaticsMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/StaticsMapper.xml index 3c4ddd3..95c1e56 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/StaticsMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/StaticsMapper.xml @@ -6,26 +6,32 @@