Browse Source

毕业管理

dzx 7 months ago
parent
commit
a617d19ca8
17 changed files with 904 additions and 7 deletions
  1. 102 0
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentDevelopmentController.java
  2. 0 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java
  3. 148 0
      src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentDevelopmentDto.java
  4. 0 1
      src/main/java/com/xjrsoft/module/student/dto/AddStudentScholarshipDto.java
  5. 21 0
      src/main/java/com/xjrsoft/module/student/dto/BaseStudentDevelopmentPageDto.java
  6. 24 0
      src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentDevelopmentDto.java
  7. 199 0
      src/main/java/com/xjrsoft/module/student/entity/BaseStudentDevelopment.java
  8. 20 0
      src/main/java/com/xjrsoft/module/student/mapper/BaseStudentDevelopmentMapper.java
  9. 18 0
      src/main/java/com/xjrsoft/module/student/service/IBaseStudentDevelopmentService.java
  10. 0 1
      src/main/java/com/xjrsoft/module/student/service/IBaseStudentScholarshipApplicantService.java
  11. 0 1
      src/main/java/com/xjrsoft/module/student/service/IBaseStudentScholarshipCategoryService.java
  12. 24 0
      src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentDevelopmentServiceImpl.java
  13. 153 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentDevelopmentPageVo.java
  14. 145 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentDevelopmentVo.java
  15. 0 2
      src/main/java/com/xjrsoft/module/student/vo/ScholarshipApplicantImportVo.java
  16. 22 0
      src/main/resources/mapper/student/BaseStudentDevelopmentMapper.xml
  17. 28 0
      src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

+ 102 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentDevelopmentController.java

@@ -0,0 +1,102 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseStudentDevelopmentDto;
+import com.xjrsoft.module.student.dto.BaseStudentDevelopmentPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentDevelopmentDto;
+import com.xjrsoft.module.student.entity.BaseStudentDevelopment;
+import com.xjrsoft.module.student.service.IBaseStudentDevelopmentService;
+import com.xjrsoft.module.student.vo.BaseStudentDevelopmentPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentDevelopmentVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentDevelopment")
+@Api(value = "/student"  + "/baseStudentDevelopment",tags = "学生去向登记代码")
+@AllArgsConstructor
+public class BaseStudentDevelopmentController {
+
+
+    private final IBaseStudentDevelopmentService developmentService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生去向登记列表(分页)")
+    @SaCheckPermission("basestudentdevelopment:detail")
+    public RT<PageOutput<BaseStudentDevelopmentPageVo>> page(@Valid BaseStudentDevelopmentPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentDevelopment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(BaseStudentDevelopment::getBaseStudentGraduateId, dto.getBaseStudentGraduateId())
+                    .orderByDesc(BaseStudentDevelopment::getId)
+                .select(BaseStudentDevelopment.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentDevelopmentPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentDevelopment> page = developmentService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentDevelopmentPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentDevelopmentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生去向登记信息")
+    @SaCheckPermission("basestudentdevelopment:detail")
+    public RT<BaseStudentDevelopmentVo> info(@RequestParam Long id){
+        BaseStudentDevelopmentVo baseStudentDevelopment = developmentService.getInfoById(id);
+        if (baseStudentDevelopment == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(baseStudentDevelopment);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生去向登记")
+    @SaCheckPermission("basestudentdevelopment:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentDevelopmentDto dto){
+        BaseStudentDevelopment baseStudentDevelopment = BeanUtil.toBean(dto, BaseStudentDevelopment.class);
+        boolean isSuccess = developmentService.save(baseStudentDevelopment);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生去向登记")
+    @SaCheckPermission("basestudentdevelopment:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentDevelopmentDto dto){
+
+        BaseStudentDevelopment baseStudentDevelopment = BeanUtil.toBean(dto, BaseStudentDevelopment.class);
+        return RT.ok(developmentService.updateById(baseStudentDevelopment));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生去向登记")
+    @SaCheckPermission("basestudentdevelopment:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(developmentService.removeBatchByIds(ids));
+
+    }
+
+}

+ 0 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java

@@ -22,7 +22,6 @@ import com.xjrsoft.module.student.service.IBaseStudentScholarshipReleaseService;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipReleasePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipReleaseRecordVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipReleaseVo;
-import com.xjrsoft.module.student.vo.ScholarshipApplicantImportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -39,7 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 

+ 148 - 0
src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentDevelopmentDto.java

@@ -0,0 +1,148 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentDevelopmentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 学生id(xjr_user)
+    */
+    @ApiModelProperty("学生id(xjr_user)")
+    private Long userId;
+    /**
+    * 登记类型(1:升学 2:就业 3:未就业)
+    */
+    @ApiModelProperty("登记类型(1:升学 2:就业 3:未就业)")
+    private Integer enrollType;
+    /**
+    * 毕业id(base_student_graduate)
+    */
+    @ApiModelProperty("毕业id(base_student_graduate)")
+    private Long baseStudentGraduateId;
+    /**
+    * 是否自己创业(1:是 0:否)
+    */
+    @ApiModelProperty("是否自己创业(1:是 0:否)")
+    private Integer isEntrepreneurship;
+    /**
+    * 创业项目名称
+    */
+    @ApiModelProperty("创业项目名称")
+    private String entrepreneurialProject;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer isFlexibleWork;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer workContent;
+    /**
+    * 是否校企合作单位(1:是 0:否)
+    */
+    @ApiModelProperty("是否校企合作单位(1:是 0:否)")
+    private Integer isCompanyCoop;
+    /**
+    * 企合作单位(company_coop),是校企合作单位
+    */
+    @ApiModelProperty("企合作单位(company_coop),是校企合作单位")
+    private Integer companyCoopId;
+    /**
+    * 就业单位名称(非校企合作单位)
+    */
+    @ApiModelProperty("就业单位名称(非校企合作单位)")
+    private String workCompany;
+    /**
+    * 就业单位行业
+    */
+    @ApiModelProperty("就业单位行业")
+    private String companyIndustry;
+    /**
+    * 就业单位性质
+    */
+    @ApiModelProperty("就业单位性质")
+    private String companyNature;
+    /**
+    * 就业单位规模(xjr_dictionary_item[company_scale])
+    */
+    @ApiModelProperty("就业单位规模(xjr_dictionary_item[company_scale])")
+    private String companyScale;
+    /**
+    * 是否对口(1:是 0:否)
+    */
+    @ApiModelProperty("是否对口(1:是 0:否)")
+    private Integer isMatching;
+    /**
+    * 最低薪资
+    */
+    @ApiModelProperty("最低薪资")
+    private Double money;
+    /**
+    * 就业日期
+    */
+    @ApiModelProperty("就业日期")
+    private Date workDate;
+    /**
+    * 就业所在地区
+    */
+    @ApiModelProperty("就业所在地区")
+    private String workCity;
+    /**
+    * 学生类型(xjr_dictionary_item[culture_type])
+    */
+    @ApiModelProperty("学生类型(xjr_dictionary_item[culture_type])")
+    private String cultureType;
+    /**
+    * 升学渠道(xjr_dictionary_item[ascending_channels])
+    */
+    @ApiModelProperty("升学渠道(xjr_dictionary_item[ascending_channels])")
+    private String ascendingChannels;
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String school;
+    /**
+    * 录取专业
+    */
+    @ApiModelProperty("录取专业")
+    private String admissionMajor;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Integer score;
+    /**
+    * 升学层次(xjr_dictionary_item[ascending_arrangement])
+    */
+    @ApiModelProperty("升学层次(xjr_dictionary_item[ascending_arrangement])")
+    private String ascendingArrangement;
+    /**
+    * 未就业类型(xjr_dictionary_item[unemployed_type])
+    */
+    @ApiModelProperty("未就业类型(xjr_dictionary_item[unemployed_type])")
+    private String unemployedType;
+    /**
+    * 备注信息
+    */
+    @ApiModelProperty("备注信息")
+    private String remark;
+
+}

+ 0 - 1
src/main/java/com/xjrsoft/module/student/dto/AddStudentScholarshipDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 

+ 21 - 0
src/main/java/com/xjrsoft/module/student/dto/BaseStudentDevelopmentPageDto.java

@@ -0,0 +1,21 @@
+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-08-04
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentDevelopmentPageDto extends PageInput {
+
+    @ApiModelProperty("毕业id")
+    private Long baseStudentGraduateId;
+}

+ 24 - 0
src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentDevelopmentDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentDevelopmentDto extends AddBaseStudentDevelopmentDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

+ 199 - 0
src/main/java/com/xjrsoft/module/student/entity/BaseStudentDevelopment.java

@@ -0,0 +1,199 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_development")
+@ApiModel(value = "base_student_development", description = "学生去向登记")
+public class BaseStudentDevelopment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 学生id(xjr_user)
+    */
+    @ApiModelProperty("学生id(xjr_user)")
+    private Long userId;
+    /**
+    * 登记类型(1:升学 2:就业 3:未就业)
+    */
+    @ApiModelProperty("登记类型(1:升学 2:就业 3:未就业)")
+    private Integer enrollType;
+    /**
+    * 毕业id(base_student_graduate)
+    */
+    @ApiModelProperty("毕业id(base_student_graduate)")
+    private Long baseStudentGraduateId;
+    /**
+    * 是否自己创业(1:是 0:否)
+    */
+    @ApiModelProperty("是否自己创业(1:是 0:否)")
+    private Integer isEntrepreneurship;
+    /**
+    * 创业项目名称
+    */
+    @ApiModelProperty("创业项目名称")
+    private String entrepreneurialProject;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer isFlexibleWork;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer workContent;
+    /**
+    * 是否校企合作单位(1:是 0:否)
+    */
+    @ApiModelProperty("是否校企合作单位(1:是 0:否)")
+    private Integer isCompanyCoop;
+    /**
+    * 企合作单位(company_coop),是校企合作单位
+    */
+    @ApiModelProperty("企合作单位(company_coop),是校企合作单位")
+    private Integer companyCoopId;
+    /**
+    * 就业单位名称(非校企合作单位)
+    */
+    @ApiModelProperty("就业单位名称(非校企合作单位)")
+    private String workCompany;
+    /**
+    * 就业单位行业
+    */
+    @ApiModelProperty("就业单位行业")
+    private String companyIndustry;
+    /**
+    * 就业单位性质
+    */
+    @ApiModelProperty("就业单位性质")
+    private String companyNature;
+    /**
+    * 就业单位规模(xjr_dictionary_item[company_scale])
+    */
+    @ApiModelProperty("就业单位规模(xjr_dictionary_item[company_scale])")
+    private String companyScale;
+    /**
+    * 是否对口(1:是 0:否)
+    */
+    @ApiModelProperty("是否对口(1:是 0:否)")
+    private Integer isMatching;
+    /**
+    * 最低薪资
+    */
+    @ApiModelProperty("最低薪资")
+    private Double money;
+    /**
+    * 就业日期
+    */
+    @ApiModelProperty("就业日期")
+    private Date workDate;
+    /**
+    * 就业所在地区
+    */
+    @ApiModelProperty("就业所在地区")
+    private String workCity;
+    /**
+    * 学生类型(xjr_dictionary_item[culture_type])
+    */
+    @ApiModelProperty("学生类型(xjr_dictionary_item[culture_type])")
+    private String cultureType;
+    /**
+    * 升学渠道(xjr_dictionary_item[ascending_channels])
+    */
+    @ApiModelProperty("升学渠道(xjr_dictionary_item[ascending_channels])")
+    private String ascendingChannels;
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String school;
+    /**
+    * 录取专业
+    */
+    @ApiModelProperty("录取专业")
+    private String admissionMajor;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Integer score;
+    /**
+    * 升学层次(xjr_dictionary_item[ascending_arrangement])
+    */
+    @ApiModelProperty("升学层次(xjr_dictionary_item[ascending_arrangement])")
+    private String ascendingArrangement;
+    /**
+    * 未就业类型(xjr_dictionary_item[unemployed_type])
+    */
+    @ApiModelProperty("未就业类型(xjr_dictionary_item[unemployed_type])")
+    private String unemployedType;
+    /**
+    * 备注信息
+    */
+    @ApiModelProperty("备注信息")
+    private String remark;
+
+
+}

+ 20 - 0
src/main/java/com/xjrsoft/module/student/mapper/BaseStudentDevelopmentMapper.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentDevelopment;
+import com.xjrsoft.module.student.vo.BaseStudentDevelopmentVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentDevelopmentMapper extends MPJBaseMapper<BaseStudentDevelopment> {
+
+    BaseStudentDevelopmentVo getInfoById(@Param("id") Long id);
+
+}

+ 18 - 0
src/main/java/com/xjrsoft/module/student/service/IBaseStudentDevelopmentService.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentDevelopment;
+import com.xjrsoft.module.student.vo.BaseStudentDevelopmentVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+
+public interface IBaseStudentDevelopmentService extends MPJBaseService<BaseStudentDevelopment> {
+
+    BaseStudentDevelopmentVo getInfoById(Long id);
+}

+ 0 - 1
src/main/java/com/xjrsoft/module/student/service/IBaseStudentScholarshipApplicantService.java

@@ -5,7 +5,6 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
-import com.xjrsoft.module.student.vo.ScholarshipApplicantImportVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;

+ 0 - 1
src/main/java/com/xjrsoft/module/student/service/IBaseStudentScholarshipCategoryService.java

@@ -6,7 +6,6 @@ import com.xjrsoft.module.student.dto.BaseStudentScholarshipReleasePageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipCategoryStatisticPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipReleasePageVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

+ 24 - 0
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentDevelopmentServiceImpl.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentDevelopment;
+import com.xjrsoft.module.student.mapper.BaseStudentDevelopmentMapper;
+import com.xjrsoft.module.student.service.IBaseStudentDevelopmentService;
+import com.xjrsoft.module.student.vo.BaseStudentDevelopmentVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 学生去向登记
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentDevelopmentServiceImpl extends MPJBaseServiceImpl<BaseStudentDevelopmentMapper, BaseStudentDevelopment> implements IBaseStudentDevelopmentService {
+    @Override
+    public BaseStudentDevelopmentVo getInfoById(Long id) {
+        return this.baseMapper.getInfoById(id);
+    }
+}

+ 153 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentDevelopmentPageVo.java

@@ -0,0 +1,153 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生去向登记分页列表出参
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Data
+public class BaseStudentDevelopmentPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 学生id(xjr_user)
+    */
+    @ApiModelProperty("学生id(xjr_user)")
+    private Long userId;
+    /**
+    * 登记类型(1:升学 2:就业 3:未就业)
+    */
+    @ApiModelProperty("登记类型(1:升学 2:就业 3:未就业)")
+    private Integer enrollType;
+    /**
+    * 毕业id(base_student_graduate)
+    */
+    @ApiModelProperty("毕业id(base_student_graduate)")
+    private Long baseStudentGraduateId;
+    /**
+    * 是否自己创业(1:是 0:否)
+    */
+    @ApiModelProperty("是否自己创业(1:是 0:否)")
+    private Integer isEntrepreneurship;
+    /**
+    * 创业项目名称
+    */
+    @ApiModelProperty("创业项目名称")
+    private String entrepreneurialProject;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer isFlexibleWork;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer workContent;
+    /**
+    * 是否校企合作单位(1:是 0:否)
+    */
+    @ApiModelProperty("是否校企合作单位(1:是 0:否)")
+    private Integer isCompanyCoop;
+    /**
+    * 企合作单位(company_coop),是校企合作单位
+    */
+    @ApiModelProperty("企合作单位(company_coop),是校企合作单位")
+    private Integer companyCoopId;
+    /**
+    * 就业单位名称(非校企合作单位)
+    */
+    @ApiModelProperty("就业单位名称(非校企合作单位)")
+    private String workCompany;
+    /**
+    * 就业单位行业
+    */
+    @ApiModelProperty("就业单位行业")
+    private String companyIndustry;
+    /**
+    * 就业单位性质
+    */
+    @ApiModelProperty("就业单位性质")
+    private String companyNature;
+    /**
+    * 就业单位规模(xjr_dictionary_item[company_scale])
+    */
+    @ApiModelProperty("就业单位规模(xjr_dictionary_item[company_scale])")
+    private String companyScale;
+    /**
+    * 是否对口(1:是 0:否)
+    */
+    @ApiModelProperty("是否对口(1:是 0:否)")
+    private Integer isMatching;
+    /**
+    * 最低薪资
+    */
+    @ApiModelProperty("最低薪资")
+    private Double money;
+    /**
+    * 就业日期
+    */
+    @ApiModelProperty("就业日期")
+    private Date workDate;
+    /**
+    * 就业所在地区
+    */
+    @ApiModelProperty("就业所在地区")
+    private String workCity;
+    /**
+    * 学生类型(xjr_dictionary_item[culture_type])
+    */
+    @ApiModelProperty("学生类型(xjr_dictionary_item[culture_type])")
+    private String cultureType;
+    /**
+    * 升学渠道(xjr_dictionary_item[ascending_channels])
+    */
+    @ApiModelProperty("升学渠道(xjr_dictionary_item[ascending_channels])")
+    private String ascendingChannels;
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String school;
+    /**
+    * 录取专业
+    */
+    @ApiModelProperty("录取专业")
+    private String admissionMajor;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Integer score;
+    /**
+    * 升学层次(xjr_dictionary_item[ascending_arrangement])
+    */
+    @ApiModelProperty("升学层次(xjr_dictionary_item[ascending_arrangement])")
+    private String ascendingArrangement;
+    /**
+    * 未就业类型(xjr_dictionary_item[unemployed_type])
+    */
+    @ApiModelProperty("未就业类型(xjr_dictionary_item[unemployed_type])")
+    private String unemployedType;
+    /**
+    * 备注信息
+    */
+    @ApiModelProperty("备注信息")
+    private String remark;
+
+}

+ 145 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentDevelopmentVo.java

@@ -0,0 +1,145 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生去向登记表单出参
+* @Author dzx
+* @Date: 2024-08-04
+* @Version 1.0
+*/
+@Data
+public class BaseStudentDevelopmentVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 登记类型(1:升学 2:就业 3:未就业)
+    */
+    @ApiModelProperty("登记类型(1:升学 2:就业 3:未就业)")
+    private Integer enrollType;
+    /**
+    * 毕业id(base_student_graduate)
+    */
+    @ApiModelProperty("毕业id(base_student_graduate)")
+    private Long baseStudentGraduateId;
+    /**
+    * 是否自己创业(1:是 0:否)
+    */
+    @ApiModelProperty("是否自己创业(1:是 0:否)")
+    private Integer isEntrepreneurship;
+    /**
+    * 创业项目名称
+    */
+    @ApiModelProperty("创业项目名称")
+    private String entrepreneurialProject;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer isFlexibleWork;
+    /**
+    * 是否灵活就业(1:是 0:否)
+    */
+    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    private Integer workContent;
+    /**
+    * 是否校企合作单位(1:是 0:否)
+    */
+    @ApiModelProperty("是否校企合作单位(1:是 0:否)")
+    private Integer isCompanyCoop;
+    /**
+    * 企合作单位(company_coop),是校企合作单位
+    */
+    @ApiModelProperty("企合作单位(company_coop),是校企合作单位")
+    private Integer companyCoopId;
+    /**
+    * 就业单位名称(非校企合作单位)
+    */
+    @ApiModelProperty("就业单位名称(非校企合作单位)")
+    private String workCompany;
+    /**
+    * 就业单位行业
+    */
+    @ApiModelProperty("就业单位行业")
+    private String companyIndustry;
+    /**
+    * 就业单位性质
+    */
+    @ApiModelProperty("就业单位性质")
+    private String companyNature;
+    /**
+    * 就业单位规模(xjr_dictionary_item[company_scale])
+    */
+    @ApiModelProperty("就业单位规模(xjr_dictionary_item[company_scale])")
+    private String companyScaleCn;
+    /**
+    * 是否对口(1:是 0:否)
+    */
+    @ApiModelProperty("是否对口(1:是 0:否)")
+    private Integer isMatching;
+    /**
+    * 最低薪资
+    */
+    @ApiModelProperty("最低薪资")
+    private Double money;
+    /**
+    * 就业日期
+    */
+    @ApiModelProperty("就业日期")
+    private Date workDate;
+    /**
+    * 就业所在地区
+    */
+    @ApiModelProperty("就业所在地区")
+    private String workCity;
+    /**
+    * 学生类型(xjr_dictionary_item[culture_type])
+    */
+    @ApiModelProperty("学生类型(xjr_dictionary_item[culture_type])")
+    private String cultureTypeCn;
+    /**
+    * 升学渠道(xjr_dictionary_item[ascending_channels])
+    */
+    @ApiModelProperty("升学渠道(xjr_dictionary_item[ascending_channels])")
+    private String ascendingChannelsCn;
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String school;
+    /**
+    * 录取专业
+    */
+    @ApiModelProperty("录取专业")
+    private String admissionMajor;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Integer score;
+    /**
+    * 升学层次(xjr_dictionary_item[ascending_arrangement])
+    */
+    @ApiModelProperty("升学层次(xjr_dictionary_item[ascending_arrangement])")
+    private String ascendingArrangementCn;
+    /**
+    * 未就业类型(xjr_dictionary_item[unemployed_type])
+    */
+    @ApiModelProperty("未就业类型(xjr_dictionary_item[unemployed_type])")
+    private String unemployedTypeCn;
+    /**
+    * 备注信息
+    */
+    @ApiModelProperty("备注信息")
+    private String remark;
+
+
+
+}

+ 0 - 2
src/main/java/com/xjrsoft/module/student/vo/ScholarshipApplicantImportVo.java

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
 * @title: 奖学金申请表单出参
 * @Author dzx

+ 22 - 0
src/main/resources/mapper/student/BaseStudentDevelopmentMapper.xml

@@ -0,0 +1,22 @@
+<?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.BaseStudentDevelopmentMapper">
+    <!--姓名和性别,测试阶段采用姓名第一个字拼接user_id的方式脱敏-->
+    <select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentDevelopmentVo">
+        SELECT t1.id,t1.is_entrepreneurship,t1.entrepreneurial_project,t1.is_flexible_work,t1.work_content,
+        t1.is_company_coop,t1.work_company,t1.company_industry,t1.company_nature,t2.name AS company_scale_cn,t1.is_matching,
+        t1.money,t1.work_date,t1.work_city,t3.name AS culture_type_cn,t4.name AS ascending_channels_cn,
+        t1.school,t1.admission_major,t1.score,t5.name AS ascending_arrangement_cn,t6.name AS unemployed_type_cn,t1.remark
+        FROM base_student_development t1
+        LEFT JOIN xjr_dictionary_detail t2 ON t1.company_scale = t2.code
+        LEFT JOIN xjr_dictionary_detail t3 ON t1.culture_type = t3.code
+        LEFT JOIN xjr_dictionary_detail t4 ON t1.ascending_channels = t4.code
+        LEFT JOIN xjr_dictionary_detail t5 ON t1.ascending_arrangement = t5.code
+        LEFT JOIN xjr_dictionary_detail t6 ON t1.unemployed_type = t6.code
+        WHERE t1.delete_mark = 0
+        AND t1.base_student_graduate_id = #{id}
+    </select>
+
+</mapper>

+ 28 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -3604,4 +3604,32 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+
+    @Test
+    public void gcBaseStudentDevelopment() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_development");//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);
+    }
 }