Merge branch 'master' of http://39.105.126.192:3000/DR3_server/sky_ioc_server

src/main/java/com/sky/ioc/entity/params/IocTimeRange.java

@@ -3,8 +3,10 @@ package com.sky.ioc.entity.params;
 import lombok.Data;
 
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 
 @Data
 public class IocTimeRange {
@@ -20,11 +22,14 @@ public class IocTimeRange {
         DateTimeFormatter pattern = DateTimeFormatter.ofPattern("yyyy/MM/dd");
         if (this.startDate.contains(":")) {
             pattern = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+            LocalDateTime sDate = LocalDateTime.parse(this.startDate, pattern);
+            LocalDateTime eDate = LocalDateTime.parse(this.endDate, pattern);
+            this.range = Math.toIntExact(Duration.between(sDate, eDate).toDays());
+        } else {
+            LocalDate sDate = LocalDate.parse(this.startDate, pattern);
+            LocalDate eDate = LocalDate.parse(this.endDate, pattern);
+            this.range = Math.toIntExact(sDate.until(eDate, ChronoUnit.DAYS));
         }
-
-        LocalDateTime sDate = LocalDateTime.parse(this.startDate, pattern);
-        LocalDateTime eDate = LocalDateTime.parse(this.endDate, pattern);
-        this.range = Math.toIntExact(Duration.between(sDate, eDate).toDays());
         return this.range;
     }
 

src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.domain.space.*;
-import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.mapper.AccessSpaceMapper;
 import com.sky.ioc.mapper.BuildingSpaceMapper;
@@ -14,9 +13,11 @@ import com.sky.ioc.mapper.MeetingMapper;
 import com.sky.ioc.mapper.space.BuildingFloorMapper;
 import com.sky.ioc.mapper.space.BuildingRoomMapper;
 import com.sky.ioc.mapper.space.BuildingStationMapper;
-import com.sky.ioc.service.space.BuildingFloorService;
 import com.sky.ioc.service.space.SpaceService;
-import com.sky.ioc.tool.*;
+import com.sky.ioc.tool.DateUtil;
+import com.sky.ioc.tool.GeneralMethod;
+import com.sky.ioc.tool.MathUtils;
+import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -72,6 +73,7 @@ public class SpaceServiceImpl implements SpaceService {
         jsonObject.put("layersInt", 21);
         jsonObject.put("serviceLife", 15);
         jsonObject.put("constructionPeriod", 15);
+        jsonObject.put("companyNum", 5);
         return ReturnMsg.ok(jsonObject);
     }