1、修复材料缴交bug

2、提交新生信息维护代码

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

@@ -81,7 +81,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
         //新增任务
         materialTask.setStatus(2);
-        if(dto.getUserList() == null && !dto.getUserList().isEmpty()){
+        if(dto.getUserList() != null && !dto.getUserList().isEmpty()){
             materialTask.setAssignPerson(dto.getUserList().size());
         }
         materialTaskMaterialTaskMapper.insert(materialTask);

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

@@ -0,0 +1,111 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseNewStudentDto;
+import com.xjrsoft.module.student.dto.BaseNewStudentPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseNewStudentDto;
+import com.xjrsoft.module.student.entity.BaseNewStudent;
+import com.xjrsoft.module.student.service.IBaseNewStudentService;
+import com.xjrsoft.module.student.vo.BaseNewStudentPageVo;
+import com.xjrsoft.module.student.vo.BaseNewStudentVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+/**
+* @title: 新生维护信息
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseNewStudent")
+@Api(value = "/student"  + "/baseNewStudent",tags = "新生维护信息代码")
+@AllArgsConstructor
+public class BaseNewStudentController {
+
+
+    private final IBaseNewStudentService baseNewStudentService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="新生维护信息列表(分页)")
+    @SaCheckPermission("basenewstudent:detail")
+    public RT<PageOutput<BaseNewStudentPageVo>> page(@Valid BaseNewStudentPageDto dto){
+
+        LambdaQueryWrapper<BaseNewStudent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseNewStudent::getId)
+                .select(BaseNewStudent.class,x -> VoToColumnUtil.fieldsToColumns(BaseNewStudentPageVo.class).contains(x.getProperty()));
+        IPage<BaseNewStudent> page = baseNewStudentService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseNewStudentPageVo> pageOutput = ConventPage.getPageOutput(page, BaseNewStudentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询新生维护信息信息")
+    @SaCheckPermission("basenewstudent:detail")
+    public RT<BaseNewStudentVo> info(@RequestParam Long id){
+        BaseNewStudent baseNewStudent = baseNewStudentService.getById(id);
+        if (baseNewStudent == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseNewStudent, BaseNewStudentVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增新生维护信息")
+    @SaCheckPermission("basenewstudent:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseNewStudentDto dto){
+        BaseNewStudent baseNewStudent = BeanUtil.toBean(dto, BaseNewStudent.class);
+        boolean isSuccess = baseNewStudentService.save(baseNewStudent);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改新生维护信息")
+    @SaCheckPermission("basenewstudent:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseNewStudentDto dto){
+
+        BaseNewStudent baseNewStudent = BeanUtil.toBean(dto, BaseNewStudent.class);
+        return RT.ok(baseNewStudentService.updateById(baseNewStudent));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除新生维护信息")
+    @SaCheckPermission("basenewstudent:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseNewStudentService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<BaseNewStudentPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(BaseNewStudentPageVo.class).sheet().doReadSync();
+        Boolean result = baseNewStudentService.saveBatch(BeanUtil.copyToList(savedDataList, BaseNewStudent.class));
+        return RT.ok(result);
+    }
+
+}

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

@@ -0,0 +1,98 @@
+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-06-27
+* @Version 1.0
+*/
+@Data
+public class AddBaseNewStudentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 毕业学校
+    */
+    @ApiModelProperty("毕业学校")
+    private String graduateSchool;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
+    /**
+    * 身高
+    */
+    @ApiModelProperty("身高")
+    private BigDecimal height;
+    /**
+    * 体重
+    */
+    @ApiModelProperty("体重")
+    private BigDecimal weight;
+    /**
+    * 成绩
+    */
+    @ApiModelProperty("成绩")
+    private BigDecimal score;
+    /**
+    * 毕业班级
+    */
+    @ApiModelProperty("毕业班级")
+    private String graduateClass;
+    /**
+    * 学生来源
+    */
+    @ApiModelProperty("学生来源")
+    private String source;
+    /**
+    * 住宿类型
+    */
+    @ApiModelProperty("住宿类型")
+    private String stduyStatus;
+    /**
+    * 手机号
+    */
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+    * 第一志愿
+    */
+    @ApiModelProperty("第一志愿")
+    private String firstAmbition;
+    /**
+    * 第二志愿
+    */
+    @ApiModelProperty("第二志愿")
+    private String secondAmbition;
+    /**
+    * 班级状态（0：未分配， 1：已分配）
+    */
+    @ApiModelProperty("班级状态（0：未分配， 1：已分配）")
+    private Integer status;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseNewStudentPageDto.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-06-27
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseNewStudentPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,150 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 新生维护信息
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@Data
+@TableName("base_new_student")
+@ApiModel(value = "base_new_student", description = "新生维护信息")
+public class BaseNewStudent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 毕业学校
+    */
+    @ApiModelProperty("毕业学校")
+    private String graduateSchool;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
+    /**
+    * 身高
+    */
+    @ApiModelProperty("身高")
+    private BigDecimal height;
+    /**
+    * 体重
+    */
+    @ApiModelProperty("体重")
+    private BigDecimal weight;
+    /**
+    * 成绩
+    */
+    @ApiModelProperty("成绩")
+    private BigDecimal score;
+    /**
+    * 毕业班级
+    */
+    @ApiModelProperty("毕业班级")
+    private String graduateClass;
+    /**
+    * 学生来源
+    */
+    @ApiModelProperty("学生来源")
+    private String source;
+    /**
+    * 住宿类型
+    */
+    @ApiModelProperty("住宿类型")
+    private String stduyStatus;
+    /**
+    * 手机号
+    */
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+    * 第一志愿
+    */
+    @ApiModelProperty("第一志愿")
+    private String firstAmbition;
+    /**
+    * 第二志愿
+    */
+    @ApiModelProperty("第二志愿")
+    private String secondAmbition;
+    /**
+    * 班级状态（0：未分配， 1：已分配）
+    */
+    @ApiModelProperty("班级状态（0：未分配， 1：已分配）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseNewStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 新生维护信息
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@Mapper
+public interface BaseNewStudentMapper extends MPJBaseMapper<BaseNewStudent> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseNewStudent;
+
+/**
+* @title: 新生维护信息
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+
+public interface IBaseNewStudentService extends MPJBaseService<BaseNewStudent> {
+}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseNewStudent;
+import com.xjrsoft.module.student.mapper.BaseNewStudentMapper;
+import com.xjrsoft.module.student.service.IBaseNewStudentService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 新生维护信息
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseNewStudentServiceImpl extends MPJBaseServiceImpl<BaseNewStudentMapper, BaseNewStudent> implements IBaseNewStudentService {
+}

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

@@ -0,0 +1,175 @@
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 新生维护信息分页列表出参
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@Data
+public class BaseNewStudentPageVo {
+
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Date createDate;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Integer enabledMark;
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 毕业学校
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("毕业学校")
+    @ApiModelProperty("毕业学校")
+    private String graduateSchool;
+    /**
+    * 学生姓名
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生姓名")
+    @ApiModelProperty("学生姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("性别")
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("身份证号")
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
+    /**
+    * 身高
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("身高")
+    @ApiModelProperty("身高")
+    private BigDecimal height;
+    /**
+    * 体重
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("体重")
+    @ApiModelProperty("体重")
+    private BigDecimal weight;
+    /**
+    * 成绩
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("成绩")
+    @ApiModelProperty("成绩")
+    private BigDecimal score;
+    /**
+    * 毕业班级
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("毕业班级")
+    @ApiModelProperty("毕业班级")
+    private String graduateClass;
+    /**
+    * 学生来源
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生来源")
+    @ApiModelProperty("学生来源")
+    private String source;
+    /**
+    * 住宿类型
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("住宿类型")
+    @ApiModelProperty("住宿类型")
+    private String stduyStatus;
+    /**
+    * 手机号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("手机号")
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+    * 第一志愿
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("第一志愿")
+    @ApiModelProperty("第一志愿")
+    private String firstAmbition;
+    /**
+    * 第二志愿
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("第二志愿")
+    @ApiModelProperty("第二志愿")
+    private String secondAmbition;
+    /**
+    * 班级状态（0：未分配， 1：已分配）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班级状态（0：未分配， 1：已分配）")
+    @ApiModelProperty("班级状态（0：未分配， 1：已分配）")
+    private Integer status;
+
+}

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

@@ -0,0 +1,100 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+* @title: 新生维护信息表单出参
+* @Author dzx
+* @Date: 2024-06-27
+* @Version 1.0
+*/
+@Data
+public class BaseNewStudentVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 毕业学校
+    */
+    @ApiModelProperty("毕业学校")
+    private String graduateSchool;
+    /**
+    * 学生姓名
+    */
+    @ApiModelProperty("学生姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String credentialNumber;
+    /**
+    * 身高
+    */
+    @ApiModelProperty("身高")
+    private BigDecimal height;
+    /**
+    * 体重
+    */
+    @ApiModelProperty("体重")
+    private BigDecimal weight;
+    /**
+    * 成绩
+    */
+    @ApiModelProperty("成绩")
+    private BigDecimal score;
+    /**
+    * 毕业班级
+    */
+    @ApiModelProperty("毕业班级")
+    private String graduateClass;
+    /**
+    * 学生来源
+    */
+    @ApiModelProperty("学生来源")
+    private String source;
+    /**
+    * 住宿类型
+    */
+    @ApiModelProperty("住宿类型")
+    private String stduyStatus;
+    /**
+    * 手机号
+    */
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+    * 第一志愿
+    */
+    @ApiModelProperty("第一志愿")
+    private String firstAmbition;
+    /**
+    * 第二志愿
+    */
+    @ApiModelProperty("第二志愿")
+    private String secondAmbition;
+    /**
+    * 班级状态（0：未分配， 1：已分配）
+    */
+    @ApiModelProperty("班级状态（0：未分配， 1：已分配）")
+    private Integer status;
+
+
+
+}

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

@@ -3337,4 +3337,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcBaseNewStudent() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_new_student");//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(true);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }