收费管理

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

@@ -12,6 +12,7 @@ import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
+import com.xjrsoft.module.student.vo.MobileClassStatisticsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -56,11 +57,11 @@ public class BaseStudentInfoController {
         return RT.ok(result);
     }
 
-    @GetMapping(value = "/class-statistics")
-    @ApiOperation(value="班级统计")
+    @GetMapping(value = "/mobile-class-statistics")
+    @ApiOperation(value="班级统计(移动端)")
     @SaCheckPermission("basestudentpost:detail")
-    public RT<BaseStudentInfoPageDataVo> classStatistics(@Valid BaseStudentInfoPageDto dto){
-        BaseStudentInfoPageDataVo result = baseStudentSchoolRollService.getMobilePageStatistics(dto);
+    public RT<MobileClassStatisticsVo> mobileClassStatistics(@Valid BaseStudentInfoPageDto dto){
+        MobileClassStatisticsVo result = baseStudentSchoolRollService.getMobileClassStatistics(dto);
         return RT.ok(result);
     }
 

src/main/java/com/xjrsoft/module/student/entity/PbVXsxxsfytb.java

@@ -86,26 +86,6 @@ public class PbVXsxxsfytb implements Serializable {
     * 
     */
     @ApiModelProperty("")
-    private String userdef1;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String recruiters;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String userdef2;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String admissions;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
     private String address;
     /**
     * 
@@ -116,26 +96,6 @@ public class PbVXsxxsfytb implements Serializable {
     * 
     */
     @ApiModelProperty("")
-    private String nationality;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String property;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String remarks;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String graduations;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
     private String state;
     /**
     * 
@@ -146,31 +106,11 @@ public class PbVXsxxsfytb implements Serializable {
     * 
     */
     @ApiModelProperty("")
-    private BigDecimal standardar;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
     private BigDecimal factar;
     /**
     * 
     */
     @ApiModelProperty("")
-    private BigDecimal adjustmny;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private BigDecimal jmje;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private BigDecimal arrearagemny;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
     private BigDecimal factrecarmny;
     /**
     * 
@@ -227,6 +167,4 @@ public class PbVXsxxsfytb implements Serializable {
     */
     @ApiModelProperty("")
     private String pksfxxytb;
-
-
 }

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

@@ -8,6 +8,7 @@ import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
+import com.xjrsoft.module.student.vo.MobileClassStatisticsVo;
 
 /**
 * @title: 奖学金申请
@@ -40,4 +41,6 @@ public interface IBaseStudentSchoolRollService extends MPJBaseService<BaseStuden
      * @return
      */
     BaseStudentInfoPageDataVo getMobilePageStatistics(BaseStudentInfoPageDto dto);
+
+    MobileClassStatisticsVo getMobileClassStatistics(BaseStudentInfoPageDto dto);
 }

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

@@ -15,10 +15,7 @@ import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
-import com.xjrsoft.module.student.vo.BaseStudentInfoCategoryVo;
-import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
-import com.xjrsoft.module.student.vo.BaseStudentInfoPageDataVo;
-import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
+import com.xjrsoft.module.student.vo.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -137,4 +134,9 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
 
         return result;
     }
+
+    @Override
+    public MobileClassStatisticsVo getMobileClassStatistics(BaseStudentInfoPageDto dto) {
+        return null;
+    }
 }

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

@@ -0,0 +1,111 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 班级统计出参
+* @Author szs
+* @Date: 2024年04月02日
+* @Version 1.0
+*/
+@Data
+public class MobileClassStatisticsVo {
+
+
+    @ApiModelProperty("主键编号")
+    private Long classId;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("总人数")
+    private Integer headcount;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("学号")
+    private String studentId;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("本人电话")
+    private String phone;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("监护人电话")
+    private String guardianPhone;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("班主任名称")
+    private String teacherName;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("班主任电话")
+    private String teacherPhone;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("班级名称")
+    private String className;
+
+    /**
+     * 学习形式
+     */
+    @ApiModelProperty("学习形式")
+    private String rollModality;
+    /**
+     * 学习形式
+     */
+    @ApiModelProperty("学习形式")
+    private String rollModalityCode;
+    /**
+     * 学籍状态(xjr_dictionary_item[archives_status])
+     */
+    @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
+    private String archivesStatus;
+    /**
+     * 学籍状态(xjr_dictionary_item[archives_status])
+     */
+    @ApiModelProperty("学籍状态(xjr_dictionary_item[archives_status])")
+    private String archivesStatusCode;
+    /**
+     * 就读方式(xjr_dictionary_item[stduy_status])
+     */
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
+
+    /**
+     * 就读方式(xjr_dictionary_item[stduy_status])
+     */
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatusCode;
+
+    @ApiModelProperty("床位信息")
+    private String bedInfo;
+
+    @ApiModelProperty("头像")
+    private String avatar;
+
+    @ApiModelProperty("出生日期")
+    private Date birthDate;
+
+    @ApiModelProperty("民族")
+    private String nation;
+
+    private String majorSetName;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String gender;
+
+    /**
+     * 性别中文
+     */
+    @ApiModelProperty("性别中文")
+    private String genderCn;
+}

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

@@ -75,21 +75,11 @@ public class PbVXsxxsfytbPageVo {
     @ApiModelProperty("身份证号")
     private String personalid;
     /**
-    *
-    */
-    @ApiModelProperty("")
-    private String userdef1;
-    /**
     * 招生老师
     */
     @ApiModelProperty("招生老师")
     private String recruiters;
     /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String userdef2;
-    /**
     * 录取号
     */
     @ApiModelProperty("录取号")

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

@@ -77,21 +77,11 @@ public class PbVXsxxsfytbVo {
     /**
     * 
     */
-    @ApiModelProperty("")
-    private String userdef1;
-    /**
-    * 
-    */
     @ApiModelProperty("招生老师")
     private String recruiters;
     /**
     * 
     */
-    @ApiModelProperty("")
-    private String userdef2;
-    /**
-    * 
-    */
     @ApiModelProperty("录取号")
     private String admissions;
     /**