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

src/main/java/com/xjrsoft/common/enums/EnrollTypeEnum.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @description： 招生类型
+ * @Author: SZS
+ * @Date: 2024/01/30
+ */
+public enum EnrollTypeEnum {
+
+    /**
+     * 春季招生
+     */
+    SPRING_ENROLLMENT("FB2701", "春季招生"),
+    /**
+     *  秋季招生
+     */
+    AUTUMN_ENROLLMENT("FB2702", "秋季招生");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    EnrollTypeEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

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

@@ -1,94 +1,133 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.enums.EnrollTypeEnum;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.student.dto.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.excel.EasyExcel;
-import com.xjrsoft.module.student.vo.*;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import org.springframework.http.ResponseEntity;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
 import com.xjrsoft.module.student.entity.PbCseFeeobjupdate;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
-
+import com.xjrsoft.module.student.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @title: 
-* @Author szs
-* @Date: 2024-03-29
-* @Version 1.0
-*/
+ * @title:
+ * @Author szs
+ * @Date: 2024-03-29
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/student" + "/pbCseFeeobjupdate")
-@Api(value = "/student"  + "/pbCseFeeobjupdate",tags = "攀宝学生信息")
+@Api(value = "/student" + "/pbCseFeeobjupdate", tags = "攀宝学生信息")
 @AllArgsConstructor
 public class PbCseFeeobjupdateController {
 
 
     private final IPbCseFeeobjupdateService pbCseFeeobjupdateService;
 
+    private final IBaseGradeService baseGradeService;
+
+    @GetMapping(value = "/grade-enrolltype-tree")
+    @ApiOperation(value = "年级招生类型树")
+    public RT<List<GradeEnrolltypeTreeVo>> gradeEnrolltypeTree() {
+
+        List<BaseGrade> baseGradeList = baseGradeService.list(
+                Wrappers.<BaseGrade>query().lambda()
+                        .eq(BaseGrade::getDeleteMark, DeleteMark.NODELETE));
+
+        List<GradeEnrolltypeTreeVo> voList = new ArrayList<>();
+
+        for (BaseGrade baseGrade : baseGradeList) {
+            voList.add(new GradeEnrolltypeTreeVo() {{
+                setId(baseGrade.getId().toString());
+                setName(baseGrade.getName());
+            }});
+            voList.add(new GradeEnrolltypeTreeVo() {{
+                setId(baseGrade.getId().toString() + "_" + EnrollTypeEnum.SPRING_ENROLLMENT.getCode());
+                setName(EnrollTypeEnum.SPRING_ENROLLMENT.getValue());
+                setParentId(baseGrade.getId().toString());
+            }});
+            voList.add(new GradeEnrolltypeTreeVo() {{
+                setId(baseGrade.getId().toString() + "_" + EnrollTypeEnum.AUTUMN_ENROLLMENT.getCode());
+                setName(EnrollTypeEnum.AUTUMN_ENROLLMENT.getValue());
+                setParentId(baseGrade.getId().toString());
+            }});
+        }
+
+        List<GradeEnrolltypeTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
+
     @GetMapping(value = "/enrollment-statistics")
-    @ApiOperation(value="招生统计")
+    @ApiOperation(value = "招生统计")
     @SaCheckPermission("pbcsefeeobjupdate:detail")
-    public RT<EnrollmentStatisticsInfoVo> getEnrollmentStatisticsInfo(@Valid EnrollmentStatisticsInfoDto dto){
+    public RT<EnrollmentStatisticsInfoVo> getEnrollmentStatisticsInfo(@Valid EnrollmentStatisticsInfoDto dto) {
         EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsInfo(dto);
         return RT.ok(enrollmentStatisticsInfoVo);
     }
 
     @GetMapping(value = "/enrollment-statistics-calendar")
-    @ApiOperation(value="招生统计每日动态数据")
+    @ApiOperation(value = "招生统计每日动态数据")
     @SaCheckPermission("pbcsefeeobjupdate:detail")
-    public RT<EnrollmentStatisticsCalendarInfoVo> getEnrollmentStatisticsCalendarInfo(@Valid EnrollmentStatisticsCalendarInfoDto dto){
+    public RT<EnrollmentStatisticsCalendarInfoVo> getEnrollmentStatisticsCalendarInfo(@Valid EnrollmentStatisticsCalendarInfoDto dto) {
         EnrollmentStatisticsCalendarInfoVo enrollmentStatisticsCalendarInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsCalendarInfo(dto);
         return RT.ok(enrollmentStatisticsCalendarInfoVo);
     }
 
     @GetMapping(value = "/enrollment-statistics-graduation")
-    @ApiOperation(value="招生统计毕业学校数据")
+    @ApiOperation(value = "招生统计毕业学校数据")
     @SaCheckPermission("pbcsefeeobjupdate:detail")
-    public RT<EnrollmentStatisticsGraduationInfoVo> getEnrollmentStatisticsGraduationInfo(@Valid EnrollmentStatisticsGraduationInfoDto dto){
+    public RT<EnrollmentStatisticsGraduationInfoVo> getEnrollmentStatisticsGraduationInfo(@Valid EnrollmentStatisticsGraduationInfoDto dto) {
         EnrollmentStatisticsGraduationInfoVo enrollmentStatisticsGraduationInfoVo = pbCseFeeobjupdateService.getEnrollmentStatisticsGraduationInfo(dto);
         return RT.ok(enrollmentStatisticsGraduationInfoVo);
     }
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="列表(分页)")
+    @ApiOperation(value = "列表(分页)")
     @SaCheckPermission("pbcsefeeobjupdate:detail")
-    public RT<PageOutput<PbCseFeeobjupdatePageVo>> page(@Valid PbCseFeeobjupdatePageDto dto){
-
+    public RT<PageOutput<PbCseFeeobjupdatePageVo>> page(@Valid PbCseFeeobjupdatePageDto dto) {
         LambdaQueryWrapper<PbCseFeeobjupdate> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    //.orderByDesc(PbCseFeeobjupdate::getId)
-                .select(PbCseFeeobjupdate.class,x -> VoToColumnUtil.fieldsToColumns(PbCseFeeobjupdatePageVo.class).contains(x.getProperty()));
+                .select(PbCseFeeobjupdate.class, x -> VoToColumnUtil.fieldsToColumns(PbCseFeeobjupdatePageVo.class).contains(x.getProperty()))
+                .orderByDesc(PbCseFeeobjupdate::getCratetime)
+        ;
         IPage<PbCseFeeobjupdate> page = pbCseFeeobjupdateService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<PbCseFeeobjupdatePageVo> pageOutput = ConventPage.getPageOutput(page, PbCseFeeobjupdatePageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询信息")
+    @ApiOperation(value = "根据id查询信息")
     @SaCheckPermission("pbcsefeeobjupdate:detail")
-    public RT<PbCseFeeobjupdateVo> info(@RequestParam Long id){
+    public RT<PbCseFeeobjupdateVo> info(@RequestParam Long id) {
         PbCseFeeobjupdate pbCseFeeobjupdate = pbCseFeeobjupdateService.getById(id);
         if (pbCseFeeobjupdate == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(BeanUtil.toBean(pbCseFeeobjupdate, PbCseFeeobjupdateVo.class));
     }
@@ -97,16 +136,16 @@ public class PbCseFeeobjupdateController {
     @PostMapping
     @ApiOperation(value = "新增")
     @SaCheckPermission("pbcsefeeobjupdate:add")
-    public RT<Boolean> add(@Valid @RequestBody AddPbCseFeeobjupdateDto dto){
+    public RT<Boolean> add(@Valid @RequestBody AddPbCseFeeobjupdateDto dto) {
         PbCseFeeobjupdate pbCseFeeobjupdate = BeanUtil.toBean(dto, PbCseFeeobjupdate.class);
         boolean isSuccess = pbCseFeeobjupdateService.save(pbCseFeeobjupdate);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改")
     @SaCheckPermission("pbcsefeeobjupdate:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdatePbCseFeeobjupdateDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdatePbCseFeeobjupdateDto dto) {
 
         PbCseFeeobjupdate pbCseFeeobjupdate = BeanUtil.toBean(dto, PbCseFeeobjupdate.class);
         return RT.ok(pbCseFeeobjupdateService.updateById(pbCseFeeobjupdate));
@@ -116,10 +155,11 @@ public class PbCseFeeobjupdateController {
     @DeleteMapping
     @ApiOperation(value = "删除")
     @SaCheckPermission("pbcsefeeobjupdate:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(pbCseFeeobjupdateService.removeBatchByIds(ids));
 
     }
+
     @PostMapping("/import")
     @ApiOperation(value = "导入")
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {

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

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.student.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,5 +24,20 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class PbCseFeeobjupdatePageDto extends PageInput {
 
-
+    @ApiModelProperty("id")
+    private String gradeEnrolltypeId;
+    /**
+     *
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("姓名")
+    private String feeobjname;
+    /**
+     *
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("身份证号")
+    private String personalid;
 }

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

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author szs
+ * @date 2024/3/25
+ */
+@Data
+public class GradeEnrolltypeTreeVo implements ITreeNode<GradeEnrolltypeTreeVo, String>, Serializable {
+    @ApiModelProperty("id")
+    private String id;
+
+
+    @ApiModelProperty("name")
+    private String name;
+
+
+    @ApiModelProperty("parentId")
+    private String parentId;
+
+
+    @ApiModelProperty("children")
+    private List<GradeEnrolltypeTreeVo> children;
+
+}

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

@@ -28,175 +28,175 @@ public class PbCseFeeobjupdatePageVo {
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("学生主键")
     private String pkfeeobj;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("学号")
     private String studentcode;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("姓名")
     private String feeobjname;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("身份证号")
     private String personalid;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("民族")
     private String nationality;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("出生年月")
     private String birthday;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属院系编码")
     private String deptcode;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属院系名称")
     private String deptname;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属专业代码")
     private String speccode;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属专业名称")
     private String specname;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属班级代码")
     private String classcode;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("所属班级名称")
     private String classname;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("学制")
     private String ratetypename;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("性别")
     private String sex;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("在校状态")
     private String state;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("入校年度")
     private String enteryear;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("离校年度")
     private String leaveyear;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("学生联系电话")
     private String telephone;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("家长联系电话")
     private String jzlxdh;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("志愿调剂专业")
     private String zytjspec;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("身高")
     private String sg;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("体重")
     private String tz;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("招生老师")
     private String recruiters;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("毕业学校")
     private String graduations;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("备注")
     private String remarks;
     /**
     * 
@@ -210,35 +210,35 @@ public class PbCseFeeobjupdatePageVo {
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("资助类型")
     private String resourcename;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("住宿类型")
     private String quartername;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("地址")
     private String address;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("创建时间")
     private String cratetime;
     /**
     * 
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("")
-    @ApiModelProperty("")
+    @ApiModelProperty("更新时间")
     private String updatetime;
     /**
     *