Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/PbCseFeeobjupdateController.java

@@ -7,12 +7,10 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.student.dto.AddPbCseFeeobjupdateDto;
-import com.xjrsoft.module.student.dto.UpdatePbCseFeeobjupdateDto;
+import com.xjrsoft.module.student.dto.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
-import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
-import com.xjrsoft.module.textbook.dto.EnrollmentStatisticsInfoDto;
+import com.xjrsoft.module.student.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -20,12 +18,9 @@ import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 
-import com.xjrsoft.module.student.dto.PbCseFeeobjupdatePageDto;
 import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
-import com.xjrsoft.module.student.vo.PbCseFeeobjupdatePageVo;
 
-import com.xjrsoft.module.student.vo.PbCseFeeobjupdateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -57,6 +52,22 @@ public class PbCseFeeobjupdateController {
         return RT.ok(enrollmentStatisticsInfoVo);
     }
 
+    @GetMapping(value = "/enrollment-statistics-calendar")
+    @ApiOperation(value="招生统计每日动态数据")
+    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    public RT<EnrollmentStatisticsCalendarInfoVo> getEnrollmentStatisticsCalendarInfo(@Valid EnrollmentStatisticsCalendarInfoDto dto){
+        EnrollmentStatisticsCalendarInfoVo enrollmentStatisticsCalendarInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsCalendarInfo(dto);
+        return RT.ok(enrollmentStatisticsCalendarInfoVo);
+    }
+
+    @GetMapping(value = "/enrollment-statistics-graduation")
+    @ApiOperation(value="招生统计毕业学校数据")
+    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    public RT<EnrollmentStatisticsGraduationInfoVo> getEnrollmentStatisticsGraduationInfo(@Valid EnrollmentStatisticsGraduationInfoDto dto){
+        EnrollmentStatisticsGraduationInfoVo enrollmentStatisticsGraduationInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsGraduationInfo(dto);
+        return RT.ok(enrollmentStatisticsGraduationInfoVo);
+    }
+
     @GetMapping(value = "/page")
     @ApiOperation(value="列表(分页)")
     @SaCheckPermission("pbcsefeeobjupdate:detail")

src/main/java/com/xjrsoft/module/student/dto/EnrollmentStatisticsCalendarInfoDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title:
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class EnrollmentStatisticsCalendarInfoDto {
+    /**
+     * 年月日
+     */
+    @ApiModelProperty("开始年月日")
+    private String startDay;
+    /**
+     * 年月日
+     */
+    @ApiModelProperty("开始年月日")
+    private String endDay;
+}

src/main/java/com/xjrsoft/module/student/dto/EnrollmentStatisticsGraduationInfoDto.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title:
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class EnrollmentStatisticsGraduationInfoDto {
+    /**
+     * 年月日
+     */
+    @ApiModelProperty("年月日")
+    private String day;
+}

src/main/java/com/xjrsoft/module/textbook/dto/EnrollmentStatisticsInfoDto.java → src/main/java/com/xjrsoft/module/student/dto/EnrollmentStatisticsInfoDto.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.textbook.dto;
+package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/xjrsoft/module/student/service/IPbCseFeeobjupdateService.java

@@ -1,9 +1,13 @@
 package com.xjrsoft.module.student.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsCalendarInfoDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsGraduationInfoDto;
 import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsCalendarInfoVo;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsGraduationInfoVo;
 import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
-import com.xjrsoft.module.textbook.dto.EnrollmentStatisticsInfoDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
 
 /**
 * @title: 
@@ -14,4 +18,8 @@ import com.xjrsoft.module.textbook.dto.EnrollmentStatisticsInfoDto;
 
 public interface IPbCseFeeobjupdateService extends MPJBaseService<PbCseFeeobjupdate> {
     EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo(EnrollmentStatisticsInfoDto dto);
+
+    EnrollmentStatisticsCalendarInfoVo getEnrollmentStatisticsCalendarInfo(EnrollmentStatisticsCalendarInfoDto dto);
+
+    EnrollmentStatisticsGraduationInfoVo getEnrollmentStatisticsGraduationInfo(EnrollmentStatisticsGraduationInfoDto dto);
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.student.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -137,6 +138,19 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
 
     @Override
     public MobileClassStatisticsVo getMobileClassStatistics(BaseStudentInfoPageDto dto) {
+        //获取当前用户的班级
+        LambdaQueryWrapper<BaseClass> baseClassLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        baseClassLambdaQueryWrapper
+                .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong());
+        List<BaseClass> baseClassList = baseClassMapper.selectList(baseClassLambdaQueryWrapper);
+        //如果集合不为空，表示该登录用户是班主任
+        if(baseClassList != null && !baseClassList.isEmpty()){
+            for (BaseClass baseClass : baseClassList){
+
+            }
+        }else {
+
+        }
         return null;
     }
 }

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -1,20 +1,15 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseMajorSet;
-import com.xjrsoft.module.oa.vo.NewsAppendixVo;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsCalendarInfoDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsGraduationInfoDto;
 import com.xjrsoft.module.student.entity.*;
 import com.xjrsoft.module.student.mapper.PbCseFeeobjupdateMapper;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
-import com.xjrsoft.module.student.vo.ChargingSituationVo;
-import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoKeyValue;
-import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
-import com.xjrsoft.module.student.vo.PbCseFeeobjupdatePageVo;
-import com.xjrsoft.module.system.entity.File;
-import com.xjrsoft.module.textbook.dto.EnrollmentStatisticsInfoDto;
+import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -40,84 +35,6 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
     @Override
     public EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo(EnrollmentStatisticsInfoDto dto) {
         EnrollmentStatisticsInfoVo result = new EnrollmentStatisticsInfoVo();
-        String firstDayOfMonthStr;
-        String lastDayOfMonthStr;
-        if(dto.getYearMonth() != null && !dto.getYearMonth().equals("")){
-            LocalDate date = LocalDate.parse(dto.getYearMonth() + "-01"); // 假设给定日期为2022年9月15日
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            // 获取本月的第一天
-            LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-            firstDayOfMonthStr = firstDayOfMonth.format(formatter);
-            // 获取下月的第一天
-            LocalDate lastDayOfMonth = date.plusMonths(1).withDayOfMonth(1);
-            lastDayOfMonthStr = lastDayOfMonth.format(formatter);
-        }else {
-            LocalDate today = LocalDate.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            // 获取月份的第一天
-            LocalDate firstDayOfMonth = today.withDayOfMonth(1);
-            firstDayOfMonthStr = firstDayOfMonth.format(formatter);
-            // 获取下月的第一天
-            LocalDate lastDayOfMonth = today.plusMonths(1).withDayOfMonth(1);
-            lastDayOfMonthStr = lastDayOfMonth.format(formatter);
-        }
-
-        //根据年月获取招生数量
-        MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonth = new MPJLambdaWrapper<>();
-        pbCseFeeobjupdateByYearMonth
-                .distinct()
-                .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
-                .selectAs(PbCseFeeobjupdate::getCratetime, PbCseFeeobjupdate::getCratetime)
-                .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
-                .between(PbCseFeeobjupdate::getCratetime, firstDayOfMonthStr, lastDayOfMonthStr)
-        ;
-
-        List<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonthList = this.selectJoinList(PbCseFeeobjupdate.class, pbCseFeeobjupdateByYearMonth);
-
-        if(pbCseFeeobjupdateByYearMonthList != null && !pbCseFeeobjupdateByYearMonthList.isEmpty()) {
-            //每日招生人数
-            Map<String, Long> cratetime = pbCseFeeobjupdateByYearMonthList.stream().collect(Collectors.groupingBy(pbCseFeeobjupdate -> pbCseFeeobjupdate.getCratetime().substring(0,10), Collectors.counting()));
-            if(!cratetime.isEmpty()){
-                cratetime = cratetime.entrySet().stream()
-                        .sorted(Map.Entry.comparingByKey())
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
-                                (e1, e2) -> e1, LinkedHashMap::new));
-            }
-            List<EnrollmentStatisticsInfoKeyValue> cratetimeRes = new ArrayList<>();
-            for (Map.Entry<String, Long> entry : cratetime.entrySet()) {
-                cratetimeRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
-            }
-
-            result.setCratetimeList(cratetimeRes);
-        }
-
-        //根据天获取毕业院校
-        MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByDay = new MPJLambdaWrapper<>();
-        pbCseFeeobjupdateByDay
-                .distinct()
-                .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
-                .select("ifnull(t.graduations,'未知') as graduations")
-                .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
-                .like(dto.getDay() != null, PbCseFeeobjupdate::getCratetime, dto.getDay())
-        ;
-        List<PbCseFeeobjupdate> pbCseFeeobjupdateByDayList = this.selectJoinList(PbCseFeeobjupdate.class, pbCseFeeobjupdateByDay);
-        if(pbCseFeeobjupdateByDayList != null && !pbCseFeeobjupdateByDayList.isEmpty()){
-            //毕业学校排行
-            Map<String, Long> graduations = pbCseFeeobjupdateByDayList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getGraduations, Collectors.counting()));
-            if(!graduations.isEmpty()){
-                graduations = graduations.entrySet().stream()
-                        .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
-                                (e1, e2) -> e1, LinkedHashMap::new));
-            }
-            List<EnrollmentStatisticsInfoKeyValue> graduationRes = new ArrayList<>();
-            for (Map.Entry<String, Long> entry : graduations.entrySet()) {
-                graduationRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
-            }
-
-            result.setGraduationList(graduationRes);
-        }
-
         //获取所有学生的信息
         MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateMPJLambdaWrapper = new MPJLambdaWrapper<>();
         pbCseFeeobjupdateMPJLambdaWrapper
@@ -228,4 +145,79 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
         return result;
     }
+
+    @Override
+    public EnrollmentStatisticsCalendarInfoVo getEnrollmentStatisticsCalendarInfo(EnrollmentStatisticsCalendarInfoDto dto) {
+        EnrollmentStatisticsCalendarInfoVo result = new EnrollmentStatisticsCalendarInfoVo();
+        LocalDate endDate = LocalDate.parse(dto.getEndDay());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate nextDay = endDate.plusDays(1);
+        dto.setEndDay(nextDay.format(formatter));
+        String year = String.valueOf(endDate.getYear());
+        //根据年月获取招生数量
+        MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonth = new MPJLambdaWrapper<>();
+        pbCseFeeobjupdateByYearMonth
+                .distinct()
+                .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
+                .selectAs(PbCseFeeobjupdate::getCratetime, PbCseFeeobjupdate::getCratetime)
+                .eq(PbCseFeeobjupdate::getEnteryear, year)
+                .between(PbCseFeeobjupdate::getCratetime, dto.getStartDay(), dto.getEndDay())
+        ;
+
+        List<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonthList = this.selectJoinList(PbCseFeeobjupdate.class, pbCseFeeobjupdateByYearMonth);
+
+        if(pbCseFeeobjupdateByYearMonthList != null && !pbCseFeeobjupdateByYearMonthList.isEmpty()) {
+            //每日招生人数
+            Map<String, Long> cratetime = pbCseFeeobjupdateByYearMonthList.stream().collect(Collectors.groupingBy(pbCseFeeobjupdate -> pbCseFeeobjupdate.getCratetime().substring(0,10), Collectors.counting()));
+            if(!cratetime.isEmpty()){
+                cratetime = cratetime.entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey())
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                                (e1, e2) -> e1, LinkedHashMap::new));
+            }
+            List<EnrollmentStatisticsInfoKeyValue> cratetimeRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : cratetime.entrySet()) {
+                cratetimeRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            result.setCratetimeList(cratetimeRes);
+        }
+        return result;
+    }
+
+    @Override
+    public EnrollmentStatisticsGraduationInfoVo getEnrollmentStatisticsGraduationInfo(EnrollmentStatisticsGraduationInfoDto dto) {
+        EnrollmentStatisticsGraduationInfoVo result = new EnrollmentStatisticsGraduationInfoVo();
+        LocalDate day = LocalDate.parse(dto.getDay());
+        String year = String.valueOf(day.getYear());
+        //根据天获取毕业院校
+        MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByDay = new MPJLambdaWrapper<>();
+        pbCseFeeobjupdateByDay
+                .distinct()
+                .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
+                .select("ifnull(t.graduations,'未知') as graduations")
+                .eq(PbCseFeeobjupdate::getEnteryear, year)
+                .like(PbCseFeeobjupdate::getCratetime, day)
+        ;
+        List<PbCseFeeobjupdate> pbCseFeeobjupdateByDayList = this.selectJoinList(PbCseFeeobjupdate.class, pbCseFeeobjupdateByDay);
+
+        if(pbCseFeeobjupdateByDayList != null && !pbCseFeeobjupdateByDayList.isEmpty()){
+            //毕业学校排行
+            Map<String, Long> graduations = pbCseFeeobjupdateByDayList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getGraduations, Collectors.counting()));
+            if(!graduations.isEmpty()){
+                graduations = graduations.entrySet().stream()
+                        .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                                (e1, e2) -> e1, LinkedHashMap::new));
+            }
+            List<EnrollmentStatisticsInfoKeyValue> graduationRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : graduations.entrySet()) {
+                graduationRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+            }
+
+            result.setGraduationList(graduationRes);
+        }
+
+        return result;
+    }
 }

src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -156,7 +156,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 }else if("qfje".equals(dto.getField())){
                     pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getQfje);
                 }else if("factrecarmny".equals(dto.getField())){
-                    pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getQfje);
+                    pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getFactrecarmny);
                 }
             }else if("descend".equals(dto.getOrder())){
                 if("baseSemesterCn".equals(dto.getField())){
@@ -178,7 +178,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 }else if("qfje".equals(dto.getField())){
                     pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getQfje);
                 }else if("factrecarmny".equals(dto.getField())){
-                    pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getQfje);
+                    pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getFactrecarmny);
                 }
             }
         }

src/main/java/com/xjrsoft/module/student/vo/EnrollmentStatisticsCalendarInfoVo.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class EnrollmentStatisticsCalendarInfoVo {
+    /**
+     * 毕业院校
+     */
+    @ApiModelProperty("毕业院校")
+    private List<EnrollmentStatisticsInfoKeyValue> graduationList;
+    /**
+     * 每日招生人数
+     */
+    @ApiModelProperty("每日招生人数")
+    private List<EnrollmentStatisticsInfoKeyValue> cratetimeList;
+}

src/main/java/com/xjrsoft/module/student/vo/EnrollmentStatisticsGraduationInfoVo.java

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EnrollmentStatisticsGraduationInfoVo {
+    /**
+     * 毕业院校
+     */
+    @ApiModelProperty("毕业院校")
+    private List<EnrollmentStatisticsInfoKeyValue> graduationList;
+}

src/main/java/com/xjrsoft/module/student/vo/EnrollmentStatisticsInfoVo.java

@@ -38,16 +38,6 @@ public class EnrollmentStatisticsInfoVo {
      */
     @ApiModelProperty("住宿类型")
     private List<EnrollmentStatisticsInfoKeyValue> accommodationType;
-    /**
-     * 毕业院校
-     */
-    @ApiModelProperty("毕业院校")
-    private List<EnrollmentStatisticsInfoKeyValue> graduationList;
-    /**
-     * 每日招生人数
-     */
-    @ApiModelProperty("每日招生人数")
-    private List<EnrollmentStatisticsInfoKeyValue> cratetimeList;
     /**
      * 收费情况
      */