修改岗位归集统计——查询所有及添加所有地区查询

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<String,Object> result = service.qygwtjCount(staticsquery);
         return success(result);
     }

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<StaticsMapper, Statics>
 
     @Override
     public Map<String, Object> qygwtjCount(Staticsquery staticsquery) {
-        String eneTime= DateUtils.addOneDay(staticsquery.getEndTime(),DateUtils.YYYY_MM_DD,DateUtils.YYYY_MM_DD);
+        if(!StringUtils.isBlank(staticsquery.getEndTime())){
-        staticsquery.setEndTime(eneTime);
+            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);

ruoyi-bussiness/src/main/resources/mapper/app/StaticsMapper.xml

@@ -6,26 +6,32 @@
     <select id="qygwtjCount" parameterType="com.ruoyi.cms.domain.query.Staticsquery" resultType="com.ruoyi.cms.domain.StaticsJob">
         WITH time_params AS (
         SELECT
-            CAST(#{startTime} AS timestamp) AS start_time,
+            CAST(NULLIF(#{startTime}, '') AS timestamp) AS start_time,
-            CAST(#{endTime} AS timestamp) AS end_time
+            CAST(NULLIF(#{endTime}, '') AS timestamp) AS end_time
         ),
         job_stats AS (
         SELECT COUNT(*) AS 归集岗位合计,sum(case when type='4' then 1 else 0 end) 零工岗位数量,
                sum(case when type='4' then COALESCE(vacancies,0) else 0 end) 零工招聘人数 FROM job, time_params tp
-        WHERE posting_date &gt;= tp.start_time AND posting_date &lt; tp.end_time
+        WHERE (tp.start_time IS NULL OR posting_date &gt;= tp.start_time)
+          AND (tp.end_time IS NULL OR posting_date &lt; tp.end_time)
         ),
         company_stats AS (
         SELECT COUNT(company_id) AS 注册企业数 FROM company, time_params tp
-        WHERE del_flag='0' AND create_time &gt;= tp.start_time AND create_time &lt; tp.end_time
+        WHERE del_flag='0'
+        AND (tp.start_time IS NULL OR create_time &gt;= tp.start_time)
+        AND (tp.end_time IS NULL OR create_time &lt; tp.end_time)
         ),
         user_stats AS (
         SELECT COUNT(*) AS 求职者实名数 FROM app_user, time_params tp
         WHERE del_flag='0' AND is_company_user='1' AND id_card IS NOT NULL
-        AND create_time &gt;= tp.start_time AND create_time &lt; tp.end_time
+        AND (tp.start_time IS NULL OR create_time &gt;= tp.start_time)
+        AND (tp.end_time IS NULL OR create_time &lt; tp.end_time)
         ),
         apply_stats AS (
         SELECT COUNT(id) AS 简历投递数量 FROM job_apply, time_params tp
-        WHERE del_flag='0' AND create_time &gt;= tp.start_time AND create_time &lt; tp.end_time
+        WHERE del_flag='0'
+        AND (tp.start_time IS NULL OR create_time &gt;= tp.start_time)
+        AND (tp.end_time IS NULL OR create_time &lt; tp.end_time)
         )
         SELECT
         js.归集岗位合计 gjgwhj, cs.注册企业数 zcqys, us.求职者实名数 qzzsms, as2.简历投递数量 jlsl,