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

src/main/java/com/xjrsoft/module/liteflow/node/WfSkipGradeNode.java

@@ -1,31 +0,0 @@
-package com.xjrsoft.module.liteflow.node;
-
-import cn.hutool.core.convert.Convert;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorClassRelationService;
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * 学生跳级流程结束处理
- */
-@Component("Wf_skip_grade_node")
-public class WfSkipGradeNode extends NodeComponent {
-
-    @Autowired
-    private IBaseStudentBehaviorClassRelationService behaviorClassRelationService;
-
-    @Override
-    public void process() throws Exception {
-//        // 获取表单中数据编号
-//        Map<String, Object> params = this.getFirstContextBean();
-//        Object value = util.getFormDatKey(params,"id");
-//        Long formId = Convert.toLong(value);
-//        if (formId != null) {
-//            // 数据处理
-//            behaviorClassRelationService.dataCache(formId);
-//        }
-    }
-}

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentPostController.java

@@ -0,0 +1,109 @@
+package com.xjrsoft.module.oa.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.oa.dto.AddOfficialDocumentPostDto;
+import com.xjrsoft.module.oa.dto.OfficialDocumentPostPageDto;
+import com.xjrsoft.module.oa.dto.UpdateOfficialDocumentPostDto;
+import com.xjrsoft.module.oa.entity.OfficialDocumentPost;
+import com.xjrsoft.module.oa.service.IOfficialDocumentPostService;
+import com.xjrsoft.module.oa.vo.OfficialDocumentPostPageVo;
+import com.xjrsoft.module.oa.vo.OfficialDocumentPostVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/official" + "/officialDocumentPost")
+@Api(value = "/official"  + "/officialDocumentPost",tags = "公文发文代码")
+@AllArgsConstructor
+public class OfficialDocumentPostController {
+
+
+    private final IOfficialDocumentPostService officialDocumentPostService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="公文发文列表(分页)")
+    @SaCheckPermission("officialdocumentpost:detail")
+    public RT<PageOutput<OfficialDocumentPostPageVo>> page(@Valid OfficialDocumentPostPageDto dto){
+
+        LambdaQueryWrapper<OfficialDocumentPost> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(OfficialDocumentPost::getId)
+                .select(OfficialDocumentPost.class,x -> VoToColumnUtil.fieldsToColumns(OfficialDocumentPostPageVo.class).contains(x.getProperty()));
+        IPage<OfficialDocumentPost> page = officialDocumentPostService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<OfficialDocumentPostPageVo> pageOutput = ConventPage.getPageOutput(page, OfficialDocumentPostPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询公文发文信息")
+    @SaCheckPermission("officialdocumentpost:detail")
+    public RT<OfficialDocumentPostVo> info(@RequestParam Long id){
+        OfficialDocumentPost officialDocumentPost = officialDocumentPostService.getById(id);
+        if (officialDocumentPost == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(officialDocumentPost, OfficialDocumentPostVo.class));
+    }
+
+    @GetMapping(value = "/init-post-number")
+    @ApiOperation(value="新增时初始化公文号")
+    @SaCheckPermission("officialdocumentpost:detail")
+    public RT<String> initPostNumber(){
+        String maxPostNumber = officialDocumentPostService.getMaxPostNumber();
+        return RT.ok(maxPostNumber);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增公文发文")
+    @SaCheckPermission("officialdocumentpost:add")
+    public RT<Boolean> add(@Valid @RequestBody AddOfficialDocumentPostDto dto){
+        OfficialDocumentPost officialDocumentPost = BeanUtil.toBean(dto, OfficialDocumentPost.class);
+        boolean isSuccess = officialDocumentPostService.save(officialDocumentPost);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改公文发文")
+    @SaCheckPermission("officialdocumentpost:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateOfficialDocumentPostDto dto){
+
+        OfficialDocumentPost officialDocumentPost = BeanUtil.toBean(dto, OfficialDocumentPost.class);
+        return RT.ok(officialDocumentPostService.updateById(officialDocumentPost));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除公文发文")
+    @SaCheckPermission("officialdocumentpost:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(officialDocumentPostService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/oa/dto/AddOfficialDocumentPostDto.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.oa.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+public class AddOfficialDocumentPostDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 发文标题
+    */
+    @ApiModelProperty("发文标题")
+    private String postTitle;
+    /**
+    * 发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）
+    */
+    @ApiModelProperty("发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）")
+    private String postNumber;
+    /**
+    * 发文时间
+    */
+    @ApiModelProperty("发文时间")
+    private Date postDate;
+    /**
+    * 发文所属机构(xjr_department)
+    */
+    @ApiModelProperty("发文所属机构(xjr_department)")
+    private Long postDepartmentId;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+}

src/main/java/com/xjrsoft/module/oa/dto/OfficialDocumentPostPageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.oa.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 公文发文分页查询入参
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OfficialDocumentPostPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/oa/dto/UpdateOfficialDocumentPostDto.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.oa.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+public class UpdateOfficialDocumentPostDto extends AddOfficialDocumentPostDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/oa/entity/OfficialDocumentPost.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.oa.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+@TableName("official_document_post")
+@ApiModel(value = "official_document_post", description = "公文发文")
+public class OfficialDocumentPost implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 发文标题
+    */
+    @ApiModelProperty("发文标题")
+    private String postTitle;
+    /**
+    * 发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）
+    */
+    @ApiModelProperty("发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）")
+    private String postNumber;
+    /**
+    * 发文时间
+    */
+    @ApiModelProperty("发文时间")
+    private Date postDate;
+    /**
+    * 发文所属机构(xjr_department)
+    */
+    @ApiModelProperty("发文所属机构(xjr_department)")
+    private Long postDepartmentId;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+
+}

src/main/java/com/xjrsoft/module/oa/mapper/OfficialDocumentPostMapper.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.oa.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.oa.entity.OfficialDocumentPost;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Mapper
+public interface OfficialDocumentPostMapper extends MPJBaseMapper<OfficialDocumentPost> {
+    /**
+     * 获取最新的公文号，在数据库中最大的基础上+1
+     */
+    Integer getMaxPostNumber();
+}

src/main/java/com/xjrsoft/module/oa/service/IOfficialDocumentPostService.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.oa.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.oa.entity.OfficialDocumentPost;
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+
+public interface IOfficialDocumentPostService extends MPJBaseService<OfficialDocumentPost> {
+    /**
+     * 获取最新的公文号，在数据库中最大的基础上+1
+     */
+    String getMaxPostNumber();
+}

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentPostServiceImpl.java

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.oa.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.oa.entity.OfficialDocumentPost;
+import com.xjrsoft.module.oa.mapper.OfficialDocumentPostMapper;
+import com.xjrsoft.module.oa.service.IOfficialDocumentPostService;
+import com.xjrsoft.module.oa.utils.PostNumberUtil;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+
+/**
+* @title: 公文发文
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class OfficialDocumentPostServiceImpl extends MPJBaseServiceImpl<OfficialDocumentPostMapper, OfficialDocumentPost> implements IOfficialDocumentPostService {
+    private final OfficialDocumentPostMapper officialDocumentPostMapper;
+    @Override
+    public String getMaxPostNumber() {
+        Integer maxPostNumber = officialDocumentPostMapper.getMaxPostNumber();
+        return PostNumberUtil.initMaxPostNumber(maxPostNumber, 3);
+    }
+
+
+}

src/main/java/com/xjrsoft/module/oa/utils/PostNumberUtil.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.oa.utils;
+
+import java.time.LocalDate;
+
+/**
+ * @author dzx
+ * @date 2023/12/7
+ */
+public class PostNumberUtil {
+
+    public static String initMaxPostNumber(Integer maxPostNumber, int length){
+        LocalDate currentDate = LocalDate.now();
+        int year = currentDate.getYear();
+        return year + "【" + String.format("%0" + length + "d", maxPostNumber) + "】";
+    }
+}

src/main/java/com/xjrsoft/module/oa/vo/OfficialDocumentPostPageVo.java

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.oa.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 公文发文分页列表出参
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+public class OfficialDocumentPostPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 发文标题
+    */
+    @ApiModelProperty("发文标题")
+    private String postTitle;
+    /**
+    * 发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）
+    */
+    @ApiModelProperty("发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）")
+    private String postNumber;
+    /**
+    * 发文时间
+    */
+    @ApiModelProperty("发文时间")
+    private Date postDate;
+    /**
+    * 发文所属机构(xjr_department)
+    */
+    @ApiModelProperty("发文所属机构(xjr_department)")
+    private Long postDepartmentId;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+}

src/main/java/com/xjrsoft/module/oa/vo/OfficialDocumentPostVo.java

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.oa.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 公文发文表单出参
+* @Author dzx
+* @Date: 2023-12-07
+* @Version 1.0
+*/
+@Data
+public class OfficialDocumentPostVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 发文标题
+    */
+    @ApiModelProperty("发文标题")
+    private String postTitle;
+    /**
+    * 发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）
+    */
+    @ApiModelProperty("发文文号（发文文号自动生成，年+三位数字（三位数字从001开始）如2023001、2023002，依次生成）")
+    private String postNumber;
+    /**
+    * 发文时间
+    */
+    @ApiModelProperty("发文时间")
+    private Date postDate;
+    /**
+    * 发文所属机构(xjr_department)
+    */
+    @ApiModelProperty("发文所属机构(xjr_department)")
+    private Long postDepartmentId;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+
+
+}

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

@@ -0,0 +1,115 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.AddClassHonorsDto;
+import com.xjrsoft.module.student.dto.UpdateClassHonorsDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectTreeVo;
+import com.xjrsoft.module.student.vo.ClassHonorsSemesterClassTreeVo;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+
+import com.xjrsoft.module.student.dto.ClassHonorsPageDto;
+import com.xjrsoft.module.student.entity.ClassHonors;
+import com.xjrsoft.module.student.service.IClassHonorsService;
+import com.xjrsoft.module.student.vo.ClassHonorsPageVo;
+
+import com.xjrsoft.module.student.vo.ClassHonorsVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/classHonors")
+@Api(value = "/student"  + "/classHonors",tags = "班级荣誉代码")
+@AllArgsConstructor
+public class ClassHonorsController {
+
+
+    private final IClassHonorsService classHonorsService;
+
+    @GetMapping(value = "/semesterClassTree")
+    @ApiOperation(value="班级荣誉学期班级树")
+    @SaCheckPermission("classhonors:detail")
+    public RT<List<ClassHonorsSemesterClassTreeVo>> semesterClassTree(){
+        List<ClassHonorsSemesterClassTreeVo> list = classHonorsService.getSemesterClassTree();
+        if(ObjectUtil.isNull(list) || list.size() == 0){
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(list);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="班级荣誉列表(分页)")
+    @SaCheckPermission("classhonors:detail")
+    public RT<PageOutput<ClassHonorsPageVo>> page(@Valid ClassHonorsPageDto dto){
+        IPage<ClassHonorsPageVo> page = classHonorsService.getPagePC(dto);
+        PageOutput<ClassHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassHonorsPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询班级荣誉信息")
+    @SaCheckPermission("classhonors:detail")
+    public RT<ClassHonorsVo> info(@RequestParam Long id){
+        ClassHonorsVo classHonorsVo = classHonorsService.getInfoById(id);
+        if (classHonorsVo == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(classHonorsVo);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增班级荣誉")
+    @SaCheckPermission("classhonors:add")
+    public RT<Boolean> add(@Valid @RequestBody AddClassHonorsDto dto){
+        ClassHonors classHonors = BeanUtil.toBean(dto, ClassHonors.class);
+        boolean isSuccess = classHonorsService.save(classHonors);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改班级荣誉")
+    @SaCheckPermission("classhonors:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateClassHonorsDto dto){
+
+        ClassHonors classHonors = BeanUtil.toBean(dto, ClassHonors.class);
+        return RT.ok(classHonorsService.updateById(classHonors));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除班级荣誉")
+    @SaCheckPermission("classhonors:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(classHonorsService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<ClassHonorsPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(ClassHonorsPageVo.class).sheet().doReadSync();
+        Boolean result = classHonorsService.saveBatch(BeanUtil.copyToList(savedDataList, ClassHonors.class));
+        return RT.ok(result);
+    }
+
+}

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

@@ -56,6 +56,7 @@ public class StudentHonorsController {
         return RT.ok(pageOutput);
     }
 
+
     @GetMapping(value = "/tree")
     @ApiOperation(value = "学生荣誉列表(树)")
     @SaCheckPermission("studenthonors:detail")
@@ -84,11 +85,11 @@ public class StudentHonorsController {
     @ApiOperation(value="根据id查询学生荣誉信息")
     @SaCheckPermission("studenthonors:detail")
     public RT<StudentHonorsVo> info(@RequestParam Long id){
-        StudentHonors studentHonors = studentHonorsService.getById(id);
+        StudentHonorsVo studentHonors = studentHonorsService.getInfo(id);
         if (studentHonors == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(studentHonors, StudentHonorsVo.class));
+        return RT.ok(studentHonors);
     }
 
 
@@ -97,8 +98,12 @@ public class StudentHonorsController {
     @SaCheckPermission("studenthonors:add")
     public RT<Boolean> add(@Valid @RequestBody AddStudentHonorsDto dto){
         StudentHonors studentHonors = BeanUtil.toBean(dto, StudentHonors.class);
+        Integer sortCode = studentHonorsService.getSortCode();
+        studentHonors.setSortCode(sortCode);
+        studentHonors.setDataEntryMethod(2);
+        studentHonors.setStatus(1);
         boolean isSuccess = studentHonorsService.save(studentHonors);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

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

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class AddClassHonorsDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 荣誉级别(xjr_dictionary_item[honors_level])
+    */
+    @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
+    private String honorsLevel;
+    /**
+    * 荣誉等级(xjr_dictionary_item[honors_grade])
+    */
+    @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
+    private String honorsGrade;
+    /**
+    * 荣誉名称
+    */
+    @ApiModelProperty("荣誉名称")
+    private String name;
+    /**
+    * 获奖日期
+    */
+    @ApiModelProperty("获奖日期")
+    private Date awardDate;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+}

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

@@ -35,11 +35,6 @@ public class AddStudentHonorsDto implements Serializable {
     @ApiModelProperty("申请人")
     private Long applicantUserId;
     /**
-    * 数据录入方式 1=推荐 2=登记
-    */
-    @ApiModelProperty("数据录入方式 1=推荐 2=登记")
-    private Integer dataEntryMethod;
-    /**
     * 学期ID(base_semester)
     */
     @ApiModelProperty("学期ID(base_semester)")
@@ -63,7 +58,7 @@ public class AddStudentHonorsDto implements Serializable {
     * 所学专业
     */
     @ApiModelProperty("所学专业")
-    private String majorName;
+    private Long majorSetId;
     /**
     * 荣誉级别(xjr_dictionary_item[honors_level])
     */
@@ -88,16 +83,12 @@ public class AddStudentHonorsDto implements Serializable {
     * 获奖日期
     */
     @ApiModelProperty("获奖日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date awardDate;
     /**
     * 附件文件id
     */
     @ApiModelProperty("附件文件id")
     private Long fileId;
-    /**
-    * 状态（1:结束 0:未结束）
-    */
-    @ApiModelProperty("状态（1:结束 0:未结束）")
-    private Integer status;
 
 }

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

@@ -0,0 +1,50 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+
+/**
+* @title: 班级荣誉分页查询入参
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ClassHonorsPageDto extends PageInput {
+
+    /**
+     * 荣誉级别(xjr_dictionary_item[honors_level])
+     */
+    @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
+    private String honorsLevel;
+    /**
+     * 荣誉等级(xjr_dictionary_item[honors_grade])
+     */
+    @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
+    private String honorsGrade;
+    /**
+     * 获奖日期
+     */
+    @ApiModelProperty("获奖日期")
+    private Date awardDate;
+    /**
+     * 荣誉名称
+     */
+    @ApiModelProperty("荣誉名称")
+    private String name;
+    /**
+     * 学期ID(base_semester)
+     */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 班级id
+     */
+    @ApiModelProperty("班级id")
+    private Long classId;
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class UpdateClassHonorsDto extends AddClassHonorsDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,118 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+@TableName("class_honors")
+@ApiModel(value = "class_honors", description = "班级荣誉")
+public class ClassHonors implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+    * 荣誉级别(xjr_dictionary_item[honors_level])
+    */
+    @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
+    private String honorsLevel;
+    /**
+    * 荣誉等级(xjr_dictionary_item[honors_grade])
+    */
+    @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
+    private String honorsGrade;
+    /**
+    * 荣誉名称
+    */
+    @ApiModelProperty("荣誉名称")
+    private String name;
+    /**
+    * 获奖日期
+    */
+    @ApiModelProperty("获奖日期")
+    private Date awardDate;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+
+}

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

@@ -111,8 +111,8 @@ public class StudentHonors implements Serializable {
     /**
     * 所学专业
     */
-    @ApiModelProperty("所学专业")
-    private String majorName;
+    @ApiModelProperty("所学专业id")
+    private String majorSetId;
     /**
     * 荣誉级别(xjr_dictionary_item[honors_level])
     */

src/main/java/com/xjrsoft/module/student/mapper/ClassHonorsMapper.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
+import com.xjrsoft.module.student.dto.ClassHonorsPageDto;
+import com.xjrsoft.module.student.entity.ClassHonors;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
+import com.xjrsoft.module.student.vo.ClassHonorsPageVo;
+import com.xjrsoft.module.student.vo.ClassHonorsSemesterClassVo;
+import com.xjrsoft.module.student.vo.ClassHonorsVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Mapper
+public interface ClassHonorsMapper extends MPJBaseMapper<ClassHonors> {
+
+    /**
+     * 班级荣誉列表(分页)PC端
+     * @param dto
+     * @return
+     */
+    IPage<ClassHonorsPageVo> getPagePC(IPage<ClassHonorsPageDto> page, ClassHonorsPageDto dto);
+
+    /**
+     * 根据id查询班级荣誉信息
+     * @param id
+     * @return
+     */
+    ClassHonorsVo getInfoById(Long id);
+
+    /**
+     * 获取整个班级荣誉表出现的所有学期
+     * @return
+     */
+    List<ClassHonorsSemesterClassVo> getSemester();
+
+    /**
+     * 获取整个班级荣誉表出现的所有学期和其下的所有班级
+     * @return
+     */
+    List<ClassHonorsSemesterClassVo> getSemesterClass();
+
+}

src/main/java/com/xjrsoft/module/student/mapper/StudentHonorsMapper.java

@@ -1,13 +1,12 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
 import com.xjrsoft.module.student.entity.StudentHonors;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -25,4 +24,8 @@ public interface StudentHonorsMapper extends MPJBaseMapper<StudentHonors> {
     List<StudentHonorsListVo> getClassInfo();
 
     List<StudentHonorsListVo> getSemesterInfo();
+
+    StudentHonorsVo getInfo(Long id);
+
+    Integer getSortCode();
 }

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

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.ClassHonorsPageDto;
+import com.xjrsoft.module.student.entity.ClassHonors;
+import com.xjrsoft.module.student.vo.ClassHonorsPageVo;
+import com.xjrsoft.module.student.vo.ClassHonorsSemesterClassTreeVo;
+import com.xjrsoft.module.student.vo.ClassHonorsVo;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+
+public interface IClassHonorsService extends MPJBaseService<ClassHonors> {
+
+    /**
+     * 班级荣誉列表(分页)PC端
+     * @param dto
+     * @return
+     */
+    IPage<ClassHonorsPageVo> getPagePC(ClassHonorsPageDto dto);
+
+    /**
+     * 根据id查询班级荣誉信息
+     * @param id
+     * @return
+     */
+    ClassHonorsVo getInfoById(Long id);
+
+    /**
+     * 将所有班级荣誉的学期和班级构成树
+     * @return
+     */
+    List<ClassHonorsSemesterClassTreeVo> getSemesterClassTree();
+
+
+}

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

@@ -32,5 +32,4 @@ public interface ISchoolRollFurtherEducationService extends MPJBaseService<Schoo
      * @return
      */
     SchoolRollFurtherEducationVo getDetailById(Long id);
-
 }

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

@@ -6,7 +6,7 @@ import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
 import com.xjrsoft.module.student.entity.StudentHonors;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
 
 import java.util.List;
 
@@ -19,9 +19,29 @@ import java.util.List;
 
 public interface IStudentHonorsService extends MPJBaseService<StudentHonors> {
 
+
+    /**
+     * 分页查询
+     */
     Page<StudentHonorsPageVo> getPage(Page<StudentHonorsPageDto> page, StudentHonorsPageDto dto);
 
+    /**
+     * 查询班级信息
+     */
     List<StudentHonorsListVo> getClassInfo();
 
+    /**
+     * 查询学期信息
+     */
     List<StudentHonorsListVo> getSemesterInfo();
+
+    /**
+     * 根据id查询详情信息
+     */
+    StudentHonorsVo getInfo(Long id);
+
+    /**
+     * 查询最大的序号
+     */
+    Integer getSortCode();
 }

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

@@ -0,0 +1,97 @@
+package com.xjrsoft.module.student.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.utils.TreeUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.service.IBaseSemesterService;
+import com.xjrsoft.module.student.dto.ClassHonorsPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.entity.ClassHonors;
+import com.xjrsoft.module.student.mapper.ClassHonorsMapper;
+import com.xjrsoft.module.student.service.IClassHonorsService;
+import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+* @title: 班级荣誉
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ClassHonorsServiceImpl extends MPJBaseServiceImpl<ClassHonorsMapper, ClassHonors> implements IClassHonorsService {
+
+
+    private final ClassHonorsMapper classHonorsMapper;
+    private final IFileService fileService;
+    /**
+     * 班级荣誉列表(分页)PC端
+     * @param dto
+     * @return
+     */
+    @Override
+    public IPage<ClassHonorsPageVo> getPagePC(ClassHonorsPageDto dto) {
+        return classHonorsMapper.getPagePC(ConventPage.getPage(dto),dto);
+    }
+
+    /**
+     * 根据id查询班级荣誉信息
+     * @param id
+     * @return
+     */
+    @Override
+    public ClassHonorsVo getInfoById(Long id) {
+        ClassHonorsVo classHonorsVo = classHonorsMapper.getInfoById(id);
+        if(ObjectUtil.isNull(classHonorsVo)){
+            throw new MyException("该数据不存在");
+        }
+
+        // 添加文件列表
+        classHonorsVo.setFileList(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, classHonorsVo.getFileId())));
+        return classHonorsVo;
+    }
+
+    @Override
+    public List<ClassHonorsSemesterClassTreeVo> getSemesterClassTree() {
+        List<ClassHonorsSemesterClassTreeVo> treeVoList = new ArrayList<ClassHonorsSemesterClassTreeVo>();
+
+        //获取班级荣誉中出现的学期作为树的父级
+        classHonorsMapper.getSemester().forEach((node) -> {
+            treeVoList.add(new ClassHonorsSemesterClassTreeVo(){{
+                setId(node.getBaseSemesterId());
+                setName(node.getBaseSemesterIdCN());
+            }});
+        });
+
+        //获取班级荣誉中出现的学期下的所有班级作为树的子级
+        classHonorsMapper.getSemesterClass().forEach((node) -> {
+            treeVoList.add(new ClassHonorsSemesterClassTreeVo(){{
+                setId(node.getClassId());
+                setName(node.getClassIdCN());
+                setParentId(node.getBaseSemesterId());
+            }});
+        });
+
+        List<ClassHonorsSemesterClassTreeVo> resultTreeVoList = TreeUtil.build(treeVoList);
+        return resultTreeVoList;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
@@ -8,7 +10,8 @@ import com.xjrsoft.module.student.mapper.StudentHonorsMapper;
 import com.xjrsoft.module.student.service.IStudentHonorsService;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
+import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -28,8 +31,7 @@ public class StudentHonorsServiceImpl extends MPJBaseServiceImpl<StudentHonorsMa
     private final IFileService fileService;
     @Override
     public Page<StudentHonorsPageVo> getPage(Page<StudentHonorsPageDto> page, StudentHonorsPageDto dto) {
-        Page<StudentHonorsPageVo> result = studentHonorsMapper.getPage(page, dto);
-        return result;
+        return studentHonorsMapper.getPage(page, dto);
     }
 
     @Override
@@ -41,4 +43,19 @@ public class StudentHonorsServiceImpl extends MPJBaseServiceImpl<StudentHonorsMa
     public List<StudentHonorsListVo> getSemesterInfo() {
         return studentHonorsMapper.getSemesterInfo();
     }
+
+    @Override
+    public StudentHonorsVo getInfo(Long id) {
+        StudentHonorsVo result = studentHonorsMapper.getInfo(id);
+        if(ObjectUtil.isNotNull(result) && ObjectUtil.isNotNull(result.getFileId())){
+            result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+        }
+
+        return result;
+    }
+
+    @Override
+    public Integer getSortCode() {
+        return studentHonorsMapper.getSortCode();
+    }
 }

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

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 班级荣誉分页列表出参
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class ClassHonorsPageVo {
+
+    /**
+     * 主键编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+     * 序号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+     * 荣誉级别中文(xjr_dictionary_item[honors_level])
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("荣誉级别中文(xjr_dictionary_item[honors_level])")
+    @ApiModelProperty("荣誉级别中文(xjr_dictionary_item[honors_level])")
+    private String honorsLevelCN;
+    /**
+     * 荣誉等级中文(xjr_dictionary_item[honors_grade])
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("荣誉等级中文(xjr_dictionary_item[honors_grade])")
+    @ApiModelProperty("荣誉等级中文(xjr_dictionary_item[honors_grade])")
+    private String honorsGradeCN;
+    /**
+     * 荣誉名称
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("荣誉名称")
+    @ApiModelProperty("荣誉名称")
+    private String name;
+    /**
+     * 获奖日期
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("获奖日期")
+    @ApiModelProperty("获奖日期")
+    private Date awardDate;
+}

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

@@ -0,0 +1,30 @@
+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;
+
+/**
+* @title: 班级荣誉分页列表学期班级树出参
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class ClassHonorsSemesterClassTreeVo implements ITreeNode<ClassHonorsSemesterClassTreeVo,Long>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty("名字")
+    private String name;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    private List<ClassHonorsSemesterClassTreeVo> children;
+}

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

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 班级荣誉分页列表学期班级出参
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class ClassHonorsSemesterClassVo {
+
+    /**
+     * 学期ID(base_semester)
+     */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 学期ID中文(base_semester)
+     */
+    @ApiModelProperty("学期ID中文(base_semester)")
+    private String baseSemesterIdCN;
+    /**
+     * 班级id
+     */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+     * 班级id中文
+     */
+    @ApiModelProperty("班级id中文")
+    private String classIdCN;
+}

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

@@ -0,0 +1,92 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.module.system.entity.File;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 班级荣誉表单出参
+* @Author szs
+* @Date: 2023-12-06
+* @Version 1.0
+*/
+@Data
+public class ClassHonorsVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 学期ID中文(base_semester)
+     */
+    @ApiModelProperty("学期ID中文(base_semester)")
+    private String baseSemesterIdCN;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+     * 班级id中文
+     */
+    @ApiModelProperty("班级id中文")
+    private String classIdCN;
+    /**
+    * 荣誉级别(xjr_dictionary_item[honors_level])
+    */
+    @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
+    private String honorsLevel;
+    /**
+     * 荣誉级别中文(xjr_dictionary_item[honors_level])
+     */
+    @ApiModelProperty("荣誉级别中文(xjr_dictionary_item[honors_level])")
+    private String honorsLevelCN;
+    /**
+    * 荣誉等级(xjr_dictionary_item[honors_grade])
+    */
+    @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
+    private String honorsGrade;
+    /**
+     * 荣誉等级中文(xjr_dictionary_item[honors_grade])
+     */
+    @ApiModelProperty("荣誉等级中文(xjr_dictionary_item[honors_grade])")
+    private String honorsGradeCN;
+    /**
+    * 荣誉名称
+    */
+    @ApiModelProperty("荣誉名称")
+    private String name;
+    /**
+    * 获奖日期
+    */
+    @ApiModelProperty("获奖日期")
+    private Date awardDate;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+    /**
+     * 该处分信息下的文件集合
+     */
+    @ApiModelProperty("文件集合")
+    private List<File> fileList;
+}

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

@@ -70,5 +70,6 @@ public class StudentHonorsPageVo {
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
 
-
+    @ApiModelProperty("教师id")
+    private Long teacherId;
 }

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

@@ -1,13 +1,11 @@
 package com.xjrsoft.module.student.vo;
 
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 
 /**
 * @title: 学生荣誉表单出参
@@ -24,34 +22,39 @@ public class StudentHonorsVo {
     @ApiModelProperty("主键编号")
     private Long id;
     /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
     * 申请人
     */
-    @ApiModelProperty("申请人")
+    @ApiModelProperty("申请人姓名")
+    private String applicantUserName;
+
+    @ApiModelProperty("申请人Id")
     private Long applicantUserId;
     /**
-    * 数据录入方式 1=推荐 2=登记
-    */
-    @ApiModelProperty("数据录入方式 1=推荐 2=登记")
-    private Integer dataEntryMethod;
-    /**
     * 学期ID(base_semester)
     */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
+    @ApiModelProperty("学生姓名")
+    private String studentName;
     /**
     * 班级id
     */
-    @ApiModelProperty("班级id")
-    private Long classId;
+    @ApiModelProperty("年级")
+    private String gradeName;
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
     /**
     * 学生用户编号
     */
-    @ApiModelProperty("学生用户编号")
+    @ApiModelProperty("班级")
+    private String className;
+
+    @ApiModelProperty("班级Id")
+    private Long classId;
+
+    @ApiModelProperty("学期Id")
+    private Long baseSemesterId;
+
+    @ApiModelProperty("学生userId")
     private Long studentUserId;
     /**
     * 学号
@@ -62,22 +65,34 @@ public class StudentHonorsVo {
     * 所学专业
     */
     @ApiModelProperty("所学专业")
-    private String majorName;
+    private String majorSetName;
+
+    @ApiModelProperty("所学专业Id")
+    private Long majorSetId;
     /**
     * 荣誉级别(xjr_dictionary_item[honors_level])
     */
     @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
     private String honorsLevel;
+
+    @ApiModelProperty("荣誉级别-中文")
+    private String honorsLevelCn;
     /**
     * 荣誉等级(xjr_dictionary_item[honors_grade])
     */
     @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
     private String honorsGrade;
+
+    @ApiModelProperty("荣誉等级-中文")
+    private String honorsGradeCn;
     /**
     * 荣誉类型(xjr_dictionary_item[honors_type])
     */
     @ApiModelProperty("荣誉类型(xjr_dictionary_item[honors_type])")
     private String honorsType;
+
+    @ApiModelProperty("荣誉类型-中文")
+    private String honorsTypeCn;
     /**
     * 荣誉名称
     */
@@ -93,12 +108,8 @@ public class StudentHonorsVo {
     */
     @ApiModelProperty("附件文件id")
     private Long fileId;
-    /**
-    * 状态（1:结束 0:未结束）
-    */
-    @ApiModelProperty("状态（1:结束 0:未结束）")
-    private Integer status;
-
 
+    @ApiModelProperty("附件列表")
+    private List<File> fileInfos;
 
 }

src/main/resources/mapper/student/BaseStudentBehaviorManageMapper.xml

@@ -67,7 +67,12 @@
 
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentBehaviorManageMobilePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobilePageVo">
         SELECT t1.sort_code,t1.name,t1.class_name,t.assessment_date,
-        t3.name AS categoryName,t4.name AS projectName,t.score,t4.score_type  FROM base_student_behavior_manage t
+        t3.name AS categoryName,t4.name AS projectName,t.score,t4.score_type,
+        t2.name AS assessmentUserName,
+        t.assessment_address,
+        t3.name AS behaviorCategoryName,
+        t4.name AS behaviorProjectName
+        FROM base_student_behavior_manage t
         INNER JOIN base_student_behavior_student_relation t1 ON t1.base_student_behavior_manage_id = t.id
         <if test="dto.studentName != null and dto.studentName != ''">
             and t1.name like concat('%',#{dto.studentName},'%')

src/main/resources/mapper/student/ClassHonorsMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.ClassHonorsMapper">
+    <select id="getPagePC" parameterType="com.xjrsoft.module.student.dto.ClassHonorsPageDto" resultType="com.xjrsoft.module.student.vo.ClassHonorsPageVo">
+        SELECT
+            t.id,
+            t.sort_code,
+            t1.name AS honorsLevelCN,
+            t2.name AS honorsGradeCN,
+            t.name,
+            t.award_date
+        FROM class_honors t
+            LEFT JOIN xjr_dictionary_detail t1 ON t1.code = t.honors_level
+            LEFT JOIN xjr_dictionary_detail t2 ON t2.code = t.honors_grade
+        WHERE
+            t.delete_mark = 0
+            <if test="dto.honorsLevel != null and dto.honorsLevel != ''">
+                and t.honors_level = #{dto.honorsLevel}
+            </if>
+            <if test="dto.honorsGrade != null and dto.honorsGrade != ''">
+                and t.honors_grade = #{dto.honorsGrade}
+            </if>
+            <if test="dto.awardDate != null and dto.awardDate != ''">
+                and t.award_date = #{dto.awardDate}
+            </if>
+            <if test="dto.name != null and dto.name != ''">
+                and t.name like concat('%',#{dto.name},'%')
+            </if>
+            <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
+                and t.base_semester_id = #{dto.baseSemesterId}
+            </if>
+            <if test="dto.classId != null and dto.classId > 0">
+                and t.class_id = #{dto.classId}
+            </if>
+        ORDER BY
+            t.id DESC;
+    </select>
+    <select id="getInfoById"
+            resultType="com.xjrsoft.module.student.vo.ClassHonorsVo">
+        SELECT
+            t.*,
+            t1.name AS honorsLevelCN,
+            t2.name AS honorsGradeCN,
+            t3.name AS baseSemesterIdCN,
+            t4.name AS classIdCN,
+        FROM class_honors t
+            LEFT JOIN xjr_dictionary_detail t1 ON t1.code = t.honors_level
+            LEFT JOIN xjr_dictionary_detail t2 ON t2.code = t.honors_grade
+            LEFT JOIN base_semester t3 ON t3.id = t.base_semester_id
+            LEFT JOIN base_class t4 ON t4.id = t.class_id
+        WHERE
+            t.id = #{id} AND t.delete_mark = 0;
+    </select>
+    <select id="getSemester"
+            resultType="com.xjrsoft.module.student.vo.ClassHonorsSemesterClassVo">
+        select
+            distinct
+            t.base_semester_id,
+            t1.name AS baseSemesterIdCN
+        from class_honors t
+                 left join base_semester t1 on t1.id = t.base_semester_id
+        where
+            t.delete_mark = 0;
+    </select>
+    <select id="getSemesterClass"
+            resultType="com.xjrsoft.module.student.vo.ClassHonorsSemesterClassVo">
+        select
+            distinct
+            t.base_semester_id,
+            t.class_id,
+            t1.name AS semesterName,
+            t2.name AS classIdCN
+        from class_honors t
+                 left join base_semester t1 on t1.id = t.base_semester_id
+                 left join base_class t2 on t2.id = t.class_id
+        where
+            t.delete_mark = 0;
+    </select>
+</mapper>

src/main/resources/mapper/student/OfficialDocumentPostMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.oa.mapper.OfficialDocumentPostMapper">
+    <select id="getMaxPostNumber" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(SUBSTR(post_number,6,3)), 0) + 1 FROM official_document_post WHERE YEAR(post_date) = YEAR(NOW())
+    </select>
+
+</mapper>

src/main/resources/mapper/student/SchoolRollFurtherEducationMapper.xml

@@ -17,7 +17,8 @@
             t5.name AS backMajorSetIdCN,
             t6.name AS applicantUserIdCN,
             t.reason,
-            t.enabled_mark AS enabledMark
+            t.enabled_mark AS enabledMark,
+            t.status
         FROM school_roll_further_education t
                  LEFT JOIN xjr_user t1 ON (t.student_id = t1.id)
                  LEFT JOIN base_major_set t2 ON (t.before_major_set_id = t2.id)

src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -5,12 +5,12 @@
 <mapper namespace="com.xjrsoft.module.student.mapper.StudentHonorsMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.StudentHonorsPageDto" resultType="com.xjrsoft.module.student.vo.StudentHonorsPageVo">
         SELECT t1.id,t1.sort_code,t2.name AS student_name,t1.student_id,t3.name AS honors_level,t4.name AS honors_type,
-        t5.name AS honors_grade,t1.name AS honors_name, t1.award_date,t1.status,t1.file_id FROM student_honors t1
+        t5.name AS honors_grade,t1.name, t1.award_date,t1.status,t1.file_id FROM student_honors t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
         LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098
-        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId}
+        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} and t1.status = 1
     </select>
 
     <select id="getSemesterInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsListVo">
@@ -23,4 +23,26 @@
         INNER JOIN base_class t2 ON t1.class_id = t2.id
         WHERE t1.delete_mark = 0
     </select>
+
+    <select id="getInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsVo">
+        SELECT t1.id,t2.name AS student_name,t1.student_id,t3.grade_id,t4.name AS grade_name,t1.class_id,t5.name AS class_name,
+        t1.major_set_id,t11.name AS major_set_name,t1.applicant_user_id,t1.name AS applicant_user_name,t1.award_date,
+        t1.name,t1.honors_level,t8.name AS honors_level_cn,
+        t1.honors_type,t9.name AS honors_type_cn,t1.honors_grade, t10.name AS honors_grade_cn,
+        t1.file_id,t1.base_semester_id,t1.student_user_id  FROM student_honors t1
+        LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
+        LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
+        LEFT JOIN base_grade t4 ON t3.grade_id = t4.id
+        LEFT JOIN base_class t5 ON t1.class_id = t5.id
+        LEFT JOIN base_major_set t6 ON t3.major_set_id = t6.id
+        LEFT JOIN xjr_user t7 ON t1.applicant_user_id = t7.id
+        LEFT JOIN xjr_dictionary_detail t8 ON t1.honors_level = t8.code AND t8.item_id = 1731576278748352514
+        LEFT JOIN xjr_dictionary_detail t9 ON t1.honors_type = t9.code AND t9.item_id = 1731577666295418881
+        LEFT JOIN xjr_dictionary_detail t10 ON t1.honors_grade = t10.code AND t10.item_id = 1731577201793028098
+        LEFT JOIN base_major_set t11 ON t1.major_set_id = t11.id
+        WHERE t1.id = #{id} and t1.delete_mark = 0
+    </select>
+    <select id="getSortCode" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(IFNULL(sort_code, 0)), 0) + 1 FROM student_honors
+    </select>
 </mapper>

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -921,4 +921,34 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 班级荣誉
+     *
+     */
+    @Test
+    public void gcClassHonors() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("class_honors");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(true);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }