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

# Conflicts:
#	src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java
#	src/main/java/com/xjrsoft/module/material/dto/AddMaterialTaskDto.java
#	src/main/java/com/xjrsoft/module/material/service/IMaterialTypeService.java
#	src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java
#	src/main/java/com/xjrsoft/module/material/service/impl/MaterialTypeServiceImpl.java
#	src/main/java/com/xjrsoft/module/student/controller/ConsumptionController.java

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -25,10 +25,7 @@ import com.xjrsoft.module.material.dto.MaterialTaskAssignPageDto;
 import com.xjrsoft.module.material.dto.MaterialTaskPageDto;
 import com.xjrsoft.module.material.dto.MaterialTaskWaitPageDto;
 import com.xjrsoft.module.material.dto.UpdateMaterialTaskDto;
-import com.xjrsoft.module.material.entity.MaterialTask;
-import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
-import com.xjrsoft.module.material.entity.MaterialTaskAssign;
-import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import com.xjrsoft.module.material.entity.*;
 import com.xjrsoft.module.material.service.IMaterialTaskAppendixService;
 import com.xjrsoft.module.material.service.IMaterialTaskAssignService;
 import com.xjrsoft.module.material.service.IMaterialTaskService;
@@ -80,22 +77,29 @@ public class MaterialTaskController {
 
 
     private final IMaterialTaskAssignService materialTaskAssignService;
+
     private  final IMaterialTaskAppendixService materialTaskAppendixService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value = "材料提交任务列表(分页 自己)")
+    @ApiOperation(value = "材料提交任务列表(分页 我发布的)")
     @SaCheckPermission("materialtask:detail")
     public RT<PageOutput<MaterialTaskPageVo>> page(@Valid MaterialTaskPageDto dto) {
 
-        LambdaQueryWrapper<MaterialTask> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<MaterialTask> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .orderByDesc(MaterialTask::getId)
                 .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .like(StrUtil.isNotBlank(dto.getName()), MaterialTask::getName, dto.getName())
                 .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
                 .eq((ObjectUtil.isNotEmpty(dto.getStatus())) && dto.getStatus() > 0, MaterialTask::getStatus, dto.getStatus())
-                .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskPageVo.class).contains(x.getProperty()));
-        IPage<MaterialTask> page = materialTaskService.page(ConventPage.getPage(dto), queryWrapper);
+                .gt(dto.getCreateDateStart() != null && !dto.getCreateDateStart().equals(""), MaterialTask::getCreateDate, dto.getCreateDateStart())
+                .lt(dto.getCreateDateEnd() != null && !dto.getCreateDateEnd().equals(""), MaterialTask::getCreateDate, dto.getCreateDateEnd())
+                .select(MaterialTask::getId)
+                .selectAs(MaterialType::getName, MaterialTaskPageVo::getMaterialTypeIdCn)
+                .selectAs(MaterialType::getCreateDate, MaterialTaskPageVo::getCreateDate)
+                .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskPageVo.class).contains(x.getProperty()))
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTask::getMaterialTypeId);
+        IPage<MaterialTaskPageVo> page = materialTaskService.selectJoinListPage(ConventPage.getPage(dto), MaterialTaskPageVo.class, queryWrapper);
         PageOutput<MaterialTaskPageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTaskPageVo.class);
         return RT.ok(pageOutput);
     }
@@ -110,8 +114,9 @@ public class MaterialTaskController {
                 .disableLogicDel()
 //                .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .like(StrUtil.isNotBlank(dto.getName()), MaterialTask::getName, dto.getName())
+                .like(StrUtil.isNotBlank(dto.getAssignedUser()), XjrUser::getName, dto.getAssignedUser())
                 .eq(ObjectUtil.isNotEmpty(dto.getStatus()) && dto.getStatus() > 0, MaterialTask::getStatus, dto.getStatus())
-                .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
+//                .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
                 .eq((ObjectUtil.isNotEmpty(dto.getExtStatus())) && dto.getExtStatus() > 0, MaterialTaskAssign::getStatus, dto.getExtStatus())
                 .select(MaterialTask::getId)
                 .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskWaitPageVo.class).contains(x.getProperty()))
@@ -122,13 +127,12 @@ public class MaterialTaskController {
                 .selectAs(MaterialTaskAssign::getTransferSubmitedPerson, MaterialTaskWaitPageVo::getTransferSubmitedPerson)
                 .selectAs(MaterialTaskAssign::getStatus, MaterialTaskWaitPageVo::getProcessStatus)
                 .leftJoin(XjrUser.class, XjrUser::getId, MaterialTask::getCreateUserId, ext -> ext.selectAs(XjrUser::getName, MaterialTaskWaitPageVo::getCreateUserName))
-                .like(StrUtil.isNotBlank(dto.getAssignedUser()), XjrUser::getName, dto.getAssignedUser())
         ;
 
-        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {
-            queryWrapper.ge(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteStareTime());
-            queryWrapper.le(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteEndTime());
-        }
+//        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {
+//            queryWrapper.ge(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteStareTime());
+//            queryWrapper.le(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteEndTime());
+//        }
 
         IPage<MaterialTaskWaitPageVo> page = materialTaskService.selectJoinListPage(ConventPage.getPage(dto), MaterialTaskWaitPageVo.class, queryWrapper);
 
@@ -140,24 +144,7 @@ public class MaterialTaskController {
     @ApiOperation(value = "根据id查询材料提交任务信息")
     @SaCheckPermission("materialtask:detail")
     public RT<MaterialTaskVo> info(@RequestParam Long id) {
-        MaterialTask materialTask = materialTaskService.getByIdDeep(id);
-        if (materialTask == null) {
-            return RT.error("找不到此数据！");
-        }
-
-        MaterialTaskVo materialTaskVo = BeanUtil.toBean(materialTask, MaterialTaskVo.class);
-        List<MaterialTaskAppendixVo> newsAppendixVoList = materialTaskAppendixService.selectJoinList(MaterialTaskAppendixVo.class,
-                new MPJLambdaWrapper<MaterialTaskAppendix>().eq(MaterialTaskAppendix::getMaterialTaskId, id)
-                        .select(MaterialTaskAppendix::getId)
-                        .select(MaterialTaskAppendix.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAppendixVo.class).contains(x.getProperty()))
-                        .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId, ext -> ext.selectAs(File::getFileName, MaterialTaskAppendixVo::getFileName)
-                                .selectAs(File::getFolderId, MaterialTaskAppendixVo::getFolderId)
-                                .selectAs(File::getFileUrl, MaterialTaskAppendixVo::getFileUrl))
-        );
-
-        if (newsAppendixVoList.size() > 0) {
-            materialTaskVo.setMaterialTaskAppendixList(newsAppendixVoList);
-        }
+        MaterialTaskVo materialTaskVo = materialTaskService.getInfoById(id);
         return RT.ok(materialTaskVo);
     }
 
@@ -166,7 +153,13 @@ public class MaterialTaskController {
     @ApiOperation(value = "新增材料提交任务")
     @SaCheckPermission("materialtask:add")
     public RT<Long> add(@Valid @RequestBody AddMaterialTaskDto dto) {
-        return RT.ok(materialTaskService.add(dto));
+        Long materialTaskId = materialTaskService.add(dto);
+        //当返回了id表示成功添加了且需要发送通知
+        if(materialTaskId != null && materialTaskId > 0 && dto.getSendMessage() == 1){;
+            materialTaskService.sendMessage(materialTaskId);
+        }
+
+        return RT.ok(materialTaskId);
     }
 
     @PutMapping

src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -85,16 +85,7 @@ public class MaterialTypeController {
     @GetMapping(value = "/list")
     @ApiOperation(value="材料提交任务类型列表(权限)")
     public RT<List<MaterialTypeVo>> list() {
-
-        List<MaterialTypeVo> pageOutput = materialTypeService.selectJoinList(MaterialTypeVo.class, new MPJLambdaWrapper<MaterialType>()
-                .disableSubLogicDel()
-                .eq(MaterialTypeAssign::getUserId, StpUtil.getLoginIdAsLong())
-                .select(MaterialType::getId)
-                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
-                .innerJoin(MaterialTypeAssign.class, MaterialTypeAssign::getMaterialTypeId, MaterialType::getId)
-        );
-
-        return RT.ok(pageOutput);
+        return RT.ok(materialTypeService.listMaterialTypeVo());
     }
 
     @GetMapping(value = "/info")

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

@@ -83,10 +83,10 @@ public class AddMaterialTaskDto implements Serializable {
     @ApiModelProperty("用户列表")
     private List<MaterialAssignUserDto> userList;
     /**
-     * 发送消息状态 0=未不发 1=已发送
+     * 是否发送消息 0=不发 1=发送 类型里不需要
      */
-    @ApiModelProperty("发送消息状态 0=未不发 1=已发送")
-    private Integer sendMessageStatus;
+    @ApiModelProperty("是否发送消息 0=不发 1=发送")
+    private Integer sendMessage;
     /**
     * materialTaskAppendix
     */

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

@@ -1,10 +1,15 @@
 package com.xjrsoft.module.material.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 
 /**
 * @title: 材料提交任务分页查询入参
@@ -30,4 +35,17 @@ public class MaterialTaskPageDto extends PageInput {
      */
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDateStart;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDateEnd;
+
 }

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

@@ -12,8 +12,8 @@ public class MaterialTaskWaitPageDto extends PageInput {
     /**
      * 材料提交任务类型(material_type)
      */
-    @ApiModelProperty("材料提交任务类型(material_type)")
-    private Long materialTypeId;
+//    @ApiModelProperty("材料提交任务类型(material_type)")
+//    private Long materialTypeId;
     /**
      * 任务名称
      */
@@ -33,16 +33,16 @@ public class MaterialTaskWaitPageDto extends PageInput {
     /**
      * 要求完成日期 开始
      */
-    @ApiModelProperty("要求完成日期 开始")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteStareTime;
+//    @ApiModelProperty("要求完成日期 开始")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private LocalDateTime requiredCompleteStareTime;
 
     /**
      * 要求完成日期 结束
      */
-    @ApiModelProperty("要求完成日期 结束")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteEndTime;
+//    @ApiModelProperty("要求完成日期 结束")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private LocalDateTime requiredCompleteEndTime;
 
     /**
      * 执行状态 1=未提交 2=待审核 3=通过 4=重做

src/main/java/com/xjrsoft/module/material/service/IMaterialTaskService.java

@@ -4,6 +4,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
 import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
+import com.xjrsoft.module.material.vo.MaterialTaskVo;
 
 import java.util.List;
 
@@ -45,4 +46,8 @@ public interface IMaterialTaskService extends MPJBaseService<MaterialTask> {
      * @return
      */
     Boolean submited(MaterialTaskAssignAppendixDto dto);
+
+    MaterialTaskVo getInfoById(Long id);
+
+    void sendMessage(Long materialTaskId);
 }

src/main/java/com/xjrsoft/module/material/service/IMaterialTypeService.java

@@ -44,4 +44,6 @@ public interface IMaterialTypeService extends MPJBaseService<MaterialType> {
     PageOutput<MaterialTypePageVo> getPage(MaterialTypePageDto dto);
 
     MaterialTypeVo getInfoById(Long id);
+
+    List<MaterialTypeVo> listMaterialTypeVo();
 }

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

@@ -1,8 +1,26 @@
 package com.xjrsoft.module.material.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 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.MaterialCategoryEnum;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.utils.LocalDateTimeUtil;
+import com.xjrsoft.common.utils.RedisUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.material.dto.AddMaterialTaskAppendixDto;
 import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
 import com.xjrsoft.module.material.dto.MaterialAssignUserDto;
@@ -10,16 +28,35 @@ import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
 import com.xjrsoft.module.material.entity.MaterialTaskAssign;
+import com.xjrsoft.module.material.entity.MaterialType;
 import com.xjrsoft.module.material.mapper.MaterialTaskAppendixMapper;
 import com.xjrsoft.module.material.mapper.MaterialTaskAssignMapper;
 import com.xjrsoft.module.material.mapper.MaterialTaskMapper;
 import com.xjrsoft.module.material.service.IMaterialTaskService;
+import com.xjrsoft.module.material.service.IMaterialTypeService;
+import com.xjrsoft.module.material.vo.MaterialTaskAppendixVo;
+import com.xjrsoft.module.material.vo.MaterialTaskPageVo;
+import com.xjrsoft.module.material.vo.MaterialTaskVo;
+import com.xjrsoft.module.material.vo.MaterialTypeVo;
+import com.xjrsoft.module.oa.entity.News;
+import com.xjrsoft.module.oa.entity.NewsRelation;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
+import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.service.IUserService;
+import com.xjrsoft.module.organization.service.IWeChatService;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -36,17 +73,21 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
     private final MaterialTaskAssignMapper materialTaskMaterialTaskAssignMapper;
     private final MaterialTaskAppendixMapper materialTaskMaterialTaskAppendixMapper;
 
+    private final IMaterialTypeService materialTypeService;
+    private final IWeChatService weChatService;
 
+    private final CommonPropertiesConfig commonPropertiesConfig;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long add(AddMaterialTaskDto dto) {
         MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
+        //新增任务
         materialTask.setStatus(2);
         if(dto.getUserList() == null && !dto.getUserList().isEmpty()){
             materialTask.setSubmitedPerson(dto.getUserList().size());
         }
         materialTaskMaterialTaskMapper.insert(materialTask);
-
+        //新增任务人
         for (MaterialAssignUserDto materialAssignUserDto : dto.getUserList()){
             materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
                 setMaterialTaskId(materialTask.getId());
@@ -55,7 +96,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 setUserNumber(materialAssignUserDto.getUserNumber());
                 setStatus(1);
                 setExecutiveStatus(1);
-                setSendMessage(dto.getSendMessageStatus());
+                setSendMessage(dto.getSendMessage());
             }});
         }
 
@@ -180,4 +221,135 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         }
         return true;
     }
+
+    @Override
+    public MaterialTaskVo getInfoById(Long id) {
+        MPJLambdaWrapper<MaterialTask> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .orderByDesc(MaterialTask::getId)
+                .eq(MaterialTask::getId, id)
+                .select(MaterialTask::getId)
+                .selectAs(MaterialType::getName, MaterialTaskVo::getMaterialTypeIdCn)
+                .selectAs(MaterialType::getCreateDate, MaterialTaskVo::getCreateDate)
+                .selectAs(DictionaryDetail::getName, MaterialTaskVo::getMaterialCategoryCn)
+                .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, MaterialTask::getMaterialCategory)
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTask::getMaterialTypeId);
+        MaterialTaskVo materialTaskVo = this.selectJoinOne(MaterialTaskVo.class, queryWrapper);
+
+        if (materialTaskVo == null) {
+            return materialTaskVo;
+        }
+
+        MaterialTypeVo materialTypeVo = materialTypeService.getInfoById(materialTaskVo.getMaterialTypeId());
+        if(materialTypeVo == null){
+            return materialTaskVo;
+        }
+        if(materialTaskVo.getMaterialCategory().equals(MaterialCategoryEnum.MT0001.getCode())){
+            materialTaskVo.setFolderId(materialTypeVo.getFolderId());
+            materialTaskVo.setFolderIdCn(materialTypeVo.getFolderIdCn());
+            materialTaskVo.setFiles(materialTypeVo.getFiles());
+        }
+        if(materialTaskVo.getMaterialCategory().equals(MaterialCategoryEnum.MT0002.getCode())){
+            materialTaskVo.setFormReleaseId(materialTypeVo.getFormReleaseId());
+            materialTaskVo.setFormReleaseIdCn(materialTypeVo.getFormReleaseIdCn());
+        }
+
+
+//        MPJLambdaWrapper<MaterialTaskAssign> materialTaskAssignMPJLambdaWrapper = new MPJLambdaWrapper<>();
+//        materialTaskAssignMPJLambdaWrapper
+//                .orderByDesc(MaterialTaskAssign::getCreateDate)
+//                .eq(MaterialTaskAssign::getMaterialTaskId, id)
+//                .select(MaterialTask::getId)
+//                .selectAs(MaterialType::getName, MaterialTaskVo::getMaterialTypeIdCn)
+//                .selectAs(MaterialType::getCreateDate, MaterialTaskVo::getCreateDate)
+//                .selectAs(DictionaryDetail::getName, MaterialTaskVo::getMaterialCategoryCn)
+//                .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskVo.class).contains(x.getProperty()))
+//                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, MaterialTask::getMaterialCategory)
+//                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTask::getMaterialTypeId);
+//        MaterialTaskVo materialTaskVo = materialTaskMaterialTaskAssignMapper.selectJoinOne(MaterialTaskVo.class, queryWrapper);
+
+//        List<MaterialTaskAppendixVo> newsAppendixVoList = materialTaskAppendixService.selectJoinList(MaterialTaskAppendixVo.class,
+//                new MPJLambdaWrapper<MaterialTaskAppendix>().eq(MaterialTaskAppendix::getMaterialTaskId, id)
+//                        .select(MaterialTaskAppendix::getId)
+//                        .select(MaterialTaskAppendix.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAppendixVo.class).contains(x.getProperty()))
+//                        .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId, ext -> ext.selectAs(File::getFileName, MaterialTaskAppendixVo::getFileName)
+//                                .selectAs(File::getFolderId, MaterialTaskAppendixVo::getFolderId)
+//                                .selectAs(File::getFileUrl, MaterialTaskAppendixVo::getFileUrl))
+//        );
+//
+//        if (newsAppendixVoList.size() > 0) {
+//            materialTaskVo.setMaterialTaskAppendixList(newsAppendixVoList);
+//        }
+        return materialTaskVo;
+    }
+
+    @Override
+    public void sendMessage(Long materialTaskId) {
+        MaterialTask materialTask = this.getById(materialTaskId);
+        if(materialTask == null){
+            return;
+        }
+
+        LambdaQueryWrapper<MaterialTaskAssign> materialTaskAssignLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        materialTaskAssignLambdaQueryWrapper
+                .orderByDesc(MaterialTaskAssign::getCreateDate)
+                .eq(MaterialTaskAssign::getMaterialTaskId, materialTaskId)
+                .select(MaterialTaskAssign::getId)
+                .select(MaterialTaskAssign.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssign.class).contains(x.getProperty()));
+        List<MaterialTaskAssign> materialTaskAssignList = materialTaskMaterialTaskAssignMapper.selectList(materialTaskAssignLambdaQueryWrapper);
+
+        if(!materialTaskAssignList.isEmpty()){
+            materialTask.setMaterialTaskAssignList(materialTaskAssignList);
+        }
+
+        CompletableFuture.runAsync(() -> {
+            this.sendMessageUtil(materialTask);
+        });
+    }
+
+    private boolean sendMessageUtil(MaterialTask materialTask ) {
+        IUserService userService = SpringUtil.getBean(IUserService.class);
+        RedisUtil redisUtil = SpringUtil.getBean(RedisUtil.class);
+        List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {
+        });
+        //如果缓存中不存在用户信息，就直接去数据库查询,并保存到缓存中去
+        if (userList.size() == 0) {
+            userList = userService.list();
+            redisUtil.set(GlobalConstant.USER_CACHE_KEY, userList);
+        }
+
+        if(materialTask.getCreateUserId() == null){
+            return false;
+        }
+
+        User createUser = userList.stream().filter(u -> materialTask.getCreateUserId().equals(u.getId())).findFirst().orElse(new User());
+
+        for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
+
+            User materialTaskAssignUser = userList.stream().filter(u -> materialTaskAssign.getUserId().equals(u.getId())).findFirst().orElse(new User());
+
+            WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
+            weChatSendMessageDto.setUserId(materialTaskAssignUser.getOpenId());
+            weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+            //weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
+            weChatSendMessageDto.setMsgId(materialTask.getId().toString());
+            JSONObject data = new JSONObject();
+
+            JSONObject data1 = new JSONObject();
+            data1.put("value", materialTask.getName());
+            data.put("thing23", data1);
+
+            JSONObject data2 = new JSONObject();
+            data2.put("value", createUser.getName());
+            data.put("thing18", data2);
+
+            JSONObject data3 = new JSONObject();
+            data3.put("value", materialTask.getRequiredCompleteTime());
+            data.put("time17", data3);
+            weChatSendMessageDto.setContent(data);
+            weChatService.sendTemplateMessage(weChatSendMessageDto);
+        };
+        return true;
+    }
 }

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

@@ -24,6 +24,7 @@ import com.xjrsoft.module.material.vo.MaterialTypeVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -188,6 +189,45 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
         return materialTypeVo;
     }
 
+    @Override
+    public List<MaterialTypeVo> listMaterialTypeVo() {
+        List<MaterialTypeVo> pageOutput = this.selectJoinList(MaterialTypeVo.class, new MPJLambdaWrapper<MaterialType>()
+                        .disableSubLogicDel()
+                        //.eq(MaterialTypeAssign::getUserId, StpUtil.getLoginIdAsLong())
+                        .select(MaterialType::getId)
+                        .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
+                //.innerJoin(MaterialTypeAssign.class, MaterialTypeAssign::getMaterialTypeId, MaterialType::getId)
+        );
+
+        for(MaterialTypeVo materialTypeVo : pageOutput){
+            String materialCategoryStr = materialTypeVo.getMaterialCategory();
+            String[] materialCategoryStrArr = materialCategoryStr.split(",");
+
+            for (String category : materialCategoryStrArr) {
+                if (category != null) {
+                    String categoryValue = MaterialCategoryEnum.getValue(category);
+                    if (categoryValue != null) {
+                        if (materialTypeVo.getMaterialCategoryCn() != null && materialTypeVo.getMaterialCategoryCn().length() > 0) {
+                            materialTypeVo.setMaterialCategoryCn(materialTypeVo.getMaterialCategoryCn() + "，" + categoryValue);
+                        } else {
+                            materialTypeVo.setMaterialCategoryCn(categoryValue);
+                        }
+
+                        handleFileAndTemplate(materialTypeVo, category);
+                    }
+                }
+            }
+        }
+        return pageOutput;
+    }
+
+    private void handleFileAndTemplate(MaterialTypeVo materialTypeVo, String category) {
+        MaterialTypePageVo materialTypePageVo = new MaterialTypePageVo();
+        BeanUtils.copyProperties(materialTypeVo, materialTypePageVo);
+        handleFileAndTemplate(materialTypePageVo, category);
+        BeanUtils.copyProperties(materialTypePageVo, materialTypeVo);
+    }
+
     private void handleFileAndTemplate(MaterialTypePageVo materialTypePageVo, String category) {
         if (MaterialCategoryEnum.MT0001.getCode().equals(category) && materialTypePageVo.getFolderId() != null) {
             List<File> files = getFileListByFolderId(materialTypePageVo.getFolderId());

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskAssignListVo.java

@@ -37,7 +37,7 @@ public class MaterialTaskAssignListVo {
     @ApiModelProperty("状态 1=未提交 2=待审核 3=通过 4=重做")
     private Integer status;
     /**
-     * 用户名
+     * oa
      */
     private String userName;
     /**

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskPageVo.java

@@ -26,40 +26,12 @@ public class MaterialTaskPageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
     * 创建时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("创建时间")
     @ApiModelProperty("创建时间")
-    private LocalDateTime createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private LocalDateTime modifyDate;
-    /**
-    * 删除标记
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("删除标记")
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
+    private LocalDate createDate;
     /**
     * 有效标志
     */
@@ -74,6 +46,13 @@ public class MaterialTaskPageVo {
     @ExcelProperty("材料提交任务类型(material_type)")
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
+    /**
+     * 材料提交任务类型(material_type)
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("材料提交任务类型(material_type)")
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private String materialTypeIdCn;
     /**
     * 任务名称
     */

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskVo.java

@@ -1,6 +1,9 @@
 package com.xjrsoft.module.material.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,11 +24,33 @@ public class MaterialTaskVo {
     */
     @ApiModelProperty("主键编号")
     private Long id;
+    /**
+     * 创建时间
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private LocalDate createDate;
     /**
     * 材料提交任务类型(material_type)
     */
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
+    /**
+     * 材料提交任务类型(material_type)
+     */
+    @ApiModelProperty("材料提交任务类型(material_type)")
+    private String materialTypeIdCn;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategoryCn;
     /**
     * 任务名称
     */
@@ -68,6 +93,32 @@ public class MaterialTaskVo {
     @ApiModelProperty("延迟提交")
     private Integer timeDelay;
 
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long folderId;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private String folderIdCn;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private List<File> files;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private Long formReleaseId;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private String formReleaseIdCn;
+
 
     /**
     * materialTaskAssign

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskWaitPageVo.java

@@ -101,4 +101,10 @@ public class MaterialTaskWaitPageVo {
      */
     @ApiModelProperty("审核状态 1=未提交 2=待审核 3=通过 4=重做")
     private Integer processStatus;
+
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
 }

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

@@ -1,34 +1,33 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 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.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseClassMajorSetDto;
-import com.xjrsoft.module.student.dto.UpdateBaseClassMajorSetDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.BaseClassMajorSetPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseClassMajorSetDto;
 import com.xjrsoft.module.student.entity.BaseClassMajorSet;
 import com.xjrsoft.module.student.service.IBaseClassMajorSetService;
 import com.xjrsoft.module.student.vo.BaseClassMajorSetPageVo;
-
 import com.xjrsoft.module.student.vo.BaseClassMajorSetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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 javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -11,7 +11,6 @@ import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentCategoryDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryVo;

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

@@ -7,15 +7,31 @@ 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.*;
+import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentInspectionDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
+import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
+import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
+import com.xjrsoft.module.student.vo.CalssQuantitativeAssessmentPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.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;

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

@@ -1,36 +1,34 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 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.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentItemDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentItemDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentItemPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentItemDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentItemService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentItemPageVo;
-
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentItemVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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 javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

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

@@ -18,7 +18,6 @@ import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentProjectDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
@@ -28,7 +27,6 @@ import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectVo;
-import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

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

@@ -19,7 +19,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.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 org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;

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

@@ -18,7 +18,14 @@ import com.xjrsoft.module.student.vo.ClassHonorsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;

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

@@ -2,18 +2,33 @@ 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.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.BaseStudentInfoPageDto;
+import com.xjrsoft.module.student.dto.PbVXssfdetailExcelDto;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.service.IPbVXssfdetailService;
 import com.xjrsoft.module.student.service.IStudentManagerService;
+import com.xjrsoft.module.student.vo.PbVXssfdetailExcelVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
 import com.xjrsoft.module.student.vo.StudentPersonalInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
 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.RestController;
 
 import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
 
 /**
 * @title: 学生职务设置
@@ -27,6 +42,7 @@ import javax.validation.Valid;
 @AllArgsConstructor
 public class ConsumptionController {
     private final IStudentManagerService studentManagerService;
+    private final IPbVXssfdetailService pbVXssfdetailService;
     @GetMapping(value = "/personal-info")
     @ApiOperation(value="学生个人信息")
     @SaCheckPermission("consumption:detail")
@@ -35,5 +51,22 @@ public class ConsumptionController {
         return RT.ok(info);
     }
 
+    @GetMapping(value = "/detail-page")
+    @ApiOperation(value="学生消费流水分页查询")
+    @SaCheckPermission("consumption:detail")
+    public RT<PageOutput<PbVXssfdetailPageVo>> detailPage(@Valid PbVXssfdetailPageDto dto){
+        Page<PbVXssfdetailPageVo> page = pbVXssfdetailService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<PbVXssfdetailPageVo> pageOutput = ConventPage.getPageOutput(page, PbVXssfdetailPageVo.class);
+        return RT.ok(pageOutput);
+    }
 
+    @PostMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid PbVXssfdetailExcelDto dto) {
+        List<PbVXssfdetailExcelVo> dataList = pbVXssfdetailService.getList(dto);
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, PbVXssfdetailExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
+
+        return RT.fileStream(bot.toByteArray(), "PbVXssfdetailExcelVo" + ExcelTypeEnum.XLSX.getValue());
+    }
 }

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

@@ -1,36 +1,31 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 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.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddQuotaFormulaRuleAttributeDto;
-import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleAttributeDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto;
+import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleAttributeDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleAttributeService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
-
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributeVo;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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 javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -1,36 +1,31 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 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.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalYearPageVo;
 import com.xjrsoft.module.student.dto.AddQuotaFormulaRuleConstantDto;
-import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleConstantDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
+import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleConstantDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleConstantService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
-
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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 javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -1,36 +1,31 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 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.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddQuotaFormulaRuleDto;
-import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
+import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleService;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
-
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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 javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -18,7 +18,14 @@ import com.xjrsoft.module.student.vo.StudentHonorsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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.ArrayList;

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

@@ -21,7 +21,6 @@ import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
 import com.xjrsoft.module.student.entity.BaseStudent;
-import com.xjrsoft.module.student.entity.BaseStudentFamilyMember;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IStudentManagerService;

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

@@ -2,14 +2,8 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

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

@@ -2,14 +2,8 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

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

@@ -1,14 +1,10 @@
 package com.xjrsoft.module.student.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 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.io.Serializable;
 import java.util.Date;
 
 

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

@@ -0,0 +1,228 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class AddPbVXsxxsfytbDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String Studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef1;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef2;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String admissions;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String property;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal standardar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal adjustmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal jmje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal arrearagemny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factrecarmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal refundmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal qfje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jfzt;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pksfxxytb;
+
+}

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

@@ -2,14 +2,8 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

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

@@ -2,14 +2,8 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

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

@@ -2,14 +2,8 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

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

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 
 /**

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

@@ -4,12 +4,6 @@ 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;
 
 
 /**

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

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+/**
+* @title: 分页查询入参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PbVXssfdetailExcelDto extends PageInput {
+
+    @ApiModelProperty("学期Id")
+    private Long semesterId;
+
+    @ApiModelProperty("收费项目")
+    private String feeitemname;
+
+    @ApiModelProperty("学生姓名")
+    private String name;
+
+    @ApiModelProperty("学生学号")
+    private String studentId;
+
+    @ApiModelProperty("订单号")
+    private String payorder;
+
+    @ApiModelProperty("支付时间-开始")
+    private String startDate;
+
+    @ApiModelProperty("支付时间-结束")
+    private String endDate;
+
+    @ApiModelProperty("缴费类型(-1:退费 1:缴费)")
+    private Integer category;
+
+    @ApiModelProperty("订单号")
+    private List<Long> payorders;
+}

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

@@ -0,0 +1,42 @@
+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: 2024-03-13
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PbVXssfdetailPageDto extends PageInput {
+
+    @ApiModelProperty("学期Id")
+    private Long semesterId;
+
+    @ApiModelProperty("收费项目")
+    private String feeitemname;
+
+    @ApiModelProperty("学生姓名")
+    private String name;
+
+    @ApiModelProperty("学生学号")
+    private String studentId;
+
+    @ApiModelProperty("订单号")
+    private String payorder;
+
+    @ApiModelProperty("支付时间-开始")
+    private String startDate;
+
+    @ApiModelProperty("支付时间-结束")
+    private String endDate;
+
+    @ApiModelProperty("缴费类型(-1:退费 1:缴费)")
+    private Integer category;
+}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 分页查询入参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PbVXsxxsfytbPageDto extends PageInput {
+
+
+}

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

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 
 /**

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

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 
 /**

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

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 
 /**

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.student.dto;
+
+import lombok.Data;
+
+
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class UpdatePbVXsxxsfytbDto extends AddPbVXsxxsfytbDto {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,14 +2,6 @@ package com.xjrsoft.module.student.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -0,0 +1,87 @@
+package com.xjrsoft.module.student.entity;
+
+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.math.BigDecimal;
+
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+@TableName("pb_v_xssfdetail")
+@ApiModel(value = "pb_v_xssfdetail", description = "")
+public class PbVXssfdetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeitem;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal mny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String paytype;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String payorder;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String paydate;
+
+
+}

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

@@ -0,0 +1,232 @@
+package com.xjrsoft.module.student.entity;
+
+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.math.BigDecimal;
+
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+@TableName("pb_v_xsxxsfytb")
+@ApiModel(value = "pb_v_xsxxsfytb", description = "")
+public class PbVXsxxsfytb implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String Studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef1;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef2;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String admissions;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String property;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal standardar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal adjustmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal jmje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal arrearagemny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factrecarmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal refundmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal qfje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jfzt;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pksfxxytb;
+
+
+}

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -2,18 +2,14 @@ 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 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;
 
 

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.entity.BaseClassMajorSet;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -7,7 +7,12 @@ import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
 import com.xjrsoft.module.student.dto.QuantitativeAssessmentSingleScoreDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
+import com.xjrsoft.module.student.vo.QuantitativeAssessmentSingleScoreVo;
+import com.xjrsoft.module.student.vo.QuantitativeAssessmentSubTableExcelVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,11 +1,8 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.schedule.vo.StudentJianyuekbVo;
-import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.entity.BaseStudent;
-import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
 import com.xjrsoft.module.student.vo.StudentInfoVo;
 import com.xjrsoft.module.student.vo.StudentPersonalInfoVo;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -7,12 +7,9 @@ import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 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 org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 

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

@@ -0,0 +1,33 @@
+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.PbVXssfdetailExcelDto;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.entity.PbVXssfdetail;
+import com.xjrsoft.module.student.vo.PbVXssfdetailExcelVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Mapper
+public interface PbVXssfdetailMapper extends MPJBaseMapper<PbVXssfdetail> {
+
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<PbVXssfdetailPageVo> getPage(Page<PbVXssfdetailPageVo> page, PbVXssfdetailPageDto dto);
+
+    List<PbVXssfdetailExcelVo> getList(@Param("dto") PbVXssfdetailExcelDto dto);
+}

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

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Mapper
+public interface PbVXsxxsfytbMapper extends MPJBaseMapper<PbVXsxxsfytb> {
+
+}

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

@@ -1,13 +1,10 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto;
-import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalMonthPageDto;
-import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalMonthPageVo;
 import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;

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

@@ -1,12 +1,9 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.student.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.student.entity.BaseClassMajorSet;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 班级专业方向表

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

@@ -8,7 +8,11 @@ import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
 import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
+import com.xjrsoft.module.student.vo.CalssQuantitativeAssessmentPageVo;
 import org.springframework.http.ResponseEntity;
 
 /**

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.student.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 考核项目表

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

@@ -0,0 +1,36 @@
+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.PbVXssfdetailExcelDto;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.entity.PbVXssfdetail;
+import com.xjrsoft.module.student.vo.PbVXssfdetailExcelVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
+
+import java.util.List;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+
+public interface IPbVXssfdetailService extends MPJBaseService<PbVXssfdetail> {
+
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<PbVXssfdetailPageVo> getPage(Page<PbVXssfdetailPageVo> page, PbVXssfdetailPageDto dto);
+
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<PbVXssfdetailExcelVo> getList(PbVXssfdetailExcelDto dto);
+}

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

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+
+public interface IPbVXsxxsfytbService extends MPJBaseService<PbVXsxxsfytb> {
+}

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

@@ -1,15 +1,10 @@
 package com.xjrsoft.module.student.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.student.dto.QuotaFormulaRuleAttributePageDto;
-import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 考核表单属性

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

@@ -1,15 +1,10 @@
 package com.xjrsoft.module.student.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.personnel.dto.LaborManagementPageDto;
-import com.xjrsoft.module.personnel.vo.LaborManagementPageVo;
 import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 考核基数

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

@@ -1,15 +1,10 @@
 package com.xjrsoft.module.student.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.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
-import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 指标公式规则管理

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

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.student.entity.BaseClassMajorSet;
 import com.xjrsoft.module.student.mapper.BaseClassMajorSetMapper;
 import com.xjrsoft.module.student.service.IBaseClassMajorSetService;
 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: 班级专业方向表

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

@@ -15,17 +15,35 @@ import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.ScoreTypeEnum;
 import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.common.utils.excel.ExcelMergeUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
-import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
-import com.xjrsoft.module.student.dto.*;
-import com.xjrsoft.module.student.entity.*;
-import com.xjrsoft.module.student.mapper.*;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
+import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
+import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
+import com.xjrsoft.module.student.dto.QuantitativeAssessmentSingleScoreDto;
+import com.xjrsoft.module.student.entity.BaseClassMajorSet;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentCategoryMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentStudentRelationMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentClassListVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
+import com.xjrsoft.module.student.vo.CalssQuantitativeAssessmentPageVo;
+import com.xjrsoft.module.student.vo.QuantitativeAssessmentSingleScoreVo;
+import com.xjrsoft.module.student.vo.QuantitativeAssessmentSubTableExcelVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
@@ -36,9 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 import java.io.ByteArrayOutputStream;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentItemMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentItemService;
 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: 考核项目表

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

@@ -2,7 +2,6 @@ package com.xjrsoft.module.student.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.room.dto.RoomPageDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;

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

@@ -0,0 +1,46 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.PbVXssfdetailExcelDto;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.entity.PbVXssfdetail;
+import com.xjrsoft.module.student.mapper.PbVXssfdetailMapper;
+import com.xjrsoft.module.student.service.IPbVXssfdetailService;
+import com.xjrsoft.module.student.vo.PbVXssfdetailExcelVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class PbVXssfdetailServiceImpl extends MPJBaseServiceImpl<PbVXssfdetailMapper, PbVXssfdetail> implements IPbVXssfdetailService {
+
+    private final PbVXssfdetailMapper pbVXssfdetailMapper;
+
+    @Override
+    public Page<PbVXssfdetailPageVo> getPage(Page<PbVXssfdetailPageVo> page, PbVXssfdetailPageDto dto) {
+        Page<PbVXssfdetailPageVo> voPage = pbVXssfdetailMapper.getPage(page, dto);
+        for (PbVXssfdetailPageVo record : voPage.getRecords()) {
+            if(record.getMny() > 0){
+                record.setCategory("缴费");
+            }else if(record.getMny() < 0){
+                record.setCategory("退费");
+            }
+        }
+        return voPage;
+    }
+
+    @Override
+    public List<PbVXssfdetailExcelVo> getList(PbVXssfdetailExcelDto dto) {
+        return pbVXssfdetailMapper.getList(dto);
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
+import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
+import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapper, PbVXsxxsfytb> implements IPbVXsxxsfytbService {
+}

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

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.student.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.student.dto.QuotaFormulaRuleAttributePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
@@ -10,11 +9,6 @@ import com.xjrsoft.module.student.service.IQuotaFormulaRuleAttributeService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
 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: 考核表单属性

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

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.student.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.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
@@ -10,11 +9,6 @@ import com.xjrsoft.module.student.service.IQuotaFormulaRuleConstantService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 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: 考核基数

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

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.student.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.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
@@ -10,11 +9,6 @@ import com.xjrsoft.module.student.service.IQuotaFormulaRuleService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 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: 指标公式规则管理

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

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 /**

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.student.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 班级专业方向表表单出参
 * @Author szs

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

@@ -1,16 +1,8 @@
 package com.xjrsoft.module.student.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
 * @title: 考核项目表分页列表出参
 * @Author dzx

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.student.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核项目表表单出参
 * @Author dzx

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.student.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -0,0 +1,66 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 分页列表出参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class PbVXssfdetailExcelVo {
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学号")
+    @ApiModelProperty("学号")
+    private String studentId;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生姓名")
+    @ApiModelProperty("学生姓名")
+    private String name;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("性别中文")
+    @ApiModelProperty("性别中文")
+    private String genderCn;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学期")
+    @ApiModelProperty("学期")
+    private String semesterName;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("收费项目")
+    @ApiModelProperty("收费项目")
+    private String feeitemname;
+    @ContentStyle(dataFormat = 49)
+
+    @ExcelProperty("类型")
+    @ApiModelProperty("类型")
+    private String category;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("支付金额")
+    @ApiModelProperty("支付金额")
+    private Double mny;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("支付类型")
+    @ApiModelProperty("支付类型")
+    private String paytype;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("支付时间")
+    @ApiModelProperty("支付时间")
+    private String paydate;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("订单号")
+    @ApiModelProperty("订单号")
+    private String payorder;
+}

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

@@ -0,0 +1,48 @@
+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 PbVXssfdetailPageVo {
+
+    @ApiModelProperty("学生id")
+    private Long userId;
+
+    @ApiModelProperty("学号")
+    private String studentId;
+
+    @ApiModelProperty("学生姓名")
+    private String name;
+
+    @ApiModelProperty("性别中文")
+    private String genderCn;
+
+    @ApiModelProperty("学期")
+    private String semesterName;
+
+    @ApiModelProperty("收费项目")
+    private String feeitemname;
+
+    @ApiModelProperty("支付类型")
+    private String paytype;
+
+    @ApiModelProperty("订单号（唯一主键）")
+    private String payorder;
+
+    @ApiModelProperty("支付时间")
+    private String paydate;
+
+    @ApiModelProperty("支付金额")
+    private Double mny;
+
+    @ApiModelProperty("类型")
+    private String category;
+
+}

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

@@ -0,0 +1,80 @@
+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 PbVXssfdetailVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeitem;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal mny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String paytype;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String payorder;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String paydate;
+
+
+
+}

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

@@ -0,0 +1,223 @@
+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 PbVXsxxsfytbPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String Studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef1;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef2;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String admissions;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String property;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal standardar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal adjustmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal jmje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal arrearagemny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factrecarmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal refundmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal qfje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jfzt;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pksfxxytb;
+
+}

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

@@ -0,0 +1,225 @@
+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 PbVXsxxsfytbVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkfeeobj;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String Studentcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeobjname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String classcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String deptcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String enteryear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String leaveyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String personalid;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef1;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String recruiters;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String userdef2;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String admissions;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String address;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String telephone;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String nationality;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String property;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String remarks;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String graduations;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String state;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String sex;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal standardar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factar;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal adjustmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal jmje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal arrearagemny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal factrecarmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal refundmny;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private BigDecimal qfje;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String jfzt;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String feeitemname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltcode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String beltname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String ratetypename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String resourcename;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String quartername;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pksfxxytb;
+
+
+
+}

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

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 /**

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.student.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核表单属性表单出参
 * @Author szs

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

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 /**

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.student.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核基数表单出参
 * @Author szs

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

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.student.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;
 
 /**

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.student.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 指标公式规则管理表单出参
 * @Author szs

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3840,7 +3840,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         operateRecord.setRecordTime(LocalDateTime.now());
         operateRecord.setUsageScenario(2);
         //[操作人名称] 通过[指派审核人] 指派[被指派人名称]作为审核人
-        record.setMessage("审批人：" + user.getName() + "， 审批结果：指派审核人， 审批内容：指派【" + allAssigneesUserNames + "】作为审核人");
+        operateRecord.setOperateInfo("审批人：" + user.getName() + "， 审批结果：指派审核人， 审批内容：指派【" + allAssigneesUserNames + "】作为审核人");
 
         xjrWorkflowOperateRecordMapper.insert(operateRecord);
         return true;