删除多余引用

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,9 +2,15 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
+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.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.service.IPbVXssfdetailService;
 import com.xjrsoft.module.student.service.IStudentManagerService;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
 import com.xjrsoft.module.student.vo.StudentPersonalInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +33,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 +42,12 @@ 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);
+    }
 }

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/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/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/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/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/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/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/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/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/resources/mapper/student/PbVXssfdetailMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.PbVXssfdetailMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.PbVXssfdetailPageDto" resultType="com.xjrsoft.module.student.vo.PbVXssfdetailPageVo">
+        SELECT t2.user_id,t2.student_id,t1.name,t4.name AS gender_cn,t6.name AS semester_name,t3.feeitemname,t3.paytype,t3.paydate,t3.payorder,t3.mny FROM xjr_user t1
+        INNER JOIN base_student t2 ON t1.id = t2.user_id
+        INNER JOIN pb_v_xssfdetail t3 ON t1.credential_number = t3.personalid
+        LEFT JOIN xjr_dictionary_detail t4 ON t1.gender = t4.code AND t4.item_id = 2023000000000000004
+        LEFT JOIN pb_semester_config t5 ON t3.beltcode = t5.beltcode AND t5.delete_mark = 0
+        LEFT JOIN base_semester t6 ON t6.id = t5.base_semester_id
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        <if test="dto.name != null and dto.name != ''">
+            and t1.name like concat('%', #{dto.name},'%')
+        </if>
+        <if test="dto.semesterId != null">
+            and t6.id = #{dto.semesterId}
+        </if>
+        <if test="dto.feeitemname != null and dto.feeitemname != ''">
+            and t3.feeitemname like concat('%', #{dto.feeitemname},'%')
+        </if>
+        <if test="dto.studentId != null and dto.studentId != ''">
+            and t2.student_id like concat('%', #{dto.studentId},'%')
+        </if>
+        <if test="dto.payorder != null and dto.payorder != ''">
+            and t3.payorder like concat('%', #{dto.payorder},'%')
+        </if>
+        <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
+            and t3.paydate between #{dto.startDate} and #{dto.endDate}
+        </if>
+        <if test="dto.category != null">
+            <if test="dto.category == 1">
+                and t3.mny > 0
+            </if>
+            <if test="dto.category == -1">
+                and 0 > t3.mny
+            </if>
+        </if>
+    </select>
+</mapper>

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

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