数据总览

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

@@ -1358,6 +1358,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        寝室总数
         int dormitoryTotal = welcomeDormitoryService.count(new QueryWrapper<>());
 
+        int payCount=welcomeStudentService.payCount();
 //        已入住寝室数
         LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
         wrapper.ne(WelcomeDormitory::getStatus,2);
@@ -1367,12 +1368,16 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         LocalDateTime end = start.plusDays(1);
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         Integer visitorTotal=welcomeVisitorService.countTotal(start,end);
+        Integer carTotal = welcomeVisitorService.carTotal();
 
         StudentOverviewVo vo = new StudentOverviewVo();
+        vo.setEnrollmentTotal(6532);
         vo.setStudentTotal(studentTotal);
+        vo.setPayCount(payCount);
         vo.setDormitoryTotal(dormitoryTotal);
         vo.setCheckInTotal(count);
         vo.setVisitorTotal(visitorTotal);
+        vo.setCarTotal(carTotal);
 
         return CommonResult.ok(vo);
     }

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

@@ -24,7 +24,7 @@ import java.util.List;
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
     IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeId") Integer collegeId,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
 
-    List<StudentPageVo> queryStudentList(@Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
+    List<StudentPageVo> queryStudentPageList(@Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
 
     List<StudentRegisterVo> studentRegister();
 

src/main/java/com/template/model/vo/StudentOverviewVo.java

@@ -4,17 +4,26 @@ import lombok.Data;
 
 @Data
 public class StudentOverviewVo {
-//    学生报到数
+    //录取人数
+    private Integer EnrollmentTotal;
+
+    //预学生报到数
     private Integer studentTotal;
 
-//    寝室总数
+    //寝室总数
     private Integer dormitoryTotal;
 
-//    入住总数
+    //已交付
+    private Integer payCount;
+
+    //入住总数
     private Integer checkInTotal;
 
-//    当天访客总数
+    //当天车牌数
     private Integer visitorTotal;
 
+    //当天车牌数
+    private Integer carTotal;
+
 
 }

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

@@ -56,4 +56,6 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     Integer totalCount();
 
+    int payCount();
+
 }

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

@@ -68,4 +68,6 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
 
     Integer countTotal(LocalDateTime start, LocalDateTime end);
 
+    Integer carTotal();
+
 }

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

@@ -91,7 +91,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     @Override
     public List<StudentPageVo> queryStudentList( Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentList(collegeId, majorId, classstrId, trafficMethod, name);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeId, majorId, classstrId, trafficMethod, name);
         return result;
     }
 
@@ -147,6 +147,14 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
+    public int payCount() {
+        QueryWrapper<WelcomeStudent> wss = new QueryWrapper<>();
+        wss.gt("pay_amount",0);
+        Integer count = welcomeStudentMapper.selectCount(wss);
+        return count;
+    }
+
+    @Override
     public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)

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

@@ -195,6 +195,12 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         return count;
     }
 
+    @Override
+    public Integer carTotal() {
+        int result = this.count(null);
+        return result;
+    }
+
     /**
      * 新增车辆信息
      * @param visitor  访客信息