修改岗位归集统计——查询所有及添加所有地区查询
This commit is contained in:
@@ -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<String,Object> result = service.qygwtjCount(staticsquery);
|
||||
return success(result);
|
||||
}
|
||||
|
||||
@@ -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<StaticsMapper, Statics>
|
||||
|
||||
@Override
|
||||
public Map<String, Object> 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<String, Object> result = new HashMap<>();
|
||||
StaticsJob staticsJob=staticsMapper.qygwtjCount(staticsquery);
|
||||
List<StaticsJob> list=staticsMapper.getGroutCityJobs(staticsquery);
|
||||
|
||||
Reference in New Issue
Block a user