Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/controller/WelcomeBedController.java

@@ -113,12 +113,6 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                 return CommonResult.fail("当前学生信息在系统中不存在！");
             }
             wb.setStudentCard(student.getCardId());
-            wb.setCollegeId(iwbr.getCollegeId());
-            wb.setCollege(iwbr.getCollege());
-            wb.setMajorId(iwbr.getMajorId());
-            wb.setMajor(iwbr.getMajor());
-            wb.setClassstrId(iwbr.getClassstrId());
-            wb.setClassstr(iwbr.getClassstr());
             wb.setCardNum(iwbr.getCardNum());
             wb.setName(iwbr.getName());
         }
@@ -138,6 +132,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         wb.setGrade(iwbr.getGrade());
         wb.setCollegeId(iwbr.getCollegeId());
         wb.setCollege(iwbr.getCollege());
+        wb.setMajorId(iwbr.getMajorId());
+        wb.setMajor(iwbr.getMajor());
+        wb.setClassstrId(iwbr.getClassstrId());
+        wb.setClassstr(iwbr.getClassstr());
         wb.setRetentionState(iwbr.getRetentionState());
 
         int result = welcomeBedService.insertWelcomeBed(wb);

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1593,8 +1593,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         LocalDateTime start = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
         LocalDateTime end = start.plusDays(1);
-        Integer mVisitorTotal = welcomeVisitorService.countTotal(start, end, 1);
-        Integer hVisitorTotal = welcomeVisitorService.countTotal(start, end, 2);
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String startTime = start.format(dateTimeFormatter1);
+        String endTime = end.format(dateTimeFormatter1);
+        Integer mVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 1);
+        Integer hVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 2);
 
 
         List<WelcomeSetting> wss = welcomeSettingService.list(null);

src/main/java/com/template/mapper/WelcomeVisitorMapper.java

@@ -2,8 +2,11 @@ package com.template.mapper;
 
 import com.template.model.pojo.WelcomeVisitor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +18,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WelcomeVisitorMapper extends BaseMapper<WelcomeVisitor> {
 
+    Integer countTotal(@Param("start") String start,@Param("end") String end,@Param("schoolId") Integer schoolId);
 }

src/main/java/com/template/services/WelcomeVisitorService.java

@@ -67,7 +67,7 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
      */
     void export(WelcomeVisitorQuery visitorQuery);
 
-    Integer countTotal(LocalDateTime start, LocalDateTime end,Integer schoolId);
+    Integer countTotal(String start, String end,Integer schoolId);
 
     Integer carTotal();
 

src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -29,6 +29,7 @@ import com.template.services.WelcomeVisitorService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestAttributes;
@@ -50,6 +51,9 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     private final ParkingFeeSystemComponent parkingFeeSystemComponent;
     private final WelcomeSettingService settingService;
 
+    @Autowired
+    private WelcomeVisitorMapper welcomeVisitorMapper;
+
     @Override
     @Transactional
     public void addVisitor(String studentCard, WelcomeVisitorRequest visitorRequest) {
@@ -255,13 +259,9 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     }
 
     @Override
-    public Integer countTotal(LocalDateTime start, LocalDateTime end,Integer schoolId) {
+    public Integer countTotal(String start, String end,Integer schoolId) {
 
-        LambdaQueryWrapper<WelcomeVisitor> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.ge(WelcomeVisitor::getStartTime, start)
-                        .le(WelcomeVisitor::getEndTime,end)
-                .eq(WelcomeVisitor::getSchoolId,schoolId);
-        int count = this.count(queryWrapper);
+        Integer count=welcomeVisitorMapper.countTotal(start,end,schoolId);
         return count;
     }
 

src/main/resources/mapper/template/WelcomeVisitorMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeVisitorMapper">
 
+    <select id="countTotal" resultType="java.lang.Integer">
+        SELECT
+        COUNT( id )
+        FROM
+        welcome_visitor
+        WHERE
+        deleted = 0
+        AND start_time >= #{start}
+        AND #{end} >= end_time
+        AND school_id = #{schoolId}
+    </select>
 </mapper>