Merge branch 'pre'

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

@@ -10,12 +10,12 @@ public enum RoomApplicantTypeEnum {
     /**
      * 留宿
      * */
-    RaOvernightStay("ra_overnight_stay", "留宿"),
+    ToBeBoarder("to_be_boarder", "走转住"),
 
     /**
      * 不留宿
      * */
-    RaNoOvernightStay("ra_no_overnight_stay", "不留宿");
+    ToBeDayPupil("to_be_dayPupil", "住转走");
 
     final String code;
     final String value;

src/main/java/com/xjrsoft/common/utils/WeChatUtil.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.common.utils;
 
 
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HttpUtil;
@@ -52,6 +51,12 @@ public class WeChatUtil {
     @Value("${xjrsoft.appletWeChat.appSecret}")
     public String appletAppSecret;
 
+    @Value("${xjrsoft.weChatMessageTemplate.commonTemplate}")
+    public String commonTemplate;
+
+    @Value("${xjrsoft.weChatMessageTemplate.assessmentTemplate}")
+    public String assessmentTemplate;
+
     //公众号获取Openid
     public WeChatUserInfo getMpOpenid(String code) {
         HashMap<String, Object> paramMap = new HashMap<>();

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -12,6 +12,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.assessment.dto.AddAssessmentTemplatePlanDto;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
@@ -92,7 +93,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
     private final IWeChatService weChatService;
     private final CommonPropertiesConfig commonPropertiesConfig;
     private final BaseClassMapper baseClassMapper;
-
+    private final WeChatUtil weChatUtil;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -526,7 +527,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(user.getOpenId());
 
-            weChatSendMessageDto.setTemplateId("ehYfXni7exZUmt6dJX4Ukbm9ETarFfKLfXVYwNnjKMc");
+            weChatSendMessageDto.setTemplateId(weChatUtil.getAssessmentTemplate());
             weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/student/canteen/evaluate?id={}", commonPropertiesConfig.getDomainApp(), dto.getId()));
             weChatSendMessageDto.setMsgId(dto.getId().toString());
 

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertSourceController.java

@@ -0,0 +1,104 @@
+package com.xjrsoft.module.dataexpert.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.dataexpert.dto.AddDataExpertSourceDto;
+import com.xjrsoft.module.dataexpert.dto.DataExpertSourcePageDto;
+import com.xjrsoft.module.dataexpert.dto.UpdateDataExpertSourceDto;
+import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
+import com.xjrsoft.module.dataexpert.service.IDataExpertSourceService;
+import com.xjrsoft.module.dataexpert.vo.DataExpertSourcePageVo;
+import com.xjrsoft.module.dataexpert.vo.DataExpertSourceVo;
+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.Date;
+import java.util.List;
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/dataexpert" + "/dataExpertSource")
+@Api(value = "/dataexpert"  + "/dataExpertSource",tags = "数据导出-数据源设置代码")
+@AllArgsConstructor
+public class DataExpertSourceController {
+
+
+    private final IDataExpertSourceService dataExpertSourceService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="数据导出-数据源设置列表(分页)")
+    @SaCheckPermission("dataexpertsource:detail")
+    public RT<PageOutput<DataExpertSourcePageVo>> page(@Valid DataExpertSourcePageDto dto){
+
+        LambdaQueryWrapper<DataExpertSource> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(DataExpertSource::getId)
+                .select(DataExpertSource.class,x -> VoToColumnUtil.fieldsToColumns(DataExpertSourcePageVo.class).contains(x.getProperty()));
+        IPage<DataExpertSource> page = dataExpertSourceService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<DataExpertSourcePageVo> pageOutput = ConventPage.getPageOutput(page, DataExpertSourcePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询数据导出-数据源设置信息")
+    @SaCheckPermission("dataexpertsource:detail")
+    public RT<DataExpertSourceVo> info(@RequestParam Long id){
+        DataExpertSource dataExpertSource = dataExpertSourceService.getByIdDeep(id);
+        if (dataExpertSource == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(dataExpertSource, DataExpertSourceVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增数据导出-数据源设置")
+    @SaCheckPermission("dataexpertsource:add")
+    public RT<Boolean> add(@Valid @RequestBody AddDataExpertSourceDto dto){
+        DataExpertSource dataExpertSource = BeanUtil.toBean(dto, DataExpertSource.class);
+        dataExpertSource.setCreateDate(new Date());
+        boolean isSuccess = dataExpertSourceService.add(dataExpertSource);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改数据导出-数据源设置")
+    @SaCheckPermission("dataexpertsource:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateDataExpertSourceDto dto){
+
+        DataExpertSource dataExpertSource = BeanUtil.toBean(dto, DataExpertSource.class);
+        dataExpertSource.setModifyDate(new Date());
+        return RT.ok(dataExpertSourceService.update(dataExpertSource));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除数据导出-数据源设置")
+    @SaCheckPermission("dataexpertsource:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(dataExpertSourceService.delete(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertTemplateController.java

@@ -0,0 +1,111 @@
+package com.xjrsoft.module.dataexpert.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.dataexpert.dto.AddDataExpertTemplateDto;
+import com.xjrsoft.module.dataexpert.dto.DataExpertTemplatePageDto;
+import com.xjrsoft.module.dataexpert.dto.UpdateDataExpertTemplateDto;
+import com.xjrsoft.module.dataexpert.entity.DataExpertTemplate;
+import com.xjrsoft.module.dataexpert.service.IDataExpertTemplateService;
+import com.xjrsoft.module.dataexpert.vo.DataExpertTemplatePageVo;
+import com.xjrsoft.module.dataexpert.vo.DataExpertTemplateVo;
+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: 2024-04-19
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/dataexpert" + "/dataExpertTemplate")
+@Api(value = "/dataexpert"  + "/dataExpertTemplate",tags = "数据导出-数据模板代码")
+@AllArgsConstructor
+public class DataExpertTemplateController {
+
+
+    private final IDataExpertTemplateService dataExpertTemplateService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="数据导出-数据模板列表(分页)")
+    @SaCheckPermission("dataexperttemplate:detail")
+    public RT<PageOutput<DataExpertTemplatePageVo>> page(@Valid DataExpertTemplatePageDto dto){
+
+        LambdaQueryWrapper<DataExpertTemplate> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(DataExpertTemplate::getId)
+                .select(DataExpertTemplate.class,x -> VoToColumnUtil.fieldsToColumns(DataExpertTemplatePageVo.class).contains(x.getProperty()));
+        IPage<DataExpertTemplate> page = dataExpertTemplateService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<DataExpertTemplatePageVo> pageOutput = ConventPage.getPageOutput(page, DataExpertTemplatePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询数据导出-数据模板信息")
+    @SaCheckPermission("dataexperttemplate:detail")
+    public RT<DataExpertTemplateVo> info(@RequestParam Long id){
+        DataExpertTemplate dataExpertTemplate = dataExpertTemplateService.getById(id);
+        if (dataExpertTemplate == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(dataExpertTemplate, DataExpertTemplateVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增数据导出-数据模板")
+    @SaCheckPermission("dataexperttemplate:add")
+    public RT<Boolean> add(@Valid @RequestBody AddDataExpertTemplateDto dto){
+        DataExpertTemplate dataExpertTemplate = BeanUtil.toBean(dto, DataExpertTemplate.class);
+        boolean isSuccess = dataExpertTemplateService.save(dataExpertTemplate);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改数据导出-数据模板")
+    @SaCheckPermission("dataexperttemplate:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateDataExpertTemplateDto dto){
+
+        DataExpertTemplate dataExpertTemplate = BeanUtil.toBean(dto, DataExpertTemplate.class);
+        return RT.ok(dataExpertTemplateService.updateById(dataExpertTemplate));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除数据导出-数据模板")
+    @SaCheckPermission("dataexperttemplate:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(dataExpertTemplateService.removeBatchByIds(ids));
+    }
+
+    @GetMapping(value = "/field-info")
+    @ApiOperation(value="根据id查询数据导出-数据模板信息")
+    @SaCheckPermission("dataexperttemplate:detail")
+    public RT<DataExpertTemplateVo> getFieldInfo(@RequestParam Long id){
+        DataExpertTemplate dataExpertTemplate = dataExpertTemplateService.getById(id);
+        if (dataExpertTemplate == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(dataExpertTemplate, DataExpertTemplateVo.class));
+    }
+
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/AddDataExpertSourceDto.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class AddDataExpertSourceDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 数据源名称
+    */
+    @ApiModelProperty("数据源名称")
+    private String name;
+    /**
+    * 数据源类型
+    */
+    @ApiModelProperty("数据源类型")
+    private String sourceType;
+    /**
+    * magicapi地址
+    */
+    @ApiModelProperty("magicapi地址")
+    private String apiUrl;
+
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/AddDataExpertTemplateDto.java

@@ -0,0 +1,42 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class AddDataExpertTemplateDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 模板名称
+    */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /**
+    * 数据源(data_expert_source)
+    */
+    @ApiModelProperty("数据源(data_expert_source)")
+    private Long dataExpertSourceId;
+    /**
+    * 字段配置
+    */
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertSourcePageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 数据导出-数据源设置分页查询入参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataExpertSourcePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertTemplatePageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 数据导出-数据模板分页查询入参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataExpertTemplatePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/UpdateDataExpertSourceDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class UpdateDataExpertSourceDto extends AddDataExpertSourceDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/dataexpert/dto/UpdateDataExpertTemplateDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class UpdateDataExpertTemplateDto extends AddDataExpertTemplateDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/dataexpert/entity/DataExpertSource.java

@@ -0,0 +1,96 @@
+package com.xjrsoft.module.dataexpert.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+@TableName("data_expert_source")
+@ApiModel(value = "data_expert_source", description = "数据导出-数据源设置")
+public class DataExpertSource 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 name;
+    /**
+    * 数据源类型
+    */
+    @ApiModelProperty("数据源类型")
+    private String sourceType;
+    /**
+    * magicapi地址
+    */
+    @ApiModelProperty("magicapi地址")
+    private String apiUrl;
+
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+}

src/main/java/com/xjrsoft/module/dataexpert/entity/DataExpertTemplate.java

@@ -0,0 +1,94 @@
+package com.xjrsoft.module.dataexpert.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+@TableName("data_expert_template")
+@ApiModel(value = "data_expert_template", description = "数据导出-数据模板")
+public class DataExpertTemplate 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 name;
+    /**
+    * 数据源(data_expert_source)
+    */
+    @ApiModelProperty("数据源(data_expert_source)")
+    private Long dataExpertSourceId;
+    /**
+    * 字段配置
+    */
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+
+}

src/main/java/com/xjrsoft/module/dataexpert/mapper/DataExpertSourceMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.dataexpert.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Mapper
+public interface DataExpertSourceMapper extends MPJBaseMapper<DataExpertSource> {
+
+}

src/main/java/com/xjrsoft/module/dataexpert/mapper/DataExpertTemplateMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.dataexpert.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.dataexpert.entity.DataExpertTemplate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Mapper
+public interface DataExpertTemplateMapper extends MPJBaseMapper<DataExpertTemplate> {
+
+}

src/main/java/com/xjrsoft/module/dataexpert/service/IDataExpertSourceService.java

@@ -0,0 +1,39 @@
+package com.xjrsoft.module.dataexpert.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
+
+import java.util.List;
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+
+public interface IDataExpertSourceService extends MPJBaseService<DataExpertSource> {
+    /**
+    * 新增
+    *
+    * @param dataExpertSource
+    * @return
+    */
+    Boolean add(DataExpertSource dataExpertSource);
+
+    /**
+    * 更新
+    *
+    * @param dataExpertSource
+    * @return
+    */
+    Boolean update(DataExpertSource dataExpertSource);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

src/main/java/com/xjrsoft/module/dataexpert/service/IDataExpertTemplateService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.dataexpert.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.dataexpert.entity.DataExpertTemplate;
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+
+public interface IDataExpertTemplateService extends MPJBaseService<DataExpertTemplate> {
+}

src/main/java/com/xjrsoft/module/dataexpert/service/impl/DataExpertSourceServiceImpl.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.dataexpert.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
+import com.xjrsoft.module.dataexpert.mapper.DataExpertSourceMapper;
+import com.xjrsoft.module.dataexpert.service.IDataExpertSourceService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+* @title: 数据导出-数据源设置
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class DataExpertSourceServiceImpl extends MPJBaseServiceImpl<DataExpertSourceMapper, DataExpertSource> implements IDataExpertSourceService {
+    private final DataExpertSourceMapper dataExpertSourceDataExpertSourceMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(DataExpertSource dataExpertSource) {
+        dataExpertSourceDataExpertSourceMapper.insert(dataExpertSource);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(DataExpertSource dataExpertSource) {
+        dataExpertSourceDataExpertSourceMapper.updateById(dataExpertSource);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        dataExpertSourceDataExpertSourceMapper.deleteBatchIds(ids);
+        return true;
+    }
+}

src/main/java/com/xjrsoft/module/dataexpert/service/impl/DataExpertTemplateServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.dataexpert.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.dataexpert.entity.DataExpertTemplate;
+import com.xjrsoft.module.dataexpert.mapper.DataExpertTemplateMapper;
+import com.xjrsoft.module.dataexpert.service.IDataExpertTemplateService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 数据导出-数据模板
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class DataExpertTemplateServiceImpl extends MPJBaseServiceImpl<DataExpertTemplateMapper, DataExpertTemplate> implements IDataExpertTemplateService {
+}

src/main/java/com/xjrsoft/module/dataexpert/vo/DataExpertSourcePageVo.java

@@ -0,0 +1,75 @@
+package com.xjrsoft.module.dataexpert.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 数据导出-数据源设置分页列表出参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class DataExpertSourcePageVo {
+
+    /**
+    * 
+    */
+    @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 name;
+    /**
+    * 数据源类型
+    */
+    @ApiModelProperty("数据源类型")
+    private String sourceType;
+    /**
+    * magicapi地址
+    */
+    @ApiModelProperty("magicapi地址")
+    private String apiUrl;
+
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+}

src/main/java/com/xjrsoft/module/dataexpert/vo/DataExpertSourceVo.java

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.dataexpert.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 数据导出-数据源设置表单出参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class DataExpertSourceVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 数据源名称
+    */
+    @ApiModelProperty("数据源名称")
+    private String name;
+    /**
+    * 数据源类型
+    */
+    @ApiModelProperty("数据源类型")
+    private String sourceType;
+    /**
+    * magicapi地址
+    */
+    @ApiModelProperty("magicapi地址")
+    private String apiUrl;
+
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+}

src/main/java/com/xjrsoft/module/dataexpert/vo/DataExpertTemplatePageVo.java

@@ -0,0 +1,73 @@
+package com.xjrsoft.module.dataexpert.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 数据导出-数据模板分页列表出参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class DataExpertTemplatePageVo {
+
+    /**
+    * 
+    */
+    @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 name;
+    /**
+    * 数据源(data_expert_source)
+    */
+    @ApiModelProperty("数据源(data_expert_source)")
+    private Long dataExpertSourceId;
+    /**
+    * 字段配置
+    */
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+}

src/main/java/com/xjrsoft/module/dataexpert/vo/DataExpertTemplateVo.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.dataexpert.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 数据导出-数据模板表单出参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class DataExpertTemplateVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 模板名称
+    */
+    @ApiModelProperty("模板名称")
+    private String name;
+    /**
+    * 数据源(data_expert_source)
+    */
+    @ApiModelProperty("数据源(data_expert_source)")
+    private Long dataExpertSourceId;
+    /**
+    * 字段配置
+    */
+    @ApiModelProperty("字段配置")
+    private String fieldJson;
+
+
+
+}

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

@@ -0,0 +1,36 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.oa.service.IFileReceiveService;
+import com.xjrsoft.module.student.entity.StudentChangeClass;
+import com.xjrsoft.module.student.mapper.StudentChangeClassMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生转班流程结束后，修改学生班级信息
+ */
+@Component("student_change_class_node")
+public class StudentChangeClassNode extends NodeComponent {
+    @Autowired
+    private StudentChangeClassMapper studentChangeClassMapper;
+    @Autowired
+    private IBaseStudentSchoolRollService studentSchoolRollService;
+    @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) {
+            //查询出数据
+            StudentChangeClass changeClass = studentChangeClassMapper.selectById(formId);
+            //修改学生班级
+            studentSchoolRollService.updateStudentClass(changeClass.getAfterClassId(), changeClass.getStudentUserId());
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.StudentDropOut;
+import com.xjrsoft.module.student.mapper.StudentDropOutMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生退学
+ */
+@Component("student_drop_out_node")
+public class StudentDropOutNode extends NodeComponent {
+    @Autowired
+    private StudentDropOutMapper studentDropOutMapper;
+    @Autowired
+    private IBaseStudentSchoolRollService studentSchoolRollService;
+
+    @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) {
+            //查询出数据
+            StudentDropOut studentDropOut = studentDropOutMapper.selectById(formId);
+            //跟新学籍信息
+            BaseStudentSchoolRoll schoolRoll = studentSchoolRollService.getOne(
+                new QueryWrapper<BaseStudentSchoolRoll>().lambda()
+                .eq(BaseStudentSchoolRoll::getClassId, studentDropOut.getClassId())
+                .eq(BaseStudentSchoolRoll::getUserId, studentDropOut.getStudentUserId())
+                .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
+            );
+            schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2904.getCode());
+            studentSchoolRollService.updateById(schoolRoll);
+        }
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.student.entity.BaseClassMajorSet;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.StudentTransfer;
+import com.xjrsoft.module.student.mapper.BaseClassMajorSetMapper;
+import com.xjrsoft.module.student.mapper.StudentTransferMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * 学生插班流程结束后
+ */
+@Component("student_transfer_node")
+public class StudentTransferNode extends NodeComponent {
+    @Autowired
+    private StudentTransferMapper studentTransferMapper;
+    @Autowired
+    private IBaseStudentSchoolRollService studentSchoolRollService;
+
+    @Autowired
+    private BaseClassMapper baseClassMapper;
+
+    @Autowired
+    private BaseClassMajorSetMapper baseClassMajorSetMapper;
+
+    @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) {
+            //查询出数据
+            StudentTransfer studentTransfer = studentTransferMapper.selectById(formId);
+            BaseClass baseClass = baseClassMapper.selectById(studentTransfer.getClassId());
+            BaseClassMajorSet majorSet = baseClassMajorSetMapper.selectOne(
+                new QueryWrapper<BaseClassMajorSet>().lambda()
+                .eq(BaseClassMajorSet::getClassId, studentTransfer.getClassId())
+                .eq(BaseClassMajorSet::getDeleteMark, DeleteMark.NODELETE.getCode())
+            );
+            BaseStudentSchoolRoll roll = new BaseStudentSchoolRoll();
+            roll.setStduyStatus(studentTransfer.getStudyStatus());
+            roll.setClassId(studentTransfer.getClassId());
+            roll.setEnrollType(baseClass.getEnrollType());
+            roll.setCreateDate(LocalDateTime.now());
+            roll.setGradeId(baseClass.getGradeId());
+            roll.setMajorSetId(majorSet.getMajorSetId());
+            roll.setCreateUserId(studentTransfer.getCreateUserId());
+            roll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
+            roll.setUserId(studentTransfer.getStudentUserId());
+            //新增学籍信息
+            studentSchoolRollService.save(roll);
+        }
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xjrsoft.common.enums.RoomApplicantTypeEnum;
+import com.xjrsoft.common.enums.StudyStatusEnum;
+import com.xjrsoft.module.room.entity.WfRoomApplicant;
+import com.xjrsoft.module.room.mapper.WfRoomApplicantMapper;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.StudentChangeClass;
+import com.xjrsoft.module.student.mapper.StudentChangeClassMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生住宿申请后，修改学籍信息中的就读方式
+ */
+@Component("wf_room_applicant_node")
+public class WfRoomApplicantNode extends NodeComponent {
+    @Autowired
+    private WfRoomApplicantMapper wfRoomApplicantMapper;
+    @Autowired
+    private IBaseStudentSchoolRollService studentSchoolRollService;
+    @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) {
+            //查询出数据
+            WfRoomApplicant wfRoomApplicant = wfRoomApplicantMapper.selectById(formId);
+            BaseStudentSchoolRoll schoolRoll = studentSchoolRollService.getOne(
+                new QueryWrapper<BaseStudentSchoolRoll>().lambda()
+                .eq(BaseStudentSchoolRoll::getUserId, wfRoomApplicant.getApplicantUserId())
+            );
+            if(RoomApplicantTypeEnum.ToBeBoarder.getCode().equals(wfRoomApplicant.getRecedeType())){
+                schoolRoll.setStduyStatus(StudyStatusEnum.InResidence.getCode());
+            }else if(RoomApplicantTypeEnum.ToBeDayPupil.getCode().equals(wfRoomApplicant.getRecedeType())){
+                schoolRoll.setStduyStatus(StudyStatusEnum.AttendDaySchool.getCode());
+            }
+            //修改学生班级
+            studentSchoolRollService.updateById(schoolRoll);
+        }
+    }
+}

src/main/java/com/xjrsoft/module/material/dto/MaterialAssignUserDto.java

@@ -9,7 +9,7 @@ public class MaterialAssignUserDto {
     /**
      * 用户类型 1=孝职工 2=学生
      */
-    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    @ApiModelProperty("用户类型 1=部门 2=班级 3=用户")
     private Integer userType;
     /**
      * 用户(xjr_user)

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -4,15 +4,18 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.MaterialCategoryEnum;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
+import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.form.dto.FormExecuteAddOrUpdateDto;
 import com.xjrsoft.module.form.service.IFormExecuteService;
 import com.xjrsoft.module.material.dto.*;
@@ -31,8 +34,10 @@ import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.organization.service.IWeChatService;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.vo.XjrUserVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,7 +64,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
     private final IMaterialTypeService materialTypeService;
     private final IWeChatService weChatService;
-
+    private final IXjrUserService xjrUserService;
     private final IFormExecuteService formExecuteService;
 
     private final CommonPropertiesConfig commonPropertiesConfig;
@@ -73,17 +78,56 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             materialTask.setAssignPerson(dto.getUserList().size());
         }
         materialTaskMaterialTaskMapper.insert(materialTask);
+
         //新增任务人
         for (MaterialAssignUserDto materialAssignUserDto : dto.getUserList()){
-            materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
-                setMaterialTaskId(materialTask.getId());
-                setUserId(materialAssignUserDto.getUserId());
-                setUserType(materialAssignUserDto.getUserType());
-                setUserNumber(materialAssignUserDto.getUserNumber());
-                setStatus(1);
-                setExecutiveStatus(1);
-                setSendMessage(dto.getSendMessage());
-            }});
+            if(materialAssignUserDto.getUserType() == 1){
+                List<XjrUserVo> xjrUserVos = xjrUserService.selectJoinList(XjrUserVo.class,
+                    new MPJLambdaWrapper<XjrUser>()
+                    .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
+                    .eq(UserDeptRelation::getDeptId, materialAssignUserDto.getUserId())
+                    .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
+                );
+                for (XjrUserVo xjrUserVo : xjrUserVos) {
+                    materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
+                        setMaterialTaskId(materialTask.getId());
+                        setUserId(xjrUserVo.getId());
+                        setUserType(materialAssignUserDto.getUserType());
+                        setUserNumber(xjrUserVo.getName());
+                        setStatus(1);
+                        setExecutiveStatus(1);
+                        setSendMessage(dto.getSendMessage());
+                    }});
+                }
+            }else if(materialAssignUserDto.getUserType() == 2){
+                List<XjrUserVo> xjrUserVos = xjrUserService.selectJoinList(XjrUserVo.class,
+                    new MPJLambdaWrapper<XjrUser>()
+                    .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
+                    .eq(BaseStudentSchoolRoll::getClassId, materialAssignUserDto.getUserId())
+                    .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
+                );
+                for (XjrUserVo xjrUserVo : xjrUserVos) {
+                    materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
+                        setMaterialTaskId(materialTask.getId());
+                        setUserId(xjrUserVo.getId());
+                        setUserType(materialAssignUserDto.getUserType());
+                        setUserNumber(xjrUserVo.getName());
+                        setStatus(1);
+                        setExecutiveStatus(1);
+                        setSendMessage(dto.getSendMessage());
+                    }});
+                }
+            }else if(materialAssignUserDto.getUserType() == 3){
+                materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
+                    setMaterialTaskId(materialTask.getId());
+                    setUserId(materialAssignUserDto.getUserId());
+                    setUserType(materialAssignUserDto.getUserType());
+                    setUserNumber(materialAssignUserDto.getUserNumber());
+                    setStatus(1);
+                    setExecutiveStatus(1);
+                    setSendMessage(dto.getSendMessage());
+                }});
+            }
         }
 
 //        materialTaskMaterialTaskMapper.insert(materialTask);

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

@@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OfficialDocumentReceivedMapper extends MPJBaseMapper<OfficialDocumentReceived> {
     Integer getMaxReceivedNumber();
+
+    Integer getMaxMeetingNumber();
 }

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

@@ -18,4 +18,6 @@ public interface IOfficialDocumentReceivedService extends MPJBaseService<Officia
      * 获取最新的收文号，在数据库中最大的基础上+1
      */
     String getMaxReceivedNumber();
+
+    String getMaxMeetingNumber();
 }

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

@@ -37,4 +37,10 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
         Integer maxReceivedNumber = officialDocumentReceivedMapper.getMaxReceivedNumber();
         return PostNumberUtil.initMaxPostNumber(maxReceivedNumber, 3);
     }
+
+    @Override
+    public String getMaxMeetingNumber() {
+        Integer maxReceivedNumber = officialDocumentReceivedMapper.getMaxMeetingNumber();
+        return PostNumberUtil.initMaxPostNumber(maxReceivedNumber, 3);
+    }
 }

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +18,7 @@ import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.enums.RoleEnum;
+import com.xjrsoft.common.enums.WorkflowIsRecycleType;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
@@ -39,6 +41,7 @@ import com.xjrsoft.module.organization.dto.ResetPasswordDto;
 import com.xjrsoft.module.organization.dto.UpdateInfoDto;
 import com.xjrsoft.module.organization.dto.UpdatePasswordDto;
 import com.xjrsoft.module.organization.dto.UpdateUserDto;
+import com.xjrsoft.module.organization.dto.UploadSignDto;
 import com.xjrsoft.module.organization.dto.UserPageDto;
 import com.xjrsoft.module.organization.dto.UserStudentAddDto;
 import com.xjrsoft.module.organization.dto.UserStudentBindDto;
@@ -59,7 +62,6 @@ import com.xjrsoft.module.organization.service.IUserRoleRelationService;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.organization.service.IUserStudentService;
 import com.xjrsoft.module.organization.utils.OrganizationUtil;
-import com.xjrsoft.module.organization.vo.DepartmentTreeVo;
 import com.xjrsoft.module.organization.vo.PendingCountDto;
 import com.xjrsoft.module.organization.vo.ResetUserPageVo;
 import com.xjrsoft.module.organization.vo.ResetUserRoleVo;
@@ -73,11 +75,18 @@ import com.xjrsoft.module.organization.vo.UserStudentVo;
 import com.xjrsoft.module.organization.vo.UserVo;
 import com.xjrsoft.module.oss.factory.OssFactory;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.workflow.constant.WorkflowConstant;
+import com.xjrsoft.module.workflow.entity.WorkflowExtra;
+import com.xjrsoft.module.workflow.mapper.WorkflowExtraMapper;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.camunda.bpm.engine.HistoryService;
+import org.camunda.bpm.engine.history.HistoricProcessInstance;
+import org.camunda.bpm.engine.history.HistoricProcessInstanceQuery;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -125,14 +134,20 @@ public class UserController {
 
     private final CommonPropertiesConfig propertiesConfig;
 
+    private final WorkflowExtraMapper workflowExtraMapper;
+
     private final RedisUtil redisUtil;
 
+    private final IFileService fileService;
+
     private final SmsCtcc smsCtcc;
     private final IBaseGradeService baseGradeService;
     private final IUserStudentService userStudentService;
     private final IBaseClassService baseClassService;
     private final IWorkflowExecuteService workflowExecuteService;
 
+    private final HistoryService historyService;
+
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "用户列表（不分页）")
@@ -331,6 +346,10 @@ public class UserController {
             vo.setClassName(userStudentVo.getClassName());
         }
 
+        List<File> fileList = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
+        if(!fileList.isEmpty()){
+            vo.setSignUrl(fileList.get(0).getFileUrl());
+        }
         return R.ok(vo);
     }
 
@@ -340,6 +359,21 @@ public class UserController {
         PendingCountDto pendingCountDto = new PendingCountDto();
         pendingCountDto.setWfPendingCount(workflowExecuteService.pendingCount());
 
+        HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery()
+                .variableValueEquals(WorkflowConstant.PROCESS_START_USER_ID_KEY, StpUtil.getLoginIdAsLong())
+                .variableValueEquals(WorkflowConstant.PROCESS_ISRECYCLE_FLAG_KEY, WorkflowIsRecycleType.NO.getCode());
+        List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.orderByProcessInstanceStartTime().desc().list();
+
+        //获取到所有流程id
+        List<String> processIds = historicProcessInstances.stream().map(HistoricProcessInstance::getId).collect(Collectors.toList());
+        int myApplicationCount = 0;
+        for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
+            if (ObjectUtil.isNotNull(historicProcessInstance.getEndTime())) {
+                myApplicationCount ++;
+            }
+        }
+        pendingCountDto.setMyApplicationCount(myApplicationCount);
+
         return RT.ok(pendingCountDto);
     }
 
@@ -633,4 +667,41 @@ public class UserController {
     public R unBindStudent(@Valid @RequestParam Long id) {
         return R.ok(baseClassService.getStudents(id));
     }
+
+    @PostMapping("/upload-sign")
+    @ApiOperation(value = "上传签名")
+    public RT<Boolean> uploadSign(@Valid @RequestBody UploadSignDto dto) {
+        long loginIdAsLong = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(loginIdAsLong);
+        user.setSignFolderId(dto.getFolderId());
+        user.setSignPassword(BCrypt.hashpw(dto.getPassword(), BCrypt.gensalt()));
+
+        return RT.ok(userService.updateById(user));
+    }
+
+    @GetMapping("/getSign")
+    @ApiOperation(value = "获取登录者的签名url")
+    public RT<String> getSign() {
+        long loginIdAsLong = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(loginIdAsLong);
+        if(user.getSignFolderId() == null){
+            return RT.error("未上传签名");
+        }
+        List<File> list = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
+        if(list.isEmpty()){
+            return RT.error("签名文件丢失");
+        }
+        return RT.ok(list.get(0).getFileUrl());
+    }
+
+    @GetMapping("/check-password")
+    @ApiOperation(value = "验证登录者的密码")
+    public RT<Boolean> checkSignpassword(@RequestParam String password) {
+        long loginIdAsLong = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(loginIdAsLong);
+        if (!BCrypt.checkpw(password, user.getPassword())) {
+            return RT.error("密码填写错误！");
+        }
+        return RT.ok(true);
+    }
 }

src/main/java/com/xjrsoft/module/organization/dto/CheckSignPasswordDto.java

@@ -0,0 +1,9 @@
+package com.xjrsoft.module.organization.dto;
+
+import lombok.Data;
+
+@Data
+public class CheckSignPasswordDto {
+    private Long signFolderId;
+    private String signPassword;
+}

src/main/java/com/xjrsoft/module/organization/dto/UploadSignDto.java

@@ -0,0 +1,9 @@
+package com.xjrsoft.module.organization.dto;
+
+import lombok.Data;
+
+@Data
+public class UploadSignDto {
+    private Long folderId;
+    private String password;
+}

src/main/java/com/xjrsoft/module/organization/entity/User.java

@@ -102,4 +102,10 @@ public class User extends AuditEntity implements Serializable {
     private Integer isChangePassword;
 
     private LocalDateTime birthDate;
+
+    @ApiModelProperty("签名文件")
+    private Long signFolderId;
+
+    @ApiModelProperty("签名密码")
+    private String signPassword;
 }

src/main/java/com/xjrsoft/module/organization/vo/PendingCountDto.java

@@ -13,4 +13,6 @@ public class PendingCountDto implements Serializable {
      * 流程待办数量
      */
     private long wfPendingCount;
+
+    private long myApplicationCount;
 }

src/main/java/com/xjrsoft/module/organization/vo/UserInfoVo.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -118,4 +119,10 @@ public class UserInfoVo {
      * 家长绑定的学生
      */
     private List<UserStudentVo> students;
+
+    @ApiModelProperty("签名地址")
+    private String signUrl;
+
+    @ApiModelProperty("签名文件id")
+    private Long signFolderId;
 }

src/main/java/com/xjrsoft/module/room/service/impl/WfRoomApplicantServiceImpl.java

@@ -39,14 +39,14 @@ public class WfRoomApplicantServiceImpl extends MPJBaseServiceImpl<WfRoomApplica
 
             if(ObjectUtil.isNotNull(baseStudentSchoolRoll)){
                 //申请住校
-                if(wfRoomApplicant.getRecedeType().equals(RoomApplicantTypeEnum.RaOvernightStay.getCode())) {
+                if(wfRoomApplicant.getRecedeType().equals(RoomApplicantTypeEnum.ToBeBoarder.getCode())) {
                     baseStudentSchoolRollMapper.updateById(new BaseStudentSchoolRoll(){{
                         setId(baseStudentSchoolRoll.getId());
                         setStduyStatus(StudyStatusEnum.InResidence.getCode());
                     }});
                 }
 
-                if(wfRoomApplicant.getRecedeType().equals(RoomApplicantTypeEnum.RaNoOvernightStay.getCode())) {
+                if(wfRoomApplicant.getRecedeType().equals(RoomApplicantTypeEnum.ToBeDayPupil.getCode())) {
                     baseStudentSchoolRollMapper.updateById(new BaseStudentSchoolRoll(){{
                         setId(baseStudentSchoolRoll.getId());
                         setStduyStatus(StudyStatusEnum.AttendDaySchool.getCode());

src/main/java/com/xjrsoft/module/schedule/vo/StudentJianyuekbVo.java

@@ -38,7 +38,7 @@ public class StudentJianyuekbVo {
     * 是否允许德育检查(1:是 0:否)
     */
     @ApiModelProperty("性别：1男，2女")
-    private Integer gender;
+    private String gender;
     /**
     * 职责描述
     */

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
@@ -76,7 +77,9 @@ public class BaseStudentInfoController {
     @ApiOperation(value="根据id查询详情信息")
     @SaCheckPermission("room:detail")
     public RT<BaseStudentInfoDetailVo> info(@RequestParam Long id){
-        BaseStudentInfoDetailVo detailVo = baseStudentSchoolRollService.getInfoById(id);
+        BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
+        dto.setId(id);
+        BaseStudentInfoDetailVo detailVo = baseStudentSchoolRollService.getInfoById(dto);
         if (detailVo == null) {
             return RT.error("找不到此数据！");
         }

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

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,11 +14,21 @@ import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
-import com.xjrsoft.module.student.dto.*;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
+import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
+import com.xjrsoft.module.student.dto.PersonalInfoDto;
+import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
 import com.xjrsoft.module.student.service.IPbVXssfdetailService;
 import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
-import com.xjrsoft.module.student.service.IStudentManagerService;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.BaseClassTreeVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbExcelVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbPageVo;
+import com.xjrsoft.module.student.vo.PersonalPortraitFeeInformationVo;
+import com.xjrsoft.module.student.vo.PersonalPortraitPersonalInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -28,6 +37,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 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;
@@ -141,4 +151,11 @@ public class ConsumptionController {
 
         return RT.fileStream(bot.toByteArray(), "PbVXsxxsfytbExcel" + ExcelTypeEnum.XLSX.getValue());
     }
+
+    @GetMapping(value = "/fee-detail")
+    @ApiOperation(value="学生缴费的详情")
+    @SaCheckPermission("consumption:detail")
+    public RT<List<FeeDetailListVo>> feeDetail(@RequestParam String studentcode){
+        return RT.ok(pbVXsxxsfytbService.getFeeDetail(studentcode));
+    }
 }

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

@@ -137,4 +137,5 @@ public class PbCseFeeobjupdateController {
 
         return RT.fileStream(bot.toByteArray(), "PbCseFeeobjupdate" + ExcelTypeEnum.XLSX.getValue());
     }
+
 }

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

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学生职务设置分页查询入参
+* @Author dzx
+* @Date: 2023-11-13
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentInfoDetailDto {
+
+    @ApiModelProperty("学生userId")
+    private Long id;
+
+    @ApiModelProperty("最新一学期的编码")
+    private String beltcode;
+
+    @ApiModelProperty("学生身份证号")
+    private String credentialNumber;
+}

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

@@ -196,4 +196,9 @@ public class BaseStudentUser implements Serializable {
     @EntityMapping(thisField = "id", joinField = "userId")
     private List<BaseStudentSubsidize> baseStudentSubsidizeList;
 
+    @ApiModelProperty("签名文件")
+    private Long signFolderId;
+
+    @ApiModelProperty("签名密码")
+    private String signPassword;
 }

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

@@ -0,0 +1,119 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 干部候选人
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Data
+@TableName("student_change_class")
+@ApiModel(value = "student_change_class", description = "学生转班")
+public class StudentChangeClass 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;
+    /**
+    * 转出班级id
+    */
+    @ApiModelProperty("转出班级id")
+    private Long beforeClassId;
+    /**
+    * 学生用户id
+    */
+    @ApiModelProperty("学生用户id")
+    private Long studentUserId;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String IDNumber;
+    /**
+    * 教材费缴费情况
+    */
+    @ApiModelProperty("教材费缴费情况")
+    private String textbookFees;
+    /**
+    * 住宿费缴费情况
+    */
+    @ApiModelProperty("住宿费缴费情况")
+    private String homestay;
+    /**
+    * 转入班级id
+    */
+    @ApiModelProperty("转入班级id")
+    private Long afterClassId;
+    /**
+     * 班主任id
+     */
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,104 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 退学申请
+* @Author dzx
+* @Date: 2024年4月17日
+* @Version 1.0
+*/
+@Data
+@TableName("student_drop_out")
+@ApiModel(value = "student_drop_out", description = "退学申请")
+public class StudentDropOut 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("学生id")
+    private Long studentUserId;
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("身份证号")
+    private String IDNumber;
+
+    @ApiModelProperty("退学日期")
+    private Date dropDate;
+
+    @ApiModelProperty("请假原因")
+    private String reason;
+
+    @ApiModelProperty("班主任")
+    private Long teacherId;
+
+    @ApiModelProperty("附件id")
+    private Long folderId;
+
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,109 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 学生插班
+* @Author dzx
+* @Date: 2024年4月17日
+* @Version 1.0
+*/
+@Data
+@TableName("student_transfer")
+@ApiModel(value = "student_transfer", description = "干部候选人")
+public class StudentTransfer 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("学生id")
+    private Long studentUserId;
+
+    @ApiModelProperty("性别")
+    private String gender;
+
+    @ApiModelProperty("身份证")
+    private String IDNumber;
+
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String studyStatus;
+
+    @ApiModelProperty("教材费缴费情况")
+    private String textbookFees;
+
+    @ApiModelProperty("住宿费缴费情况")
+    private String homestay;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("班主任")
+    private Long teacherId;
+
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+}

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
@@ -10,6 +11,7 @@ import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -24,7 +26,7 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
 
     Page<BaseStudentInfoPageVo> getMobilePage(Page<BaseStudentInfoPageVo> page, BaseStudentInfoPageDto dto);
 
-    BaseStudentInfoDetailVo getInfoById(Long id);
+    BaseStudentInfoDetailVo getInfoById(@Param("dto") BaseStudentInfoDetailDto dto);
 
     Boolean updateInfoByUserId(UpdateBaseStudentInfoDto dto, Long id);
 
@@ -42,5 +44,9 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
      */
     List<BaseStudentInfoCategoryVo> getStudyStatusCount(@Param("dto") BaseStudentInfoPageDto dto);
 
+
+    @Update("UPDATE base_student_school_roll SET class_id = #{classId} where user_id = #{userId}")
+    Boolean updateStudentClass(Long classId, Long userId);
+
 }
 

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

@@ -1,13 +1,17 @@
 package com.xjrsoft.module.student.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbDto;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbFeeitemVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbSpecnameCountVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -22,4 +26,10 @@ public interface PbVXsxxsfytbMapper extends MPJBaseMapper<PbVXsxxsfytb> {
     List<BaseClassQfCountVo> getClassQfCount();
 
     List<PbVXsxxsfytbVo> getList(@Param("dto") PbVXsxxsfytbDto dto);
+
+    List<PbVXsxxsfytbSpecnameCountVo> getSpecnameCount(@Param("dto") EnrollmentStatisticsInfoDto dto);
+
+    PbVXsxxsfytbFeeitemVo getStudentFeeInfo(@Param("dto") BaseStudentInfoDetailDto dto);
+
+    List<FeeDetailListVo> getFeeDetail(@Param("studentcode") String studentcode);
 }

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

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.StudentChangeClass;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 干部候选人
+* @Author szs
+* @Date: 2023-12-20
+* @Version 1.0
+*/
+@Mapper
+public interface StudentChangeClassMapper extends MPJBaseMapper<StudentChangeClass> {
+}

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

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.StudentDropOut;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 退学申请
+* @Author dzx
+* @Date: 2024年4月17日
+* @Version 1.0
+*/
+@Mapper
+public interface StudentDropOutMapper extends MPJBaseMapper<StudentDropOut> {
+}

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

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.StudentTransfer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生插班
+* @Author dzx
+* @Date: 2024年4月17日
+* @Version 1.0
+*/
+@Mapper
+public interface StudentTransferMapper extends MPJBaseMapper<StudentTransfer> {
+}

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
@@ -30,10 +31,9 @@ public interface IBaseStudentSchoolRollService extends MPJBaseService<BaseStuden
 
     /**
      * 移动端查询学生详情信息
-     * @param id
      * @return
      */
-    BaseStudentInfoDetailVo getInfoById(Long id);
+    BaseStudentInfoDetailVo getInfoById(BaseStudentInfoDetailDto dto);
 
     /**
      * 统计学生信息
@@ -43,4 +43,6 @@ public interface IBaseStudentSchoolRollService extends MPJBaseService<BaseStuden
     BaseStudentInfoPageDataVo getMobilePageStatistics(BaseStudentInfoPageDto dto);
 
     MobileClassStatisticsVo getMobileClassStatistics(BaseStudentInfoPageDto dto);
+
+    Boolean updateStudentClass(Long classId, Long userId);
 }

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

@@ -6,6 +6,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.student.dto.*;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -24,4 +25,9 @@ public interface IPbVXsxxsfytbService extends MPJBaseService<PbVXsxxsfytb> {
     List<PbVXsxxsfytbExcelVo> getList(PbVXsxxsfytbExcelDto dto);
 
     List<BaseClassQfCountVo> getClassQfCount();
+
+
+    PbVXsxxsfytbFeeitemVo getStudentFeeInfo(String credentialNumber);
+
+    List<FeeDetailListVo> getFeeDetail(String studentcode);
 }

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

@@ -11,16 +11,21 @@ import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.room.mapper.RoomBedMapper;
 import com.xjrsoft.module.room.vo.RoomBedInfoVo;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.student.mapper.PbSemesterConfigMapper;
 import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
 import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
-import com.xjrsoft.module.student.vo.*;
+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.MobileClassStatisticsVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -78,7 +83,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
         List<PbVXsxxsfytbVo> list = pbVXsxxsfytbMapper.getList(dto2);
         Map<String, String> jfztMaps = new HashMap<>();
         for (PbVXsxxsfytbVo pbVXsxxsfytb : list) {
-            jfztMaps.put(pbVXsxxsfytb.getStudentcode() + pbVXsxxsfytb.getFeeitemcode(), pbVXsxxsfytb.getJfzt().replaceAll("未交费", "欠费"));
+            jfztMaps.put(pbVXsxxsfytb.getStudentcode() + pbVXsxxsfytb.getFeeitemcode(), pbVXsxxsfytb.getJfzt().replaceAll("未缴费", "欠费"));
         }
         for (BaseStudentInfoPageVo record : mobilePage.getRecords()) {
             record.setSsf(jfztMaps.get(record.getStudentId() + "103042766003001") == null?"欠费":jfztMaps.get(record.getStudentId() + "103042766003001"));
@@ -97,8 +102,10 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
     }
 
     @Override
-    public BaseStudentInfoDetailVo getInfoById(Long id) {
-        BaseStudentInfoDetailVo info = baseStudentSchoolRollMapper.getInfoById(id);
+    public BaseStudentInfoDetailVo getInfoById(BaseStudentInfoDetailDto dto) {
+        String lastBeltcode = pbSemesterConfigMapper.getLastBeltcode();
+        dto.setBeltcode(lastBeltcode);
+        BaseStudentInfoDetailVo info = baseStudentSchoolRollMapper.getInfoById(dto);
         RoomBedInfoVo bedInfoByUserId = roomBedMapper.getBedInfoByUserId(info.getId());
         if(bedInfoByUserId != null){
             info.setBedInfo(bedInfoByUserId.getBuildName() + " " + bedInfoByUserId.getRoomName() + " " + bedInfoByUserId.getBedNumber());
@@ -183,4 +190,9 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
         }
         return null;
     }
+
+    @Override
+    public Boolean updateStudentClass(Long classId, Long userId) {
+        return baseStudentSchoolRollMapper.updateStudentClass(classId, userId);
+    }
 }

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

@@ -7,6 +7,7 @@ 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.mapper.PbVXsxxsfytbMapper;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
 import com.xjrsoft.module.student.service.IPbCseSpecplanService;
 import com.xjrsoft.module.student.vo.*;
@@ -21,6 +22,7 @@ import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +40,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
     @Autowired
     private final IPbCseSpecplanService pbCseSpecplanService;
+    private final PbVXsxxsfytbMapper pbVXsxxsfytbMapper;
 
     @Override
     public EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo(EnrollmentStatisticsInfoDto dto) {
@@ -47,13 +50,11 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
         pbCseFeeobjupdateMPJLambdaWrapper
                 .disableSubLogicDel()
                 .distinct()
-                .select("ifnull(t2.name,t.specname) as specname")
+                .selectAs(PbCseFeeobjupdate::getSpecname, PbCseFeeobjupdate::getSpecname)
                 .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
                 .selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
                 .selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
                 .selectAs(PbCseFeeobjupdate::getSex, PbCseFeeobjupdate::getSex)
-                .leftJoin(BaseMajorSet.class, BaseMajorSet::getName, PbCseFeeobjupdate::getSpecname)
-                .leftJoin(BaseMajorCategor.class, BaseMajorCategor::getId, BaseMajorSet::getMajorCategorId)
                 .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
         ;
 
@@ -61,13 +62,20 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
         if(pbCseFeeobjupdateList != null && !pbCseFeeobjupdateList.isEmpty()){
             //专业排行
-            Map<String, Long> professionalHeadCount = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getSpecname, Collectors.counting()));
+            Map<String, Long> professionalHeadCount = pbCseFeeobjupdateList.stream().filter(x -> x.getSpecname() != null).collect(Collectors.groupingBy(PbCseFeeobjupdate::getSpecname, Collectors.counting()));
             if(!professionalHeadCount.isEmpty()){
                 professionalHeadCount = professionalHeadCount.entrySet().stream()
                         .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
                                 (e1, e2) -> e1, LinkedHashMap::new));
             }
+            //查询每个专业的缴费人数
+            List<PbVXsxxsfytbSpecnameCountVo> specnameCountVos = pbVXsxxsfytbMapper.getSpecnameCount(dto);
+            Map<String, Integer> specnameCountMap = new HashMap<>();
+            for (PbVXsxxsfytbSpecnameCountVo specnameCountVo : specnameCountVos) {
+                specnameCountMap.put(specnameCountVo.getSpecname(), specnameCountVo.getStudentCount());
+            }
+
 
             //专业计划人数，余数
             MPJLambdaWrapper<PbCseSpecplan> pbCseSpecplanMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -93,6 +101,10 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
                     if(pbCseSpecplanSumMap.get(entry.getKey()) != null){
                         setPlannedNumber(pbCseSpecplanSumMap.get(entry.getKey()));
                         setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - entry.getValue());
+                        setPaymentCount(specnameCountMap.get(entry.getKey()));
+                    }
+                    if(specnameCountMap.get(entry.getKey()) != null){
+                        setPaymentCount(specnameCountMap.get(entry.getKey()));
                     }
                 }});
             }
@@ -105,7 +117,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
             }
 
             //住宿类型
-            Map<String, Long> accommodationType = pbCseFeeobjupdateList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getQuartername, Collectors.counting()));
+            Map<String, Long> accommodationType = pbCseFeeobjupdateList.stream().filter(x -> x.getQuartername() != null).collect(Collectors.groupingBy(PbCseFeeobjupdate::getQuartername, Collectors.counting()));
             List<EnrollmentStatisticsInfoKeyValue> accommodationTypeRes = new ArrayList<>();
             for (Map.Entry<String, Long> entry : accommodationType.entrySet()) {
                 accommodationTypeRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));

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

@@ -8,6 +8,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
 import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
@@ -15,10 +16,13 @@ import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.entity.PbSemesterConfig;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
+import com.xjrsoft.module.student.mapper.PbSemesterConfigMapper;
 import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
 import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
 import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbExcelVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbFeeitemVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbPageVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbPersonal;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbPersonalMap;
@@ -45,6 +49,7 @@ import java.util.stream.Collectors;
 public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapper, PbVXsxxsfytb> implements IPbVXsxxsfytbService {
 
     private final PbVXsxxsfytbMapper pbVXsxxsfytbMapper;
+    private final PbSemesterConfigMapper pbSemesterConfigMapper;
 
     @Override
     public PersonalPortraitFeeInformationVo listCostInformation(PersonalPortraitFeeInformationDto dto) {
@@ -127,11 +132,15 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 .like(dto.getJfzt() != null && !"".equals(dto.getJfzt()), PbVXsxxsfytb::getJfzt, dto.getJfzt())
                 .leftJoin(XjrUser.class, XjrUser::getCredentialNumber, PbVXsxxsfytb::getPersonalid)
                 .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
+                .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
                 .leftJoin(BaseStudent.class, BaseStudent::getUserId, XjrUser::getId)
                 .leftJoin(PbSemesterConfig.class, PbSemesterConfig::getBeltcode, PbVXsxxsfytb::getBeltcode)
                 .leftJoin(BaseSemester.class, BaseSemester::getId, PbSemesterConfig::getBaseSemesterId)
+                .leftJoin("xjr_user x1 on x1.id = t3.teacher_id")
+                .select("x1.name as teacher_name")
                 .selectAs(BaseSemester::getId, PbVXsxxsfytbPageVo::getBaseSemester)
                 .selectAs(XjrUser::getId, PbVXsxxsfytbPageVo::getUserId)
+                .selectAs(BaseClass::getName, PbVXsxxsfytbPageVo::getClassname)
                 .selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
                 .select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbPageVo.class).contains(x.getProperty()))
                 ;
@@ -220,4 +229,23 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
     public List<BaseClassQfCountVo> getClassQfCount() {
         return pbVXsxxsfytbMapper.getClassQfCount();
     }
+
+    /**
+     * 查询学生最新一学期的费用情况
+     * @param credentialNumber
+     * @return
+     */
+    @Override
+    public PbVXsxxsfytbFeeitemVo getStudentFeeInfo(String credentialNumber) {
+        BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
+        dto.setCredentialNumber(credentialNumber);
+        String lastBeltcode = pbSemesterConfigMapper.getLastBeltcode();
+        dto.setBeltcode(lastBeltcode);
+        return pbVXsxxsfytbMapper.getStudentFeeInfo(dto);
+    }
+
+    @Override
+    public List<FeeDetailListVo> getFeeDetail(String studentcode) {
+        return pbVXsxxsfytbMapper.getFeeDetail(studentcode);
+    }
 }

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

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 表单出参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class FeeDetailListVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("费用简称")
+    private String shortName;
+    /**
+    * 
+    */
+    @ApiModelProperty("学期名称")
+    private String semesterName;
+    /**
+    * 
+    */
+    @ApiModelProperty("缴费状态")
+    private String jfzt;
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 表单出参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class PbVXsxxsfytbFeeitemVo {
+
+    @ApiModelProperty("宿舍费")
+    private String ssf;
+
+    @ApiModelProperty("教材费")
+    private String jcf;
+
+    @ApiModelProperty("军训费")
+    private String jxf;
+
+
+
+}

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

@@ -225,4 +225,7 @@ public class PbVXsxxsfytbPageVo {
     @ApiModelProperty("主键")
     private String pksfxxytb;
 
+    @ApiModelProperty("班主任名称")
+    private String teacherName;
+
 }

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

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+* @title: 分页列表出参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class PbVXsxxsfytbSpecnameCountVo {
+
+    /**
+    * 专业名称
+    */
+    @ApiModelProperty("专业名称")
+    private String specname;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学生人数")
+    private Integer studentCount;
+
+}

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

@@ -27,4 +27,7 @@ public class ProfessionalHeadCoun {
      */
     @ApiModelProperty("学位余数")
     private Long remainder;
+
+    @ApiModelProperty("缴费人数")
+    private Integer paymentCount;
 }

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.jdcloud.sdk.utils.StringUtils;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.AuthorizeType;
@@ -21,24 +22,11 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.service.IUserRoleRelationService;
-import com.xjrsoft.module.system.dto.AddMenuDto;
-import com.xjrsoft.module.system.dto.AddMenuFormDto;
-import com.xjrsoft.module.system.dto.MenuTreeDto;
-import com.xjrsoft.module.system.dto.RoleMenuServeListDto;
-import com.xjrsoft.module.system.dto.UpdateMenuDto;
-import com.xjrsoft.module.system.dto.UpdateMenuFormDto;
-import com.xjrsoft.module.system.entity.Authorize;
-import com.xjrsoft.module.system.entity.Menu;
-import com.xjrsoft.module.system.entity.MenuButton;
-import com.xjrsoft.module.system.entity.MenuColumn;
-import com.xjrsoft.module.system.entity.MenuForm;
-import com.xjrsoft.module.system.entity.Subsystem;
-import com.xjrsoft.module.system.service.IAuthorizeService;
-import com.xjrsoft.module.system.service.IMenuButtonService;
-import com.xjrsoft.module.system.service.IMenuColumnService;
-import com.xjrsoft.module.system.service.IMenuFormService;
-import com.xjrsoft.module.system.service.IMenuService;
+import com.xjrsoft.module.system.dto.*;
+import com.xjrsoft.module.system.entity.*;
+import com.xjrsoft.module.system.service.*;
 import com.xjrsoft.module.system.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -82,6 +70,8 @@ public class MenuController {
 
     private final IAuthorizeService authorizeService;
 
+    private final IXjrMenuDeptRelationService xjrMenuDeptRelationService;
+
     private final IUserRoleRelationService userRoleRelationService;
 
     @GetMapping("/list")
@@ -140,8 +130,7 @@ public class MenuController {
         if (StrUtil.isEmpty(dto.getSystemType())) {
             dto.setSystemType(SystemTypeEnum.SYSTEMPC.getCode());
         }
-        List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class,
-                MPJWrappers.<Menu>lambdaJoin()
+        MPJLambdaWrapper<Menu> wrapper = MPJWrappers.<Menu>lambdaJoin()
                         .like(StrUtil.isNotEmpty(dto.getTitle()), Menu::getTitle, dto.getTitle())
                         .like(StrUtil.isNotEmpty(dto.getName()), Menu::getName, dto.getName())
                         .like(ObjectUtil.isNotNull(dto.getSystemId()) && dto.getSystemId() > 0, Menu::getSystemId, dto.getSystemId())
@@ -149,14 +138,28 @@ public class MenuController {
                         .select(Menu::getId)
                         .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
                         .selectAs(Subsystem::getName, MenuTreeVo::getSystemName)
+                        .select("GROUP_CONCAT(t3.name  SEPARATOR ',')", MenuTreeVo::getDeptName)
+                        .select("GROUP_CONCAT(t2.dept_id SEPARATOR ',')", MenuTreeVo::getDeptId)
                         .eq(ObjectUtils.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
                         .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
-                        .orderByAsc(Menu::getSortCode));
+                        .leftJoin("xjr_menu_dept_relation t2 ON (t.id = t2.menu_id)")
+                        .leftJoin("xjr_department t3 ON (t3.id = t2.dept_id)")
+                        .groupBy(Menu::getId)
+                        .groupBy(Menu::getSortCode)
+                        .orderByAsc(Menu::getSortCode);
+
+//        wrapper.select(
+//                "(select p1.name from xjr_menu_dept_relation p left join xjr_department p1 on p1.id = p.dept_id where t.id = p.menu_id) AS deptName",
+//                "(select p.dept_id from xjr_menu_dept_relation p where t.id = p.menu_id) AS deptId"
+//        );
+
+        List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class, wrapper);
         List<MenuTreeVo> treeVoList = TreeUtil.build(list);
 
         return R.ok(treeVoList);
     }
 
+
     @GetMapping("/child-tree")
     @ApiOperation(value = "获取所有菜单（树结构，禁用父级）")
     public R menuChildTree(@Valid MenuTreeDto dto) {
@@ -246,6 +249,17 @@ public class MenuController {
         menuFormService.remove(Wrappers.<MenuForm>query().lambda().eq(MenuForm::getMenuId, menu.getId()));
         menuFormService.saveBatch(formList);
 
+        //多选
+        List<XjrMenuDeptRelation> menuDeptRelationsList = new ArrayList<>();
+        if(dto.getMenuDeptRelations() != null){
+            for (AddXjrMenuDeptRelationDto addXjrMenuDeptRelationDto : dto.getMenuDeptRelations()) {
+                menuDeptRelationsList.add(BeanUtil.toBean(addXjrMenuDeptRelationDto, XjrMenuDeptRelation.class));
+            }
+        }
+
+        menuDeptRelationsList.forEach(XjrMenuDeptRelation -> XjrMenuDeptRelation.setMenuId(menu.getId()));
+        xjrMenuDeptRelationService.remove(Wrappers.<XjrMenuDeptRelation>query().lambda().eq(XjrMenuDeptRelation::getMenuId, menu.getId()));
+        xjrMenuDeptRelationService.saveBatch(menuDeptRelationsList);
 
         return R.ok(isSuccess);
     }
@@ -304,6 +318,16 @@ public class MenuController {
         formList.forEach(menuForm -> menuForm.setMenuId(menu.getId()));
         menuFormService.remove(Wrappers.<MenuForm>query().lambda().eq(MenuForm::getMenuId, menu.getId()));
 
+        if(dto.getMenuDeptRelations() != null){
+            List<XjrMenuDeptRelation> menuDeptRelations = BeanUtil.copyToList(dto.getMenuDeptRelations(), XjrMenuDeptRelation.class);
+            menuDeptRelations.forEach(XjrMenuDeptRelation -> XjrMenuDeptRelation.setMenuId(menu.getId()));
+            xjrMenuDeptRelationService.remove(Wrappers.<XjrMenuDeptRelation>query().lambda().eq(XjrMenuDeptRelation::getMenuId, menu.getId()));
+
+            if (CollectionUtils.isNotEmpty(menuDeptRelations)) {
+                xjrMenuDeptRelationService.saveBatch(menuDeptRelations);
+            }
+        }
+
         if (CollectionUtils.isNotEmpty(menuButtons)) {
             menuButtonService.saveBatch(menuButtons);
         }
@@ -313,6 +337,7 @@ public class MenuController {
         if (CollectionUtils.isNotEmpty(formList)) {
             menuFormService.saveBatch(formList);
         }
+
         return R.ok();
     }
 

src/main/java/com/xjrsoft/module/system/controller/SystemMenuCommonlyUsedController.java

@@ -0,0 +1,134 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+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.system.dto.AddSystemMenuCommonlyUsedDto;
+import com.xjrsoft.module.system.dto.SystemMenuCommonlyUsedPageDto;
+import com.xjrsoft.module.system.dto.UpdateSystemMenuCommonlyUsedDto;
+import com.xjrsoft.module.system.entity.SystemMenuCommonlyUsed;
+import com.xjrsoft.module.system.service.ISystemMenuCommonlyUsedService;
+import com.xjrsoft.module.system.vo.SystemMenuCommonlyUsedPageVo;
+import com.xjrsoft.module.system.vo.SystemMenuCommonlyUsedVo;
+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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/systemMenuCommonlyUsed")
+@Api(value = "/system"  + "/systemMenuCommonlyUsed",tags = "常用功能设置代码")
+@AllArgsConstructor
+public class SystemMenuCommonlyUsedController {
+
+
+    private final ISystemMenuCommonlyUsedService systemMenuCommonlyUsedService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="常用功能设置列表(分页)")
+    @SaCheckPermission("systemmenucommonlyused:detail")
+    public RT<PageOutput<SystemMenuCommonlyUsedPageVo>> page(@Valid SystemMenuCommonlyUsedPageDto dto){
+
+        LambdaQueryWrapper<SystemMenuCommonlyUsed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SystemMenuCommonlyUsed::getId)
+                .eq(SystemMenuCommonlyUsed::getCreateUserId, StpUtil.getLoginIdAsLong())
+                .select(SystemMenuCommonlyUsed.class,x -> VoToColumnUtil.fieldsToColumns(SystemMenuCommonlyUsedPageVo.class).contains(x.getProperty()));
+        IPage<SystemMenuCommonlyUsed> page = systemMenuCommonlyUsedService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SystemMenuCommonlyUsedPageVo> pageOutput = ConventPage.getPageOutput(page, SystemMenuCommonlyUsedPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/nopage")
+    @ApiOperation(value = "常用功能设置列表(不分页)")
+    @SaCheckPermission("systemmenucommonlyused:detail")
+    public RT<List<SystemMenuCommonlyUsedPageVo>> noPage(@Valid SystemMenuCommonlyUsedPageDto dto) {
+
+        MPJLambdaWrapper<SystemMenuCommonlyUsed> queryWrapper = MPJWrappers.<SystemMenuCommonlyUsed>lambdaJoin()
+                .distinct()
+                .orderByDesc(SystemMenuCommonlyUsed::getId)
+                .select(SystemMenuCommonlyUsed.class, x -> VoToColumnUtil.fieldsToColumns(SystemMenuCommonlyUsedPageVo.class).contains(x.getProperty()))
+                .select("t.id",SystemMenuCommonlyUsedPageVo::getId)
+                .select("t1.icon_url",SystemMenuCommonlyUsedPageVo::getIconUrl)
+                .select("t1.path",SystemMenuCommonlyUsedPageVo::getPath)
+                .select("t1.remark",SystemMenuCommonlyUsedPageVo::getRemark)
+                .select("t1.title",SystemMenuCommonlyUsedPageVo::getTitle)
+                .eq(SystemMenuCommonlyUsed::getCreateUserId, StpUtil.getLoginIdAsLong())
+                .leftJoin("xjr_menu t1 on t1.id = t.menu_id");
+
+
+
+        List<SystemMenuCommonlyUsedPageVo> dataList = systemMenuCommonlyUsedService.selectJoinList(SystemMenuCommonlyUsedPageVo.class,queryWrapper);
+        // List<SystemMenuCommonlyUsedPageVo> treeVoList = TreeUtil.build(dataList);
+
+        return RT.ok(dataList);
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除常用功能设置")
+    @SaCheckPermission("systemmenucommonlyused:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(systemMenuCommonlyUsedService.removeByMenuId(ids));
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询常用功能设置信息")
+    @SaCheckPermission("systemmenucommonlyused:detail")
+    public RT<SystemMenuCommonlyUsedVo> info(@RequestParam Long id){
+        SystemMenuCommonlyUsed systemMenuCommonlyUsed = systemMenuCommonlyUsedService.getById(id);
+        if (systemMenuCommonlyUsed == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(systemMenuCommonlyUsed, SystemMenuCommonlyUsedVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增常用功能设置")
+    @SaCheckPermission("systemmenucommonlyused:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSystemMenuCommonlyUsedDto dto){
+        if(dto.getMenuId() == null){
+            return RT.error("菜单id缺失");
+        }
+        SystemMenuCommonlyUsed systemMenuCommonlyUsed = BeanUtil.toBean(dto, SystemMenuCommonlyUsed.class);
+        boolean isSuccess = systemMenuCommonlyUsedService.save(systemMenuCommonlyUsed);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改常用功能设置")
+    @SaCheckPermission("systemmenucommonlyused:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSystemMenuCommonlyUsedDto dto){
+
+        SystemMenuCommonlyUsed systemMenuCommonlyUsed = BeanUtil.toBean(dto, SystemMenuCommonlyUsed.class);
+        return RT.ok(systemMenuCommonlyUsedService.updateById(systemMenuCommonlyUsed));
+
+    }
+
+
+
+}

src/main/java/com/xjrsoft/module/system/controller/SystemUpdateMessageController.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+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.system.dto.AddSystemUpdateMessageDto;
+import com.xjrsoft.module.system.dto.AddSystemUpdateMessageNoticeDto;
+import com.xjrsoft.module.system.dto.UpdateSystemUpdateMessageDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.system.dto.SystemUpdateMessagePageDto;
+import com.xjrsoft.module.system.entity.SystemUpdateMessage;
+import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+import com.xjrsoft.module.system.mapper.SystemUpdateMessageMapper;
+import com.xjrsoft.module.system.service.ISystemUpdateMessageService;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+
+import com.xjrsoft.module.system.vo.SystemUpdateMessageVo;
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 系统消息
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/systemUpdateMessage")
+@Api(value = "/system"  + "/systemUpdateMessage",tags = "系统消息代码")
+@AllArgsConstructor
+public class SystemUpdateMessageController {
+
+
+    private final ISystemUpdateMessageService systemUpdateMessageService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="系统消息列表(分页)")
+    @SaCheckPermission("systemupdatemessage:detail")
+    public RT<PageOutput<SystemUpdateMessagePageVo>> page(@Valid SystemUpdateMessagePageDto dto){
+        Page<SystemUpdateMessagePageVo> page = systemUpdateMessageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<SystemUpdateMessagePageVo> pageOutput = ConventPage.getPageOutput(page, SystemUpdateMessagePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询系统消息信息")
+    @SaCheckPermission("systemupdatemessage:detail")
+    public RT<SystemUpdateMessageVo> info(@RequestParam Long id){
+        SystemUpdateMessage systemUpdateMessage = systemUpdateMessageService.getById(id);
+        if (systemUpdateMessage == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(systemUpdateMessage, SystemUpdateMessageVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增系统消息")
+    @SaCheckPermission("systemupdatemessage:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSystemUpdateMessageDto dto){
+        SystemUpdateMessage systemUpdateMessage = BeanUtil.toBean(dto, SystemUpdateMessage.class);
+        boolean isSuccess = systemUpdateMessageService.save(systemUpdateMessage);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改系统消息")
+    @SaCheckPermission("systemupdatemessage:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSystemUpdateMessageDto dto){
+
+        SystemUpdateMessage systemUpdateMessage = BeanUtil.toBean(dto, SystemUpdateMessage.class);
+        return RT.ok(systemUpdateMessageService.updateById(systemUpdateMessage));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除系统消息")
+    @SaCheckPermission("systemupdatemessage:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(systemUpdateMessageService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/system/controller/SystemUpdateMessageNoticeController.java

@@ -0,0 +1,133 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+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.system.dto.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.system.entity.SystemUpdateMessage;
+import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+import com.xjrsoft.module.system.service.ISystemUpdateMessageNoticeService;
+import com.xjrsoft.module.system.vo.MenuTreeVo;
+import com.xjrsoft.module.system.vo.SystemUpdateMessageNoticePageVo;
+
+import com.xjrsoft.module.system.vo.SystemUpdateMessageNoticeVo;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+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.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+* @title: 系统消息通知表
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/systemUpdateMessageNotice")
+@Api(value = "/system"  + "/systemUpdateMessageNotice",tags = "系统消息通知表代码")
+@AllArgsConstructor
+public class SystemUpdateMessageNoticeController {
+
+
+    private final ISystemUpdateMessageNoticeService systemUpdateMessageNoticeService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="系统消息通知表列表(分页)")
+    @SaCheckPermission("systemupdatemessagenotice:detail")
+    public RT<PageOutput<SystemUpdateMessageNoticePageVo>> page(@Valid SystemUpdateMessageNoticePageDto dto){
+
+        LambdaQueryWrapper<SystemUpdateMessageNotice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SystemUpdateMessageNotice::getId)
+                .select(SystemUpdateMessageNotice.class,x -> VoToColumnUtil.fieldsToColumns(SystemUpdateMessageNoticePageVo.class).contains(x.getProperty()));
+        IPage<SystemUpdateMessageNotice> page = systemUpdateMessageNoticeService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SystemUpdateMessageNoticePageVo> pageOutput = ConventPage.getPageOutput(page, SystemUpdateMessageNoticePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/submit")
+    @ApiOperation(value = "发布")
+    @SaCheckPermission("systemupdatemessage:detail")
+    public RT<Boolean> submit(@Valid SystemUpdateMessage dto) {
+        String[] teacherUserIds = systemUpdateMessageNoticeService.getTeacherUserId();
+        String[] studentUserIds = systemUpdateMessageNoticeService.getStudentUserId();
+
+        List<SystemUpdateMessageNotice> noticeDtos = new ArrayList<>();
+        if (dto.getSendRange() == 2) {
+            for (String userId : teacherUserIds) {
+                SystemUpdateMessageNotice temp = new SystemUpdateMessageNotice();
+                temp.setUserId(userId);
+                temp.setStatus(0);
+                temp.setSystemUpdateMessageId(dto.getId());
+                noticeDtos.add(temp);
+            }
+        } else if (dto.getSendRange() == 1) {
+            List<String> allUserIds = new ArrayList<>(Arrays.asList(teacherUserIds));
+            allUserIds.addAll(Arrays.asList(studentUserIds));
+            for (String userId : allUserIds) {
+                SystemUpdateMessageNotice temp = new SystemUpdateMessageNotice();
+                temp.setUserId(userId);
+                temp.setStatus(0);
+                temp.setSystemUpdateMessageId(dto.getId());
+                noticeDtos.add(temp);
+            }
+        }
+
+        boolean isSuccess = systemUpdateMessageNoticeService.saveBatch(noticeDtos);
+        return RT.ok(isSuccess);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询系统消息通知表信息")
+    @SaCheckPermission("systemupdatemessagenotice:detail")
+    public RT<SystemUpdateMessageNoticeVo> info(@RequestParam Long id){
+        SystemUpdateMessageNotice systemUpdateMessageNotice = systemUpdateMessageNoticeService.getById(id);
+        if (systemUpdateMessageNotice == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(systemUpdateMessageNotice, SystemUpdateMessageNoticeVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增系统消息通知表")
+    @SaCheckPermission("systemupdatemessagenotice:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSystemUpdateMessageNoticeDto dto){
+        SystemUpdateMessageNotice systemUpdateMessageNotice = BeanUtil.toBean(dto, SystemUpdateMessageNotice.class);
+        boolean isSuccess = systemUpdateMessageNoticeService.save(systemUpdateMessageNotice);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改系统消息通知表")
+    @SaCheckPermission("systemupdatemessagenotice:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSystemUpdateMessageNoticeDto dto){
+
+        SystemUpdateMessageNotice systemUpdateMessageNotice = BeanUtil.toBean(dto, SystemUpdateMessageNotice.class);
+        return RT.ok(systemUpdateMessageNoticeService.updateById(systemUpdateMessageNotice));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除系统消息通知表")
+    @SaCheckPermission("systemupdatemessagenotice:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(systemUpdateMessageNoticeService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/system/controller/XjrMenuDeptRelationController.java

@@ -75,7 +75,7 @@ public class XjrMenuDeptRelationController {
     public RT<Boolean> add(@Valid @RequestBody AddXjrMenuDeptRelationDto dto){
         XjrMenuDeptRelation xjrMenuDeptRelation = BeanUtil.toBean(dto, XjrMenuDeptRelation.class);
         boolean isSuccess = xjrMenuDeptRelationService.save(xjrMenuDeptRelation);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

src/main/java/com/xjrsoft/module/system/dto/AddMenuDto.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.system.dto;
 
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -106,4 +107,6 @@ public class AddMenuDto implements Serializable {
     @ApiModelProperty("表单字段列表")
     private List<AddMenuFormDto> formList;
 
+    @ApiModelProperty("菜单部门关联表")
+    private List<AddXjrMenuDeptRelationDto> menuDeptRelations;
 }

src/main/java/com/xjrsoft/module/system/dto/AddSystemMenuCommonlyUsedDto.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Data
+public class AddSystemMenuCommonlyUsedDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer seq;
+
+}

src/main/java/com/xjrsoft/module/system/dto/AddSystemUpdateMessageDto.java

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.PageInput;
+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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+public class AddSystemUpdateMessageDto extends PageInput implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 发送范围（1：全体师生，2：全体教职工）
+    */
+    @ApiModelProperty("发送范围（1：全体师生，2：全体教职工）")
+    private Integer sendRange;
+    /**
+    * 消息标题
+    */
+    @ApiModelProperty("消息标题")
+    private String title;
+    /**
+    * 标题颜色
+    */
+    @ApiModelProperty("标题颜色")
+    private String titleColor;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+    /**
+    * 状态（0：未发布 1：已发布）
+    */
+    @ApiModelProperty("状态（0：未发布 1：已发布）")
+    private Integer status;
+
+}

src/main/java/com/xjrsoft/module/system/dto/AddSystemUpdateMessageNoticeDto.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+public class AddSystemUpdateMessageNoticeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 系统消息（system_update_message）
+    */
+    @ApiModelProperty("系统消息（system_update_message）")
+    private Long systemUpdateMessageId;
+    /**
+    * 用户id（xjr_user）
+    */
+    @ApiModelProperty("用户id（xjr_user）")
+    private String userId;
+    /**
+    * 状态（0：未读，1：已读）
+    */
+    @ApiModelProperty("状态（0：未读，1：已读）")
+    private Integer status;
+
+}

src/main/java/com/xjrsoft/module/system/dto/SystemMenuCommonlyUsedPageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemMenuCommonlyUsedPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/system/dto/SystemUpdateMessageNoticePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemUpdateMessageNoticePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/system/dto/SystemUpdateMessagePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemUpdateMessagePageDto extends PageInput {
+
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateMenuDto.java

@@ -116,5 +116,6 @@ public class UpdateMenuDto implements Serializable {
     @ApiModelProperty("表单字段列表")
     private List<UpdateMenuFormDto> formList;
 
-
+    @ApiModelProperty("菜单部门关联表")
+    private List<UpdateXjrMenuDeptRelationDto> menuDeptRelations;
 }

src/main/java/com/xjrsoft/module/system/dto/UpdateSystemMenuCommonlyUsedDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Data
+public class UpdateSystemMenuCommonlyUsedDto extends AddSystemMenuCommonlyUsedDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateSystemUpdateMessageDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+public class UpdateSystemUpdateMessageDto extends AddSystemUpdateMessageDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateSystemUpdateMessageNoticeDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+public class UpdateSystemUpdateMessageNoticeDto extends AddSystemUpdateMessageNoticeDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/entity/SystemMenuCommonlyUsed.java

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Data
+@TableName("system_menu_commonly_used")
+@ApiModel(value = "system_menu_commonly_used", description = "常用功能设置")
+public class SystemMenuCommonlyUsed 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;
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer seq;
+
+
+}

src/main/java/com/xjrsoft/module/system/entity/SystemUpdateMessage.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+@TableName("system_update_message")
+@ApiModel(value = "system_update_message", description = "系统消息")
+public class SystemUpdateMessage 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;
+    /**
+    * 发送范围（1：全体师生，2：全体教职工）
+    */
+    @ApiModelProperty("发送范围（1：全体师生，2：全体教职工）")
+    private Integer sendRange;
+    /**
+    * 消息标题
+    */
+    @ApiModelProperty("消息标题")
+    private String title;
+    /**
+    * 标题颜色
+    */
+    @ApiModelProperty("标题颜色")
+    private String titleColor;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+    /**
+    * 状态（0：未发布 1：已发布）
+    */
+    @ApiModelProperty("状态（0：未发布 1：已发布）")
+    private Integer status;
+
+
+}

src/main/java/com/xjrsoft/module/system/entity/SystemUpdateMessageNotice.java

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Data
+@TableName("system_update_message_notice")
+@ApiModel(value = "system_update_message_notice", description = "系统消息通知表")
+public class SystemUpdateMessageNotice 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;
+    /**
+    * 系统消息（system_update_message）
+    */
+    @ApiModelProperty("系统消息（system_update_message）")
+    private Long systemUpdateMessageId;
+    /**
+    * 用户id（xjr_user）
+    */
+    @ApiModelProperty("用户id（xjr_user）")
+    private String userId;
+    /**
+    * 状态（0：未读，1：已读）
+    */
+    @ApiModelProperty("状态（0：未读，1：已读）")
+    private Integer status;
+
+
+}

src/main/java/com/xjrsoft/module/system/mapper/SystemMenuCommonlyUsedMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.entity.SystemMenuCommonlyUsed;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 常用功能设置
+* @Author brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Mapper
+public interface SystemMenuCommonlyUsedMapper extends MPJBaseMapper<SystemMenuCommonlyUsed> {
+
+}

src/main/java/com/xjrsoft/module/system/mapper/SystemUpdateMessageMapper.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.dto.SystemUpdateMessagePageDto;
+import com.xjrsoft.module.system.entity.SystemUpdateMessage;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 系统消息
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Mapper
+public interface SystemUpdateMessageMapper extends MPJBaseMapper<SystemUpdateMessage> {
+    Page<SystemUpdateMessagePageVo> getPage(Page<Object> page, SystemUpdateMessagePageDto dto);
+}

src/main/java/com/xjrsoft/module/system/mapper/SystemUpdateMessageNoticeMapper.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageTempVo;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+* @title: 系统消息通知表
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Mapper
+public interface SystemUpdateMessageNoticeMapper extends MPJBaseMapper<SystemUpdateMessageNotice> {
+
+    List<SystemUpdateMessagePageTempVo> GetTeacherUserID();
+
+    List<SystemUpdateMessagePageTempVo> GetStudentUserID();
+}

src/main/java/com/xjrsoft/module/system/mapper/XjrMenuDeptRelationMapper.java

@@ -7,6 +7,7 @@ import com.xjrsoft.module.evaluate.dto.EvaluateTemplatePageDto;
 import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
 import com.xjrsoft.module.system.dto.XjrMenuDeptRelationPageDto;
 import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
+import com.xjrsoft.module.system.vo.XjrMentDeptGroupVo;
 import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +23,6 @@ import java.util.List;
 @Mapper
 public interface XjrMenuDeptRelationMapper extends MPJBaseMapper<XjrMenuDeptRelation> {
     Page<XjrMenuDeptRelationPageVo> getPage(Page<XjrMenuDeptRelationPageDto> page,  @Param("list")List<String> list);
+
+    List<XjrMentDeptGroupVo> getMenuDept();
 }

src/main/java/com/xjrsoft/module/system/mapper/XjrMenuQuickMapper.java

@@ -2,8 +2,11 @@ package com.xjrsoft.module.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xjrsoft.module.system.entity.XjrMenuQuick;
+import com.xjrsoft.module.system.vo.MenuTreeVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
 * @title: 快捷菜单
 * @Author fanxp
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface XjrMenuQuickMapper extends BaseMapper<XjrMenuQuick> {
 
+    List<MenuTreeVo> selectAllList(List<String> deptIdList);
 }

src/main/java/com/xjrsoft/module/system/service/IMenuService.java

@@ -6,6 +6,7 @@ import com.xjrsoft.module.system.dto.RoleMenuServeListDto;
 import com.xjrsoft.module.system.entity.Menu;
 import com.xjrsoft.module.system.vo.MenuAllServeVo;
 import com.xjrsoft.module.system.vo.MenuServeVo;
+import com.xjrsoft.module.system.vo.MenuTreeVo;
 import com.xjrsoft.module.system.vo.MenuVo;
 
 import java.util.List;
@@ -29,4 +30,6 @@ public interface IMenuService extends MPJBaseService<Menu> {
     List<MenuServeVo> getRoleMenuServe(RoleMenuServeListDto dto);
 
     List<Menu> getUserQuick(MenuTreeDto dto);
+
+    List<MenuTreeVo> selectAllist(List<String> deptIdList);
 }

src/main/java/com/xjrsoft/module/system/service/ISystemMenuCommonlyUsedService.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.entity.SystemMenuCommonlyUsed;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 常用功能设置
+* @Author brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+
+public interface ISystemMenuCommonlyUsedService extends MPJBaseService<SystemMenuCommonlyUsed> {
+    Boolean removeByMenuId(List<Long> ids);
+}

src/main/java/com/xjrsoft/module/system/service/ISystemUpdateMessageNoticeService.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.system.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.dto.AddSystemUpdateMessageNoticeDto;
+import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+
+import java.util.List;
+
+/**
+* @title: 系统消息通知表
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+
+public interface ISystemUpdateMessageNoticeService extends MPJBaseService<SystemUpdateMessageNotice> {
+    String[] getTeacherUserId();
+
+    String[] getStudentUserId();
+}

src/main/java/com/xjrsoft/module/system/service/ISystemUpdateMessageService.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.dto.SystemUpdateMessagePageDto;
+import com.xjrsoft.module.system.entity.SystemUpdateMessage;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 系统消息
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+
+public interface ISystemUpdateMessageService extends MPJBaseService<SystemUpdateMessage> {
+    Page<SystemUpdateMessagePageVo> getPage(Page<Object> objectPage, SystemUpdateMessagePageDto dto);
+}

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -16,6 +16,7 @@ import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.FixedArithmeticCaptcha;
 import com.xjrsoft.common.utils.RSAUtil;
 import com.xjrsoft.common.utils.RedisUtil;
@@ -38,6 +39,8 @@ import com.xjrsoft.module.system.dto.LoginByCodeDto;
 import com.xjrsoft.module.system.dto.LoginCaptchaDto;
 import com.xjrsoft.module.system.dto.LoginDto;
 import com.xjrsoft.module.system.dto.LoginQRCodeDto;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.system.service.ILoginService;
 import com.xjrsoft.module.system.vo.CreateTokenVo;
 import com.xjrsoft.module.system.vo.ImgCaptchaVo;
@@ -77,6 +80,8 @@ public class LoginServiceImpl implements ILoginService {
 
     private final UserRoleRelationMapper userRoleRelationMapper;
 
+    private final IFileService fileService;
+
     @Override
     public LoginVo login(LoginDto dto) throws Exception {
         if (licenseConfig.getEnabled()) {
@@ -112,6 +117,7 @@ public class LoginServiceImpl implements ILoginService {
             throw new MyException("账号或密码不正确");
         }
 
+
         return getLoginInfo(loginUser, "PC");
     }
 
@@ -296,6 +302,11 @@ public class LoginServiceImpl implements ILoginService {
         if (oauth2Info != null) {
             result.setRedirectUri(redisUtil.get(oauth2Info));
         }
+        result.setSignFolderId(loginUser.getSignFolderId());
+        List<File> list = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, loginUser.getSignFolderId()));
+        if(!list.isEmpty()){
+            result.setSignUrl(list.get(0).getFileUrl());
+        }
 
         return result;
     }

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -21,6 +21,7 @@ import com.xjrsoft.module.system.entity.Subsystem;
 import com.xjrsoft.module.system.entity.XjrMenuQuick;
 import com.xjrsoft.module.system.mapper.AuthorizeMapper;
 import com.xjrsoft.module.system.mapper.MenuMapper;
+import com.xjrsoft.module.system.mapper.XjrMenuDeptRelationMapper;
 import com.xjrsoft.module.system.mapper.XjrMenuQuickMapper;
 import com.xjrsoft.module.system.service.IMenuService;
 import com.xjrsoft.module.system.vo.*;
@@ -49,6 +50,8 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
 
     private final XjrMenuQuickMapper menuQuickMapper;
 
+    private final XjrMenuDeptRelationMapper menuDeptRelationMapper;
+
     @Override
     public List<MenuVo> getAuthMenuList(MenuTreeDto dto) {
         List<Long> roleIds = getUserRoleIds();
@@ -155,6 +158,11 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
         return menus;
     }
 
+    @Override
+    public List<MenuTreeVo> selectAllist(List<String> deptIdList) {
+        return menuQuickMapper.selectAllList(deptIdList);
+    }
+
     /**
      * 根据角色获取菜单
      *
@@ -184,21 +192,35 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             }
             authMenuIdList = authorizeList.stream().map(Authorize::getObjectId).collect(Collectors.toList());
         }
+        List<MenuVo> menuVos = this.selectJoinList(MenuVo.class,
+            MPJWrappers.<Menu>lambdaJoin()
+            .like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
+            .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
+            .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
+            .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
+            .eq(ObjectUtil.isNotEmpty(dto.getDisplay()), Menu::getDisplay, dto.getDisplay())
+            .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
+            .select(Menu::getId)
+            .select("1 as authorized")
+            .selectAs(Subsystem::getName, MenuVo::getSystemName)
+            .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
+            .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
+            .eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
+            .orderByAsc(Menu::getSortCode)
+        );
+        List<XjrMentDeptGroupVo> menuDept = menuDeptRelationMapper.getMenuDept();
+        Map<Long, String> deptNameMap = new HashMap<>();
+        Map<Long, String> deptIdMap = new HashMap<>();
+        for (XjrMentDeptGroupVo deptGroupVo : menuDept) {
+            deptNameMap.put(deptGroupVo.getMenuId(), deptGroupVo.getDeptNames());
+            deptIdMap.put(deptGroupVo.getMenuId(), deptGroupVo.getDeptIds());
+        }
+        for (MenuVo menuVo : menuVos) {
+            menuVo.setDeptId(deptIdMap.get(menuVo.getId()));
+            menuVo.setDeptName(deptNameMap.get(menuVo.getId()));
+        }
 
-        return this.selectJoinList(MenuVo.class,
-                MPJWrappers.<Menu>lambdaJoin()
-                        .like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
-                        .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
-                        .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
-                        .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
-                        .eq(ObjectUtil.isNotEmpty(dto.getDisplay()),Menu::getDisplay, dto.getDisplay())
-                        .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
-                        .select(Menu::getId)
-                        .selectAs(Subsystem::getName, MenuVo::getSystemName)
-                        .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
-                        .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
-                        .eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
-                        .orderByAsc(Menu::getSortCode));
+        return menuVos;
     }
 
     /**

src/main/java/com/xjrsoft/module/system/service/impl/SystemMenuCommonlyUsedServiceImpl.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.module.system.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.system.entity.SystemMenuCommonlyUsed;
+import com.xjrsoft.module.system.mapper.SystemMenuCommonlyUsedMapper;
+import com.xjrsoft.module.system.service.ISystemMenuCommonlyUsedService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 常用功能设置
+* @Author brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SystemMenuCommonlyUsedServiceImpl extends MPJBaseServiceImpl<SystemMenuCommonlyUsedMapper, SystemMenuCommonlyUsed> implements ISystemMenuCommonlyUsedService {
+    @Override
+    public Boolean removeByMenuId(List<Long> ids) {
+        return this.remove(
+            new QueryWrapper<SystemMenuCommonlyUsed>().lambda()
+            .eq(SystemMenuCommonlyUsed::getCreateUserId, StpUtil.getLoginIdAsLong()).in(SystemMenuCommonlyUsed::getMenuId, ids)
+        );
+    }
+}

src/main/java/com/xjrsoft/module/system/service/impl/SystemUpdateMessageNoticeServiceImpl.java

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.system.entity.Menu;
+import com.xjrsoft.module.system.entity.Subsystem;
+import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+import com.xjrsoft.module.system.mapper.SystemUpdateMessageNoticeMapper;
+import com.xjrsoft.module.system.service.ISystemUpdateMessageNoticeService;
+import com.xjrsoft.module.system.vo.MenuTreeVo;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageTempVo;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @title: 系统消息通知表
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SystemUpdateMessageNoticeServiceImpl extends MPJBaseServiceImpl<SystemUpdateMessageNoticeMapper, SystemUpdateMessageNotice> implements ISystemUpdateMessageNoticeService {
+    private final SystemUpdateMessageNoticeMapper systemUpdateMessageNoticeMapper;
+
+    @Override
+    public String[] getTeacherUserId() {
+        List<SystemUpdateMessagePageTempVo> temp = systemUpdateMessageNoticeMapper.GetTeacherUserID();
+        String[] teacherIds = temp.stream().map(SystemUpdateMessagePageTempVo::getUserId).toArray(String[]::new);
+        return teacherIds;
+    }
+
+    @Override
+    public String[] getStudentUserId() {
+        List<SystemUpdateMessagePageTempVo> temp = systemUpdateMessageNoticeMapper.GetStudentUserID();
+        String[] studentTeacherIds = temp.stream().map(SystemUpdateMessagePageTempVo::getUserId).toArray(String[]::new);
+        return studentTeacherIds;
+    }
+}

src/main/java/com/xjrsoft/module/system/service/impl/SystemUpdateMessageServiceImpl.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.system.dto.SystemUpdateMessagePageDto;
+import com.xjrsoft.module.system.entity.SystemUpdateMessage;
+import com.xjrsoft.module.system.mapper.SystemUpdateMessageMapper;
+import com.xjrsoft.module.system.service.ISystemUpdateMessageService;
+import com.xjrsoft.module.system.vo.SystemUpdateMessagePageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 系统消息
+* @Author brealinxx
+* @Date: 2024-04-17
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SystemUpdateMessageServiceImpl extends MPJBaseServiceImpl<SystemUpdateMessageMapper, SystemUpdateMessage> implements ISystemUpdateMessageService {
+    private final SystemUpdateMessageMapper systemUpdateMessageMapper;
+
+    @Override
+    public Page<SystemUpdateMessagePageVo> getPage(Page<Object> objectPage, SystemUpdateMessagePageDto dto) {
+        return systemUpdateMessageMapper.getPage(objectPage, dto);
+    }
+}

src/main/java/com/xjrsoft/module/system/vo/LoginVo.java

@@ -27,4 +27,10 @@ public class LoginVo {
      * 跳转地址
      */
     private String redirectUri;
+
+    @ApiModelProperty("签名地址")
+    private String signUrl;
+
+    @ApiModelProperty("签名文件id")
+    private Long signFolderId;
 }

src/main/java/com/xjrsoft/module/system/vo/MenuTreeVo.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.xjrsoft.common.enums.YesOrNoEnum;
 import com.xjrsoft.common.model.tree.ITreeNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -138,6 +139,9 @@ public class MenuTreeVo implements ITreeNode<MenuTreeVo,Long>, Serializable {
 
     private Integer enabledMark;
 
+    private String deptName;
+    private String deptId;
+
     private List<MenuTreeVo> children;
 
     private Boolean disabled;
@@ -181,4 +185,7 @@ public class MenuTreeVo implements ITreeNode<MenuTreeVo,Long>, Serializable {
         }
         return parentId;
     }
+
+    @ApiModelProperty("是否有权限（1：是 0：否）")
+    private Integer authorized;
 }

src/main/java/com/xjrsoft/module/system/vo/MenuVo.java

@@ -87,4 +87,13 @@ public class MenuVo implements Serializable {
     @ApiModelProperty("是否被选中")
     private Boolean isSelect;
 
+    @ApiModelProperty("是否有权限（1：是 0：否）")
+    private Integer authorized;
+
+    @ApiModelProperty("部门id")
+    private String deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
 }

src/main/java/com/xjrsoft/module/system/vo/SystemMenuCommonlyUsedPageVo.java

@@ -0,0 +1,81 @@
+package com.xjrsoft.module.system.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 brealinxx
+* @Date: 2024-04-18
+* @Version 1.0
+*/
+@Data
+public class SystemMenuCommonlyUsedPageVo {
+
+    /**
+    * 
+    */
+    @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;
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer seq;
+
+    @ApiModelProperty("")
+    private String iconUrl;
+
+    @ApiModelProperty("")
+    private String path;
+
+    @ApiModelProperty("")
+    private String remark;
+
+    @ApiModelProperty("")
+    private String title;
+
+}