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

Makefile

@@ -5,7 +5,7 @@ create-tag:
 	git checkout master;git tag v1.1.8;git push origin --tags;git checkout dev;
 
 remove-tag:
-	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;
+	git tag -d v1.1.8;git push origin :refs/tags/v1.1.8;
 
 gen-rsaprivatekey:
 	openssl genrsa -out rsaprivatekey.pem 1024

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

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorClassRelationService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 学生跳级流程结束处理
+ */
+@Component("Wf_skip_grade_node")
+public class WfSkipGradeNode extends NodeComponent {
+
+    @Autowired
+    private IBaseStudentBehaviorClassRelationService behaviorClassRelationService;
+
+    @Override
+    public void process() throws Exception {
+//        // 获取表单中数据编号
+//        Map<String, Object> params = this.getFirstContextBean();
+//        Object value = util.getFormDatKey(params,"id");
+//        Long formId = Convert.toLong(value);
+//        if (formId != null) {
+//            // 数据处理
+//            behaviorClassRelationService.dataCache(formId);
+//        }
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddSchoolRollFurtherEducationDto;
+import com.xjrsoft.module.student.dto.UpdateSchoolRollFurtherEducationDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.SchoolRollFurtherEducationPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollFurtherEducation;
+import com.xjrsoft.module.student.service.ISchoolRollFurtherEducationService;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationPageVo;
+
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/schoolRollFurtherEducation")
+@Api(value = "/student"  + "/schoolRollFurtherEducation",tags = "升学管理代码")
+@AllArgsConstructor
+public class SchoolRollFurtherEducationController {
+
+
+    private final ISchoolRollFurtherEducationService schoolRollFurtherEducationService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="升学管理列表(分页)")
+    @SaCheckPermission("schoolrollfurthereducation:detail")
+    public RT<PageOutput<SchoolRollFurtherEducationPageVo>> page(@Valid SchoolRollFurtherEducationPageDto dto){
+        IPage<SchoolRollFurtherEducationPageVo> page = schoolRollFurtherEducationService.getPageListPc(dto);
+        PageOutput<SchoolRollFurtherEducationPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollFurtherEducationPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询升学管理信息")
+    @SaCheckPermission("schoolrollfurthereducation:detail")
+    public RT<SchoolRollFurtherEducationVo> info(@RequestParam Long id){
+        SchoolRollFurtherEducationVo schoolRollFurtherEducationVo = schoolRollFurtherEducationService.getDetailById(id);
+        if (schoolRollFurtherEducationVo == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(schoolRollFurtherEducationVo);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增升学管理")
+    @SaCheckPermission("schoolrollfurthereducation:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSchoolRollFurtherEducationDto dto){
+        SchoolRollFurtherEducation schoolRollFurtherEducation = BeanUtil.toBean(dto, SchoolRollFurtherEducation.class);
+        boolean isSuccess = schoolRollFurtherEducationService.save(schoolRollFurtherEducation);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改升学管理")
+    @SaCheckPermission("schoolrollfurthereducation:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSchoolRollFurtherEducationDto dto){
+
+        SchoolRollFurtherEducation schoolRollFurtherEducation = BeanUtil.toBean(dto, SchoolRollFurtherEducation.class);
+        return RT.ok(schoolRollFurtherEducationService.updateById(schoolRollFurtherEducation));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除升学管理")
+    @SaCheckPermission("schoolrollfurthereducation:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(schoolRollFurtherEducationService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,98 @@
+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;
+
+
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+public class AddSchoolRollFurtherEducationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 异动前所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动前所属机构(xjr_department)")
+    private Long beforeDepartmentId;
+    /**
+    * 异动前入学年级(base_grade)
+    */
+    @ApiModelProperty("异动前入学年级(base_grade)")
+    private Long beforeGradeId;
+    /**
+    * 异动前班级(base_class)
+    */
+    @ApiModelProperty("异动前班级(base_class)")
+    private Long beforeClassId;
+    /**
+    * 异动前专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动前专业方向(base_major_set)")
+    private Long beforeMajorSetId;
+    /**
+    * 异动后所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动后所属机构(xjr_department)")
+    private Long backDepartmentId;
+    /**
+    * 异动后入学年级(base_grade)
+    */
+    @ApiModelProperty("异动后入学年级(base_grade)")
+    private Long backGradeId;
+    /**
+    * 异动后班级(base_class)
+    */
+    @ApiModelProperty("异动后班级(base_class)")
+    private Long backClassId;
+    /**
+    * 异动后专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动后专业方向(base_major_set)")
+    private Long backMajorSetId;
+    /**
+    * 学生编号(学生user_id)
+    */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private Long studentId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+}

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

@@ -0,0 +1,44 @@
+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;
+
+
+/**
+* @title: 升学管理分页查询入参
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SchoolRollFurtherEducationPageDto extends PageInput {
+    /**
+     * 学生编号对应的姓名(学生user_id)
+     */
+    @ApiModelProperty("学生编号姓名(学生user_id)")
+    private String studentIdCN;
+    /**
+     * 异动前班级中文(base_class)
+     */
+    @ApiModelProperty("异动前班级中文(base_class)")
+    private String beforeClassIdCN;
+    /**
+     * 异动后班级中文(base_class)
+     */
+    @ApiModelProperty("异动后班级中文(base_class)")
+    private String backClassIdCN;
+    /**
+     * 申请人（操作人）姓名
+     */
+    @ApiModelProperty("申请人姓名")
+    private String applicantUserIdCN;
+}

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

@@ -0,0 +1,32 @@
+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;
+
+
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+public class UpdateSchoolRollFurtherEducationDto extends AddSchoolRollFurtherEducationDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,148 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+@TableName("school_roll_further_education")
+@ApiModel(value = "school_roll_further_education", description = "升学管理")
+public class SchoolRollFurtherEducation 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 Long applicantUserId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 异动前所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动前所属机构(xjr_department)")
+    private Long beforeDepartmentId;
+    /**
+    * 异动前入学年级(base_grade)
+    */
+    @ApiModelProperty("异动前入学年级(base_grade)")
+    private Long beforeGradeId;
+    /**
+    * 异动前班级(base_class)
+    */
+    @ApiModelProperty("异动前班级(base_class)")
+    private Long beforeClassId;
+    /**
+    * 异动前专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动前专业方向(base_major_set)")
+    private Long beforeMajorSetId;
+    /**
+    * 异动后所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动后所属机构(xjr_department)")
+    private Long backDepartmentId;
+    /**
+    * 异动后入学年级(base_grade)
+    */
+    @ApiModelProperty("异动后入学年级(base_grade)")
+    private Long backGradeId;
+    /**
+    * 异动后班级(base_class)
+    */
+    @ApiModelProperty("异动后班级(base_class)")
+    private Long backClassId;
+    /**
+    * 异动后专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动后专业方向(base_major_set)")
+    private Long backMajorSetId;
+    /**
+    * 学生编号(学生user_id)
+    */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private Long studentId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
+import com.xjrsoft.module.student.dto.SchoolRollFurtherEducationPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollFurtherEducation;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Mapper
+public interface SchoolRollFurtherEducationMapper extends MPJBaseMapper<SchoolRollFurtherEducation> {
+
+    /**
+     * 升学管理列表(分页)PC端
+     * @return
+     */
+    Page<SchoolRollFurtherEducationPageVo> getPageListPc(IPage<SchoolRollFurtherEducationPageDto> page, SchoolRollFurtherEducationPageDto dto);
+
+    /**
+     * 根据id查询升学管理信息
+     * @param id
+     * @return
+     */
+    SchoolRollFurtherEducationVo getDetailById(Long id);
+
+}

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

@@ -0,0 +1,36 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.SchoolRollFurtherEducationPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollFurtherEducation;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationVo;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+
+public interface ISchoolRollFurtherEducationService extends MPJBaseService<SchoolRollFurtherEducation> {
+
+    /**
+     * 升学管理列表(分页)PC端
+     * @return
+     */
+    IPage<SchoolRollFurtherEducationPageVo> getPageListPc(SchoolRollFurtherEducationPageDto dto);
+
+    /**
+     * 根据id查询升学管理信息
+     * @param id
+     * @return
+     */
+    SchoolRollFurtherEducationVo getDetailById(Long id);
+
+}

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

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.module.student.dto.SchoolRollFurtherEducationPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollFurtherEducation;
+import com.xjrsoft.module.student.mapper.SchoolRollFurtherEducationMapper;
+import com.xjrsoft.module.student.service.ISchoolRollFurtherEducationService;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollFurtherEducationVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 升学管理
+* @Author szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollFurtherEducationServiceImpl extends MPJBaseServiceImpl<SchoolRollFurtherEducationMapper, SchoolRollFurtherEducation> implements ISchoolRollFurtherEducationService {
+
+    private final SchoolRollFurtherEducationMapper schoolRollFurtherEducationMapper;
+
+    /**
+     * 升学管理列表(分页)PC端
+     * @return
+     */
+    @Override
+    public IPage<SchoolRollFurtherEducationPageVo> getPageListPc(SchoolRollFurtherEducationPageDto dto) {
+        IPage<SchoolRollFurtherEducationPageVo> pageList = schoolRollFurtherEducationMapper.getPageListPc(ConventPage.getPage(dto),dto);
+        return pageList;
+    }
+
+    /**
+     * 根据id查询升学管理信息
+     * @param id
+     * @return
+     */
+    @Override
+    public SchoolRollFurtherEducationVo getDetailById(Long id) {
+        SchoolRollFurtherEducationVo schoolRollFurtherEducationVo = schoolRollFurtherEducationMapper.getDetailById(id);
+        return schoolRollFurtherEducationVo;
+    }
+}

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

@@ -0,0 +1,89 @@
+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 szs
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+public class SchoolRollFurtherEducationPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+     * 序号
+     */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+     * 学生编号对应的(学生user_id)
+     */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private String studentId;
+    /**
+     * 学生编号对应的姓名(学生user_id)
+     */
+    @ApiModelProperty("学生编号姓名(学生user_id)")
+    private String studentIdCN;
+    /**
+     * 学生证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
+    /**
+     * 异动前专业方向中文(base_major_set)
+     */
+    @ApiModelProperty("异动前专业方向中文(base_major_set)")
+    private String beforeMajorSetIdCN;
+    /**
+     * 异动前班级中文(base_class)
+     */
+    @ApiModelProperty("异动前班级中文(base_class)")
+    private String beforeClassIdCN;
+    /**
+     * 异动后班级中文(base_class)
+     */
+    @ApiModelProperty("异动后班级中文(base_class)")
+    private String backClassIdCN;
+    /**
+     * 异动后专业方向中文(base_major_set)
+     */
+    @ApiModelProperty("异动后专业方向中文(base_major_set)")
+    private String backMajorSetIdCN;
+    /**
+     * 申请人（操作人）姓名
+     */
+    @ApiModelProperty("申请人姓名")
+    private String applicantUserIdCN;
+    /**
+     * 原因
+     */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer status;
+
+}

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

@@ -0,0 +1,132 @@
+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
+* @Date: 2023-12-01
+* @Version 1.0
+*/
+@Data
+public class SchoolRollFurtherEducationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 异动前所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动前所属机构(xjr_department)")
+    private Long beforeDepartmentId;
+    /**
+    * 异动前入学年级(base_grade)
+    */
+    @ApiModelProperty("异动前入学年级(base_grade)")
+    private Long beforeGradeId;
+    /**
+    * 异动前班级(base_class)
+    */
+    @ApiModelProperty("异动前班级(base_class)")
+    private Long beforeClassId;
+    /**
+    * 异动前专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动前专业方向(base_major_set)")
+    private Long beforeMajorSetId;
+    /**
+    * 异动后所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动后所属机构(xjr_department)")
+    private Long backDepartmentId;
+    /**
+    * 异动后入学年级(base_grade)
+    */
+    @ApiModelProperty("异动后入学年级(base_grade)")
+    private Long backGradeId;
+    /**
+    * 异动后班级(base_class)
+    */
+    @ApiModelProperty("异动后班级(base_class)")
+    private Long backClassId;
+    /**
+    * 异动后专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动后专业方向(base_major_set)")
+    private Long backMajorSetId;
+    /**
+    * 学生编号(学生user_id)
+    */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private Long studentId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+    /**
+     * 学生编号对应的姓名(学生user_id)
+     */
+    @ApiModelProperty("学生编号姓名(学生user_id)")
+    private String studentIdCN;
+    /**
+     * 学生证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
+    /**
+     * 异动前专业方向中文(base_major_set)
+     */
+    @ApiModelProperty("异动前专业方向中文(base_major_set)")
+    private String beforeMajorSetIdCN;
+    /**
+     * 异动前班级中文(base_class)
+     */
+    @ApiModelProperty("异动前班级中文(base_class)")
+    private String beforeClassIdCN;
+    /**
+     * 异动后班级中文(base_class)
+     */
+    @ApiModelProperty("异动后班级中文(base_class)")
+    private String backClassIdCN;
+    /**
+     * 异动后专业方向中文(base_major_set)
+     */
+    @ApiModelProperty("异动后专业方向中文(base_major_set)")
+    private String backMajorSetIdCN;
+    /**
+     * 申请人（操作人）姓名
+     */
+    @ApiModelProperty("申请人姓名")
+    private String applicantUserIdCN;
+}

src/main/java/com/xjrsoft/module/workflow/listener/ExecutionDelegate.java

@@ -88,7 +88,7 @@ public class ExecutionDelegate implements ExecutionListener {
         String endEventKey = WorkflowConstant.END_EVENT_CACHE_PRE +  ((ExecutionEntity) execution).getProcessDefinition().getDeploymentId() + StringPool.COLON + eventSource.getId() + StringPool.COLON + WorkflowEventType.END.getValue();
 
         //如果有当前节点有缓存开始事件数据
-        if (redisUtil.containsKey(startEventKey)) {
+        if (redisUtil.containsKey(startEventKey) && execution.getEventName().equals(EVENTNAME_START)) {
 
             List<NodeEventConfig> startEventConfigs = redisUtil.get(startEventKey, new TypeReference<List<NodeEventConfig>>() {
             });
@@ -107,7 +107,7 @@ public class ExecutionDelegate implements ExecutionListener {
 //            }
         }
         //如果有当前节点有缓存开始事件数据
-        if (redisUtil.containsKey(endEventKey)) {
+        if (redisUtil.containsKey(endEventKey) && execution.getEventName().equals(EVENTNAME_END)) {
 
             List<NodeEventConfig> endEventConfigs = redisUtil.get(endEventKey, new TypeReference<List<NodeEventConfig>>() {
             });

src/main/resources/mapper/student/SchoolRollFurtherEducationMapper.xml

@@ -0,0 +1,64 @@
+<?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.SchoolRollFurtherEducationMapper">
+    <select id="getPageListPc" parameterType="com.xjrsoft.module.student.dto.SchoolRollFurtherEducationPageDto"
+            resultType="com.xjrsoft.module.student.vo.SchoolRollFurtherEducationPageVo">
+        SELECT
+            t.id,
+            t.sort_code,
+            t.student_id AS studentId,
+            t1.name AS studentIdCN,
+            t1.credential_number AS credentialNumber,
+            t2.name AS beforeMajorSetIdCN,
+            t3.name AS beforeClassIdCN,
+            t4.name AS backClassIdCN,
+            t5.name AS backMajorSetIdCN,
+            t6.name AS applicantUserIdCN,
+            t.reason,
+            t.enabled_mark AS enabledMark
+        FROM school_roll_further_education t
+                 LEFT JOIN xjr_user t1 ON (t.student_id = t1.id)
+                 LEFT JOIN base_major_set t2 ON (t.before_major_set_id = t2.id)
+                 LEFT JOIN base_class t3 ON (t.before_class_id = t3.id)
+                 LEFT JOIN base_class t4 ON (t.back_class_id = t4.id)
+                 LEFT JOIN base_major_set t5 ON (t.back_major_set_id = t5.id)
+                 LEFT JOIN xjr_user t6 ON (t.applicant_user_id = t6.id)
+        WHERE t.delete_mark = 0 AND t.status = 1
+        <if test="dto.studentIdCN != null and dto.studentIdCN != ''">
+            and t1.name like concat('%',#{dto.studentIdCN},'%')
+        </if>
+        <if test="dto.beforeClassIdCN != null and dto.beforeClassIdCN != ''">
+            and t3.name like concat('%',#{dto.beforeClassIdCN},'%')
+        </if>
+        <if test="dto.backClassIdCN != null and dto.backClassIdCN != ''">
+            and t4.name like concat('%',#{dto.backClassIdCN},'%')
+        </if>
+        <if test="dto.applicantUserIdCN != null and dto.applicantUserIdCN != ''">
+            and t6.name like concat('%',#{dto.applicantUserIdCN},'%')
+        </if>
+        ORDER BY t.id DESC;
+    </select>
+
+    <select id="getDetailById"
+            resultType="com.xjrsoft.module.student.vo.SchoolRollFurtherEducationVo">
+        SELECT
+            t.*,
+            t1.name AS studentIdCN,
+            t1.credential_number AS credentialNumber,
+            t2.name AS beforeMajorSetIdCN,
+            t3.name AS beforeClassIdCN,
+            t4.name AS backClassIdCN,
+            t5.name AS backMajorSetIdCN,
+            t6.name AS applicantUserIdCN
+        FROM school_roll_further_education t
+                 LEFT JOIN xjr_user t1 ON (t.student_id = t1.id)
+                 LEFT JOIN base_major_set t2 ON (t.before_major_set_id = t2.id)
+                 LEFT JOIN base_class t3 ON (t.before_class_id = t3.id)
+                 LEFT JOIN base_class t4 ON (t.back_class_id = t4.id)
+                 LEFT JOIN base_major_set t5 ON (t.back_major_set_id = t5.id)
+                 LEFT JOIN xjr_user t6 ON (t.applicant_user_id = t6.id)
+        WHERE t.id = #{id} AND t.delete_mark = 0 AND t.status = 1;
+    </select>
+</mapper>

src/main/resources/sqlScript/20231129_sql.sql

@@ -55,6 +55,7 @@ CREATE TABLE school_roll_student
     `enabled_mark` INT NOT NULL COMMENT '有效标志',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `scholarship_source` varchar(20) NOT NULL DEFAULT 0 COMMENT '学籍异动类型(xjr_dictionary_item[school_change_type])',
     `school_roll_category_id` bigint NULL DEFAULT NULL COMMENT '学籍异动类别ID(school_roll_category)',
     `school_roll_reason_id` bigint NULL DEFAULT NULL COMMENT '学籍异动原因ID(school_roll_reason)',
     `reason` varchar(2000) NULL DEFAULT NULL COMMENT '原因',
@@ -156,6 +157,38 @@ CREATE TABLE school_roll_transfer_student
     `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '插班生管理';
+
+-- ----------------------------
+-- 升学管理
+-- ----------------------------
+DROP TABLE IF EXISTS school_roll_further_education;
+CREATE TABLE school_roll_further_education
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `reason` varchar(2000) NULL DEFAULT NULL COMMENT '原因',
+
+    `before_department_id` bigint NULL DEFAULT NULL COMMENT '异动前所属机构(xjr_department)',
+    `before_grade_id` bigint NULL DEFAULT NULL COMMENT '异动前入学年级(base_grade)',
+    `before_class_id` bigint NULL DEFAULT NULL COMMENT '异动前班级(base_class)',
+    `before_major_set_id` bigint NULL DEFAULT NULL COMMENT '异动前专业方向(base_major_set)',
+
+    `back_department_id` bigint NULL DEFAULT NULL COMMENT '异动后所属机构(xjr_department)',
+    `back_grade_id` bigint NULL DEFAULT NULL COMMENT '异动后入学年级(base_grade)',
+    `back_class_id` bigint NULL DEFAULT NULL COMMENT '异动后班级(base_class)',
+    `back_major_set_id` bigint NULL DEFAULT NULL COMMENT '异动后专业方向(base_major_set)',
+
+    `remark` varchar(1000) COMMENT '备注',
+    `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '升学管理';
 -- ------------------------------------------------------------------学籍异动管理--------------------------------------------------------------------
 
 
@@ -165,3 +198,6 @@ CREATE TABLE school_roll_transfer_student
 
 
 
+
+
+

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

@@ -888,4 +888,37 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+
+    /**
+     * 升学管理
+     *
+     */
+    @Test
+    public void gcSchoolRollFurtherEducation() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("school_roll_further_education");//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("szs");//作者名称
+        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);
+    }
+
 }