1

ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanReservat.java

@@ -97,6 +97,25 @@ public class BomanReservat extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
+    private String startTime;
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     public String getDataType() {
         return dataType;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanTouristsNumberServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BomanReservat;
+import com.ruoyi.system.mapper.BomanReservatMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BomanTouristsNumberMapper;
@@ -24,6 +28,8 @@ public class BomanTouristsNumberServiceImpl implements IBomanTouristsNumberServi
 {
     @Autowired
     private BomanTouristsNumberMapper bomanTouristsNumberMapper;
+    @Autowired
+    private BomanReservatMapper bomanReservatMapper;
 
     @Autowired
     private static RedisCache redisCache;
@@ -108,12 +114,13 @@ public class BomanTouristsNumberServiceImpl implements IBomanTouristsNumberServi
 
     @Override
     public AjaxResult num(BomanTouristsNumber bomanTouristsNumber) {
-
+        Map<String,Object> map = new HashMap<>();
+        //陵园参观人数
         List<BomanTouristsNumber> bomanTouristsNumberList = bomanTouristsNumberMapper.selectBomanTouristsNumberList(bomanTouristsNumber);
-        Long num = 0L;
+        Long cgNum = 0L;
         if(bomanTouristsNumberList!=null && bomanTouristsNumberList.size()>0){
             for (BomanTouristsNumber touristsNumber : bomanTouristsNumberList) {
-                num = num + touristsNumber.getNumber();
+                cgNum = cgNum + touristsNumber.getNumber();
             }
         }
         //获取当前时间
@@ -123,9 +130,28 @@ public class BomanTouristsNumberServiceImpl implements IBomanTouristsNumberServi
             String configKey = "lyssllsj";
             String configValue = Convert.toStr(redisCache.getCacheObject(configKey));
             if(StringUtils.isNotEmpty(configValue)){
-                num = num + Long.valueOf(configValue);
+                cgNum = cgNum + Long.valueOf(configValue);
+            }
+        }
+        map.put("cgNum",cgNum);
+        //查询预约的数据（单位数和人数）
+        //单位数
+        Long dwNum = 0L;
+        Long yyNum = 0L;
+        BomanReservat bomanReservat = new BomanReservat();
+        bomanReservat.setStartTime(bomanTouristsNumber.getStartTime());
+        bomanReservat.setEndTime(bomanTouristsNumber.getEndTime());
+        List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(bomanReservat);
+        if(bomanReservats!=null && bomanReservats.size()>0){
+            for (BomanReservat reservat : bomanReservats) {
+                yyNum = yyNum + Long.valueOf(reservat.getVisitNum());
+                if("1".equals(reservat.getReservatType())){
+                    dwNum++;
+                }
             }
         }
-        return AjaxResult.success(num);
+        map.put("dwNum",dwNum);
+        map.put("yyNum",yyNum);
+        return AjaxResult.success(map);
     }
 }

ruoyi-system/src/main/resources/mapper/system/BomanReservatMapper.xml

@@ -60,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createDept != null "> and create_dept = #{createDept}</if>
             <if test="dataType != null and dataType == '3'"> and  visit_date &gt;= DATE_SUB(NOW(), INTERVAL 7 DAY)</if>
             <if test="dataType != null and dataType == '4'"> and visit_date &gt;= DATE_SUB(NOW(), INTERVAL 30 DAY))</if>
+            <if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
+                AND date_format(visit_date,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(visit_date,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
         </where>
         order by visit_date DESC,visit_time DESC
     </select>