xgxt_sd/zhxg_java
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
weishengyou
2026-04-02 14:04:38 +08:00
parent 7fa9a37063 a2d1f746cc
commit 68bddd68a8
14 changed files with 642 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentInfoCheckController.java Normal file
View File

@@ -0,0 +1,89 @@
package com.srs.web.controller.comprehensive;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import org.springframework.security.access.prepost.PreAuthorize;
import com.srs.comprehensive.domain.SrsStudentInfoCheck;
import com.srs.comprehensive.service.ISrsStudentInfoCheckService;
import com.srs.common.core.controller.BaseController;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.enums.BusinessType;
import com.srs.common.annotation.Log;
import com.srs.common.core.page.TableDataInfo;
import com.srs.common.utils.poi.ExcelUtil;
/**
* 学生信息核对 Controller
*
* @author srs
* @date 2024-03-27
*/
@RestController
@RequestMapping("/comprehensive/studentInfo")
@Api(value = "学生信息核对管理", tags = "学生信息核对")
public class SrsStudentInfoCheckController extends BaseController {
@Autowired
private ISrsStudentInfoCheckService srsStudentInfoCheckService;
/**
* 查询学生自己的信息
*/
@GetMapping("/getOwnInfo")
@ApiOperation("查询学生自己的信息")
public AjaxResult getOwnInfo() {
SrsStudentInfoCheck info = srsStudentInfoCheckService.getStuInfo(getUsername());
return AjaxResult.success(info);
}
/**
* 根据学号查询学生信息（辅导员专用）
*/
@GetMapping("/getStuInfoByStuNo")
@ApiOperation("根据学号查询学生信息")
public AjaxResult getStuInfoByStuNo(@RequestParam String stuNo) {
SrsStudentInfoCheck info = srsStudentInfoCheckService.getStuInfo(stuNo);
return AjaxResult.success(info);
}
/**
* 修改学生自己的信息
*/
@PostMapping("/editOwnInfo")
@ApiOperation("修改学生自己的信息")
public AjaxResult editOwnInfo(@RequestBody SrsStudentInfoCheck param) {
if (param.getStuNo() == null || "".equals(param.getStuNo())) {
param.setStuNo(getUsername());
}
return srsStudentInfoCheckService.editStuInfo(param);
}
/**
* 查询学生信息列表（管理端使用）
*/
@PreAuthorize("@ss.hasPermi('comprehensive:studentInfo:list')")
@GetMapping("/list")
@ApiOperation("查询学生信息列表")
public TableDataInfo list(SrsStudentInfoCheck srsStudentInfoCheck) {
startPage();
List<SrsStudentInfoCheck> list = srsStudentInfoCheckService.selectSrsStudentInfoCheckList(srsStudentInfoCheck);
return getDataTable(list);
}
/**
* 导出学生信息列表（管理端使用）
*/
@PreAuthorize("@ss.hasPermi('comprehensive:studentInfo:export')")
@Log(title = "学生信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出学生信息列表")
public void export(HttpServletResponse response, SrsStudentInfoCheck srsStudentInfoCheck) {
List<SrsStudentInfoCheck> list = srsStudentInfoCheckService.selectSrsStudentInfoCheckList(srsStudentInfoCheck);
ExcelUtil<SrsStudentInfoCheck> util = new ExcelUtil<SrsStudentInfoCheck>(SrsStudentInfoCheck.class);
util.exportExcel(response, list, "学生信息数据");
}
}

17
srs-admin/src/main/java/com/srs/web/controller/routine/SysDisBasicController.java
View File

@@ -81,13 +81,18 @@ public class SysDisBasicController extends BaseController {
SysDisBasicDao dao = new SysDisBasicDao();
dao.setStId(item.getStId());
dao.setStName(item.getStName());
dao.setCollege(item.getCollege());
dao.setCollegeInfo(item.getCollegeInfo());
dao.setGradeInfo(item.getGradeInfo());
dao.setMajorInfo(item.getMajorInfo());
// dao.setMajors(item.getMajors());
dao.setClassInfo(item.getClassInfo());
// dao.setCollege(item.getCollege());
dao.setSex(item.getSex());
dao.setNations(item.getNations());
dao.setStClass(item.getStClass());
dao.setMajors(item.getMajors());
dao.setGrade(item.getGrade());
dao.setCollege(item.getCollege());
// dao.setStClass(item.getStClass());
// dao.setMajors(item.getMajors());
// dao.setGrade(item.getGrade());
// dao.setCollege(item.getCollege());
dao.setReasons(item.getReasons());
dao.setConversion(item.getConversion());
@@ -104,8 +109,6 @@ public class SysDisBasicController extends BaseController {
for (SysDisMate mate : item.getMaList()){
dao1.setOldgrade(mate.getOldgrade());
dao1.setOldmajor(mate.getOldmajor());
// dao1.setNewgrade(mate.getNewgrade());
// dao1.setNewmajor(mate.getNewmajor());
dao1.setProof(baseUrl.substring(0,baseUrl.length()-1) + mate.getProof());
dao1.setIdcard(baseUrl.substring(0,baseUrl.length()-1) + mate.getIdcard());
dao1.setMaterial(baseUrl.substring(0,baseUrl.length()-1) + mate.getMaterial());

52
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudentInfoCheck.java
View File

@@ -12,13 +12,19 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class SrsStudentInfoCheck { @TableField(exist = false)
public class SrsStudentInfoCheck {
@TableField(exist = false)
public String tNo;
@NotNull("银行卡")
public String xhk;
/** 主键 ID */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学号 */
@TableField("stu_no")
private String stuNo;
/** 生日 */
@NotNull("生日")
@@ -74,68 +80,56 @@ public class SrsStudentInfoCheck { @TableField(exist = false)
/**
* 户口所在地区县以下详细地址
*/
private String hkxxdz;
/**
* 学生居住地址
*/
private String xsjzdz;
/**
* 所属派出所
*/
private String sspcs;
/**
* 所属街道
*/
private String ssjd;
/**
* 乘火车区间
*/
private String chcqj;
/**
* 详细联系地址
*/
private String xxlxdz;
/**
* 邮政编码
*/
private String yzbm;
/**
* 现家庭地址
*/
private String xjtdz;
/**
* 家庭邮政编码
*/
private String jtyzbm;
/**
* 家庭电话
*/
private String jtdh;
/**
* 照片
*/
private String dailyPhoto;
/**
@@ -153,4 +147,34 @@ public class SrsStudentInfoCheck { @TableField(exist = false)
*/
private String bluePhoto;
/**
* 创建者
*/
private String createBy;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新者
*/
private String updateBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0 代表存在 1 代表删除）
*/
@TableField("del_flag")
private String delFlag;
}

16
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentInfoCheckMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.srs.comprehensive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsStudentInfoCheck;
import org.apache.ibatis.annotations.Mapper;
/**
* 学生信息核对 Mapper 接口
*
* @author srs
* @date 2024-03-27
*/
@Mapper
public interface SrsStudentInfoCheckMapper extends BaseMapper<SrsStudentInfoCheck> {
}

36
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentInfoCheckService.java Normal file
View File

@@ -0,0 +1,36 @@
package com.srs.comprehensive.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.srs.comprehensive.domain.SrsStudentInfoCheck;
import com.srs.common.core.domain.AjaxResult;
/**
* 学生信息核对 Service 接口
*
* @author srs
* @date 2024-03-27
*/
public interface ISrsStudentInfoCheckService extends IService<SrsStudentInfoCheck> {
/**
* 查询学生信息
* @param stuNo 学号
* @return 学生信息
*/
SrsStudentInfoCheck getStuInfo(String stuNo);
/**
* 修改学生信息
* @param srsStudentInfoCheck 学生信息
* @return 结果
*/
AjaxResult editStuInfo(SrsStudentInfoCheck srsStudentInfoCheck);
/**
* 查询学生信息列表
* @param srsStudentInfoCheck 学生信息
* @return 学生信息集合
*/
List<SrsStudentInfoCheck> selectSrsStudentInfoCheckList(SrsStudentInfoCheck srsStudentInfoCheck);
}

93
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentInfoCheckServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.srs.comprehensive.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.srs.common.core.domain.AjaxResult;
import com.srs.comprehensive.domain.SrsStudentInfoCheck;
import com.srs.comprehensive.mapper.SrsStudentInfoCheckMapper;
import com.srs.comprehensive.service.ISrsStudentInfoCheckService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* 学生信息核对 Service 业务层处理
*
* @author srs
* @date 2024-03-27
*/
@Service
public class SrsStudentInfoCheckServiceImpl extends ServiceImpl<SrsStudentInfoCheckMapper, SrsStudentInfoCheck>
implements ISrsStudentInfoCheckService {
/**
* 查询学生信息
* @param stuNo 学号
* @return 学生信息
*/
@Override
public SrsStudentInfoCheck getStuInfo(String stuNo) {
if (!StringUtils.hasText(stuNo)) {
return null;
}
LambdaQueryWrapper<SrsStudentInfoCheck> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SrsStudentInfoCheck::getStuNo, stuNo);
wrapper.eq(SrsStudentInfoCheck::getDelFlag, "0");
return this.getOne(wrapper);
}
/**
* 修改学生信息
* @param srsStudentInfoCheck 学生信息
* @return 结果
*/
@Override
public AjaxResult editStuInfo(SrsStudentInfoCheck srsStudentInfoCheck) {
try {
// 先查询是否存在
SrsStudentInfoCheck existing = getStuInfo(srsStudentInfoCheck.getStuNo());
if (existing != null) {
// 存在则更新
srsStudentInfoCheck.setId(existing.getId());
this.updateById(srsStudentInfoCheck);
} else {
// 不存在则插入
this.save(srsStudentInfoCheck);
}
return AjaxResult.success("修改成功");
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("修改失败：" + e.getMessage());
}
}
/**
* 查询学生信息列表
* @param srsStudentInfoCheck 学生信息
* @return 学生信息集合
*/
@Override
public List<SrsStudentInfoCheck> selectSrsStudentInfoCheckList(SrsStudentInfoCheck srsStudentInfoCheck) {
LambdaQueryWrapper<SrsStudentInfoCheck> wrapper = new LambdaQueryWrapper<>();
// 动态查询条件
if (StringUtils.hasText(srsStudentInfoCheck.getStuNo())) {
wrapper.eq(SrsStudentInfoCheck::getStuNo, srsStudentInfoCheck.getStuNo());
}
if (StringUtils.hasText(srsStudentInfoCheck.getMz())) {
wrapper.eq(SrsStudentInfoCheck::getMz, srsStudentInfoCheck.getMz());
}
if (StringUtils.hasText(srsStudentInfoCheck.getZzmm())) {
wrapper.eq(SrsStudentInfoCheck::getZzmm, srsStudentInfoCheck.getZzmm());
}
wrapper.eq(SrsStudentInfoCheck::getDelFlag, "0");
return this.list(wrapper);
}
}

42
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentInfoCheckMapper.xml Normal file
View File

@@ -0,0 +1,42 @@
<?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.srs.comprehensive.mapper.SrsStudentInfoCheckMapper">
<resultMap type="SrsStudentInfoCheck" id="SrsStudentInfoCheckResult">
<result property="id" column="id" />
<result property="stuNo" column="stu_no" />
<result property="birthday" column="birthday" />
<result property="idCard" column="id_card" />
<result property="phone" column="phone" />
<result property="mz" column="mz" />
<result property="zzmm" column="zzmm" />
<result property="hksz1" column="hksz1" />
<result property="hksz2" column="hksz2" />
<result property="hksz3" column="hksz3" />
<result property="hkszd" column="hkszd" />
<result property="hkxz" column="hkxz" />
<result property="hkxxdz" column="hkxxdz" />
<result property="xsjzdz" column="xsjzdz" />
<result property="sspcs" column="sspcs" />
<result property="ssjd" column="ssjd" />
<result property="chcqj" column="chcqj" />
<result property="xxlxdz" column="xxlxdz" />
<result property="yzbm" column="yzbm" />
<result property="xjtdz" column="xjtdz" />
<result property="jtyzbm" column="jtyzbm" />
<result property="jtdh" column="jtdh" />
<result property="dailyPhoto" column="daily_photo" />
<result property="whitePhoto" column="white_photo" />
<result property="redPhoto" column="red_photo" />
<result property="bluePhoto" column="blue_photo" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="delFlag" column="del_flag" />
</resultMap>
</mapper>

32
srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
View File

@@ -442,6 +442,38 @@ private static final long serialVersionUID=1L;
@Excel(name = "教务处电子签名")
private String jwcQmd;
/**
* 学院信息
*/
@ApiModelProperty("学院信息")
@TableField("college_info")
@Excel(name = "学院信息")
private String collegeInfo;
/**
* 年级信息
*/
@ApiModelProperty("年级信息")
@TableField("grade_info")
@Excel(name = "年级信息")
private String gradeInfo;
/**
* 专业信息
*/
@ApiModelProperty("专业信息")
@TableField("major_info")
@Excel(name = "专业信息")
private String majorInfo;
/**
* 班级信息
*/
@ApiModelProperty("班级信息")
@TableField("class_info")
@Excel(name = "班级信息")
private String classInfo;
/**
* 退伍复学-填报材料
*/

50
srs-routine/src/main/java/com/srs/routine/domain/SysDisMate.java
View File

@@ -13,7 +13,7 @@ import com.srs.common.core.domain.BaseEntity;
* 退伍复学材料对象 sys_dis_mate
*
* @author srs
* @date 2026-03-01
* @date 2026-04-01
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -168,5 +168,53 @@ private static final long serialVersionUID=1L;
@Excel(name = "保留字段")
private String finallabel;
/**
* 学院信息
*/
@ApiModelProperty("学院信息")
@TableField("college_info")
@Excel(name = "学院信息")
private String collegeInfo;
/**
* 年级信息
*/
@ApiModelProperty("年级信息")
@TableField("grade_info")
@Excel(name = "年级信息")
private String gradeInfo;
/**
* 班级信息
*/
@ApiModelProperty("班级信息")
@TableField("major_info")
@Excel(name = "班级信息")
private String majorInfo;
/**
* 班级信息
*/
@ApiModelProperty("班级信息")
@TableField("class_info")
@Excel(name = "班级信息")
private String classInfo;
/**
* $column.columnComment
*/
@ApiModelProperty("${column.columnComment}")
@TableField("test_data")
@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
private String testData;
/**
* $column.columnComment
*/
@ApiModelProperty("${column.columnComment}")
@TableField("test_save")
@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
private String testSave;
}

314
srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisBasicDao.java
View File

@@ -29,20 +29,6 @@ public class SysDisBasicDao{
@Excel(name = "序号",isSeq = true)
private Long seq;
// /**
// * 复学流程ID
// */
// @ApiModelProperty("复学流程ID")
// @Excel(name = "复学流程ID")
// private String fxId;
//
// /**
// * 流程申请时间
// */
// @ApiModelProperty("流程申请时间")
// @Excel(name = "流程申请时间")
// private String fxTime;
/**
* 学号
*/
@@ -57,17 +43,10 @@ public class SysDisBasicDao{
@Excel(name = "姓名")
private String stName;
@ApiModelProperty("学院")
@Excel(name = "学院")
private String college;
/**
* 辅导员名字
*/
// @ApiModelProperty("辅导员名字")
// @Excel(name = "辅导员名字")
// private String fdName;
//
// @ApiModelProperty("学院")
// @Excel(name = "学院")
// private String college;
/**
* 性别
@@ -84,60 +63,25 @@ public class SysDisBasicDao{
private String nations;
// /**
// * $column.columnComment
// * 班级
// */
// @ApiModelProperty("${column.columnComment}")
// @Excel(name = "辅导员签名" , readConverterExp = "$column.readConverterExp()")
// private String fdQm;
//
// @ApiModelProperty("班级")
// @Excel(name = "班级")
// private String stClass;
// /**
// * $column.columnComment
// * 专业
// */
// @ApiModelProperty("${column.columnComment}")
// @Excel(name = "学务签名" , readConverterExp = "$column.readConverterExp()")
// private String xwQm;
//
// /**
// * $column.columnComment
// */
// @ApiModelProperty("${column.columnComment}")
// @Excel(name = "二级学院签名" , readConverterExp = "$column.readConverterExp()")
// private String erQm;
//
// /**
// * $column.columnComment
// */
// @ApiModelProperty("${column.columnComment}")
// @Excel(name = "学籍管理签名" , readConverterExp = "$column.readConverterExp()")
// private String xjQm;
//
// /**
// * $column.columnComment
// */
// @ApiModelProperty("${column.columnComment}")
// @Excel(name = "教务签名" , readConverterExp = "$column.readConverterExp()")
// private String jwQm;
// @ApiModelProperty("专业")
// @Excel(name = "专业")
// private String majors;
/**
* 班级
*/
@ApiModelProperty("班级")
@Excel(name = "班级")
private String stClass;
/**
* 专业
*/
@ApiModelProperty("专业")
@Excel(name = "专业")
private String majors;
/**
* 年级
*/
@ApiModelProperty("年级")
@Excel(name = "年级")
private String grade;
// * 年级
// */
// @ApiModelProperty("年级")
// @Excel(name = "年级")
// private String grade;
/**
* 学院
@@ -151,181 +95,6 @@ public class SysDisBasicDao{
@Excel(name = "原因")
private String reasons;
// /**
// * 辅导员意见
// */
// @ApiModelProperty("辅导员意见")
// @TableField("fd_idea")
// @Excel(name = "辅导员意见")
// private String fdIdea;
//
// /**
// * 二级学院意见
// */
// @ApiModelProperty("二级学院意见")
// @TableField("two_idea")
// @Excel(name = "二级学院意见")
// private String twoIdea;
//
// /**
// * 学务意见
// */
// @ApiModelProperty("学务意见")
// @TableField("xw_idea")
// @Excel(name = "学务意见")
// private String xwIdea;
//
// /**
// * 学籍管理意见
// */
// @ApiModelProperty("学籍管理意见")
// @TableField("xj_idea")
// @Excel(name = "学籍管理意见")
// private String xjIdea;
//
// /**
// * 教务处意见
// */
// @ApiModelProperty("教务处意见")
// @TableField("jw_idea")
// @Excel(name = "教务处意见")
// private String jwIdea;
//
// /**
// * 招生意见
// */
// @ApiModelProperty("招生意见")
// @TableField("zs_idea")
// @Excel(name = "招生意见")
// private String zsIdea;
//
// /**
// * 招生就业
// */
// @ApiModelProperty("招生就业")
// @TableField("zs_status")
// @Excel(name = "招生就业")
// private String zsStatus;
//
// /**
// * 时间
// */
// @ApiModelProperty("时间")
// @TableField("times")
// @Excel(name = "时间")
// private String times;
//
// /**
// * 辅导员审核状态
// */
// @ApiModelProperty("辅导员审核状态")
// @TableField("fd_status")
// @Excel(name = "辅导员审核状态")
// private String fdStatus;
//
// /**
// *
// */
// @ApiModelProperty("")
// @TableField("xw_status")
// @Excel(name = "学务审核状态")
// private String xwStatus;
//
// /**
// * 二级学院审核状态
// */
// @ApiModelProperty("二级学院审核状态")
// @TableField("two_status")
// @Excel(name = "二级学院审核状态")
// private String twoStatus;
//
// /**
// * 学籍管理审核状态
// */
// @ApiModelProperty("学籍管理审核状态")
// @TableField("xjgl_status")
// @Excel(name = "学籍管理审核状态")
// private String xjglStatus;
//
// /**
// * 教务审核状态
// */
// @ApiModelProperty("教务审核状态")
// @TableField("jw_status")
// @Excel(name = "教务审核状态")
// private String jwStatus;
//
// /**
// * 退伍审核时间
// */
// @ApiModelProperty("退伍审核时间")
// @TableField("rw_time")
// @Excel(name = "退伍审核时间")
// private String rwTime;
//
// /**
// * 招生审核时间
// */
// @ApiModelProperty("招生审核时间")
// @TableField("zs_time")
// @Excel(name = "招生审核时间")
// private String zsTime;
//
// /**
// * 辅导员
// */
// @ApiModelProperty("辅导员")
// @TableField("fd_time")
// @Excel(name = "辅导员")
// private String fdTime;
//
// /**
// * 学务审核
// */
// @ApiModelProperty("学务审核")
// @TableField("xw_time")
// @Excel(name = "学务审核")
// private String xwTime;
//
// /**
// * 二时间
// */
// @ApiModelProperty("二时间")
// @TableField("two_time")
// @Excel(name = "二时间")
// private String twoTime;
//
// /**
// * 学籍时间
// */
// @ApiModelProperty("学籍时间")
// @TableField("xj_time")
// @Excel(name = "学籍时间")
// private String xjTime;
//
// /**
// * 教务审核时间
// */
// @ApiModelProperty("教务审核时间")
// @TableField("jw_time")
// @Excel(name = "教务审核时间")
// private String jwTime;
//
// /**
// * 空余字段
// */
// @ApiModelProperty("空余字段")
// @TableField("datab")
// @Excel(name = "空余字段")
// private String datab;
//
// /**
// *
// */
// @ApiModelProperty("")
// @TableField("dataa")
// @Excel(name = "")
// private String dataa;
/**
* 专业转换
@@ -334,28 +103,35 @@ public class SysDisBasicDao{
@Excel(name = "专业转换")
private String conversion;
// /**
// * 流程实例ID
// */
// @ApiModelProperty("流程实例ID")
// @TableField("process_id")
// @Excel(name = "流程实例ID")
// private String processId;
@ApiModelProperty("学院信息")
@TableField("college_info")
@Excel(name = "新学院信息")
private String collegeInfo;
// /**
// * 流程部署编号
// */
// @ApiModelProperty("流程部署编号")
// @TableField("deploy_id")
// @Excel(name = "流程部署编号")
// private String deployId;
/**
* 年级信息
*/
@ApiModelProperty("年级信息")
@TableField("grade_info")
@Excel(name = "新年级信息")
private String gradeInfo;
/**
* 专业信息
*/
@ApiModelProperty("专业信息")
@TableField("major_info")
@Excel(name = "新专业信息")
private String majorInfo;
/**
* 班级信息
*/
@ApiModelProperty("班级信息")
@TableField("class_info")
@Excel(name = "新班级信息")
private String classInfo;
// /**
// * 退伍复学-填报材料
// */
// @ApiModelProperty(value = "退伍复学-填报材料", hidden = true)
// @Excel(name = "退伍复学-填报材料")
// private List<SysDisMate> MaList;
}

123
srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisMateDao.java
View File

@@ -24,13 +24,15 @@ public class SysDisMateDao {
/**
*
*/
@Excel(name = "序号",isSeq = true)
private Long seq;
@ApiModelProperty("")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 学号
*/
@ApiModelProperty("学号")
@TableField("st_id")
@Excel(name = "学号")
private String stId;
@@ -38,28 +40,23 @@ public class SysDisMateDao {
* 姓名
*/
@ApiModelProperty("姓名")
@TableField("st_name")
@Excel(name = "姓名")
private String stName;
@ApiModelProperty("学院")
@Excel(name = "学院")
private String college;
/**
* 时间
*/
// @ApiModelProperty("时间")
// @Excel(name = "时间")
// private String times;
/**
* 学院
*/
@ApiModelProperty("原学院")
@TableField("college")
@Excel(name = "原学院")
private String college;
/**
* 原年级
*/
@ApiModelProperty("原年级")
@TableField("oldgrade")
@Excel(name = "原年级")
private String oldgrade;
@@ -67,13 +64,31 @@ public class SysDisMateDao {
* 原专业
*/
@ApiModelProperty("原专业")
@TableField("oldmajor")
@Excel(name = "原专业")
private String oldmajor;
//
// /**
// * 新年级
// */
// @ApiModelProperty("新年级")
// @TableField("newgrade")
// @Excel(name = "新年级")
// private String newgrade;
//
// /**
// * 新班级
// */
// @ApiModelProperty("新班级")
// @TableField("newmajor")
// @Excel(name = "新班级")
// private String newmajor;
/**
* 退役证明
*/
@ApiModelProperty("退役证明")
@TableField("proof")
@Excel(name = "退役证明")
private String proof;
@@ -81,6 +96,7 @@ public class SysDisMateDao {
* 身份证
*/
@ApiModelProperty("身份证")
@TableField("idcard")
@Excel(name = "身份证")
private String idcard;
@@ -88,9 +104,90 @@ public class SysDisMateDao {
* 材料
*/
@ApiModelProperty("材料")
@TableField("material")
@Excel(name = "材料")
private String material;
// /**
// * 最终专业1
// */
// @ApiModelProperty("最终专业1")
// @TableField("finaldata1")
// @Excel(name = "最终专业1")
// private String finaldata1;
//
// /**
// * 最终专业1
// */
// @ApiModelProperty("最终专业1")
// @TableField("finaldata2")
// @Excel(name = "最终专业1")
// private String finaldata2;
//
// /**
// * 最终年级
// */
// @ApiModelProperty("最终年级")
// @TableField("finalmajor")
// @Excel(name = "最终年级")
// private String finalmajor;
//
// /**
// * 保留字段
// */
// @ApiModelProperty("保留字段")
// @TableField("finallabel")
// @Excel(name = "保留字段")
// private String finallabel;
// /**
// * 学院信息
// */
// @ApiModelProperty("学院信息")
// @TableField("college_info")
// @Excel(name = "学院信息")
// private String collegeInfo;
//
// /**
// * 年级信息
// */
// @ApiModelProperty("年级信息")
// @TableField("grade_info")
// @Excel(name = "年级信息")
// private String gradeInfo;
//
// /**
// * 班级信息
// */
// @ApiModelProperty("班级信息")
// @TableField("major_info")
// @Excel(name = "班级信息")
// private String majorInfo;
//
// /**
// * 班级信息
// */
// @ApiModelProperty("班级信息")
// @TableField("class_info")
// @Excel(name = "班级信息")
// private String classInfo;
// /**
// * $column.columnComment
// */
// @ApiModelProperty("${column.columnComment}")
// @TableField("test_data")
// @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
// private String testData;
//
// /**
// * $column.columnComment
// */
// @ApiModelProperty("${column.columnComment}")
// @TableField("test_save")
// @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
// private String testSave;

18
srs-routine/src/main/java/com/srs/routine/service/impl/SysDisBasicServiceImpl.java
View File

@@ -162,7 +162,14 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
.set(mate.getFinaldata1() != null, SysDisMate::getFinaldata1, mate.getFinaldata1())
.set(mate.getFinaldata2() != null, SysDisMate::getFinaldata2, mate.getFinaldata2())
.set(mate.getFinalmajor() != null, SysDisMate::getFinalmajor, mate.getFinalmajor())
.set(mate.getFinallabel() != null, SysDisMate::getFinallabel, mate.getFinallabel());
.set(mate.getFinallabel() != null, SysDisMate::getFinallabel, mate.getFinallabel())
// 新增表字段位置
.set(mate.getCollegeInfo() != null, SysDisMate::getCollegeInfo, mate.getCollegeInfo())
.set(mate.getGradeInfo() != null, SysDisMate::getGradeInfo, mate.getGradeInfo())
.set(mate.getMajorInfo() != null, SysDisMate::getMajorInfo, mate.getMajorInfo())
.set(mate.getClassInfo() != null, SysDisMate::getClassInfo, mate.getClassInfo())
.set(mate.getTestData() != null, SysDisMate::getTestData, mate.getTestData())
.set(mate.getTestSave() != null, SysDisMate::getTestSave, mate.getTestSave());
updateResult = sysDisMateMapper.update(null, updateWrapper);
logger.info("通过子表ID自定义更新，影响行数: {}", updateResult);
@@ -180,7 +187,14 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
.set(mate.getFinaldata1() != null, SysDisMate::getFinaldata1, mate.getFinaldata1())
.set(mate.getFinaldata2() != null, SysDisMate::getFinaldata2, mate.getFinaldata2())
.set(mate.getFinalmajor() != null, SysDisMate::getFinalmajor, mate.getFinalmajor())
.set(mate.getFinallabel() != null, SysDisMate::getFinallabel, mate.getFinallabel());
.set(mate.getFinallabel() != null, SysDisMate::getFinallabel, mate.getFinallabel())
// 新增子表字段
.set(mate.getCollegeInfo() != null, SysDisMate::getCollegeInfo, mate.getCollegeInfo())
.set(mate.getGradeInfo() != null, SysDisMate::getGradeInfo, mate.getGradeInfo())
.set(mate.getMajorInfo() != null, SysDisMate::getMajorInfo, mate.getMajorInfo())
.set(mate.getClassInfo() != null, SysDisMate::getClassInfo, mate.getClassInfo())
.set(mate.getTestData() != null, SysDisMate::getTestData, mate.getTestData())
.set(mate.getTestSave() != null, SysDisMate::getTestSave, mate.getTestSave());
updateResult = sysDisMateMapper.update(null, updateWrapper);
logger.info("通过st_id自定义更新，影响行数: {}", updateResult);

115
srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
View File

@@ -57,100 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="rjQmd" column="rj_qmd" />
<result property="xjQmd" column="xj_qmd" />
<result property="jwcQmd" column="jwc_qmd" />
<result property="collegeInfo" column="college_info" />
<result property="gradeInfo" column="grade_info" />
<result property="majorInfo" column="major_info" />
<result property="classInfo" column="class_info" />
<!--填报退伍材料-->
<collection property="MaList" column="{stId = st_id}" javaType="java.util.ArrayList" select="selectMateById"/>
<!--学生表-->
<collection property="StuList" column="{stuNo = st_id}" javaType="java.util.ArrayList" select="selectSrsStudentByStuNo"/>
</resultMap>
<!-- 学生表关联-->
<resultMap type="SrsStudent" id="SrsStudentResult">
<result property="stuId" column="stu_id"/>
<result property="name" column="name"/>
<result property="stuNo" column="stu_no"/>
<result property="gender" column="gender"/>
<result property="birthday" column="birthday"/>
<result property="idCard" column="id_card"/>
<result property="deptId" column="dept_id"/>
<result property="majorId" column="major_id"/>
<result property="classId" column="class_id"/>
<result property="phone" column="phone"/>
<result property="address" column="address"/>
<result property="status" column="status"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="xhk" column="xhk"/>
<result property="bankAddr" column="bank_addr"/>
<result property="teacherId" column="teacher_id"/>
<result property="cphName" column="cphName"/>
<result property="gradeName" column="grade_name"/>
<result property="status2" column="status2"/>
<result property="deptName" column="dept_name" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<association property="srsMajors" column="major_id" javaType="srsMajors" resultMap="SrsMajorsResult"/>
<association property="srsClass" column="class_id" javaType="srsClass" resultMap="SrsClassResult"/>
<association property="cphTeacher" column="teacher_id" javaType="cphTeacher" resultMap="CphTeacherResult"/>
<association property="cphStuExtraInfo" column="stu_no" javaType="cphStuExtraInfo"
resultMap="CphStuExtraInfoResult"/>
</resultMap>
<!-- 学生表关联表-->
<resultMap id="CphStuExtraInfoResult" type="CphStuExtraInfo">
<result property="stuNo" column="stu_no"/>
<result property="mz" column="mz"/>
<result property="zzmm" column="zzmm"/>
<result property="jg" column="jg"/>
<result property="xx" column="xx"/>
</resultMap>
<resultMap id="CphTeacherResult" type="CphTeacher">
<result property="teacherId" column="teacher_id"/>
<result property="name" column="name"/>
</resultMap>
<resultMap type="SrsGrade" id="SrsGradeResult">
<result property="gradeId" column="grade_id"/>
<result property="gradeName" column="grade_name"/>
</resultMap>
<resultMap type="SrsClass" id="SrsClassResult">
<result property="classId" column="class_id"/>
<result property="majorId" column="major_id"/>
<result property="className" column="class_name"/>
</resultMap>
<resultMap type="SrsMajors" id="SrsMajorsResult">
<result property="majorId" column="major_id"/>
<result property="majorName" column="major_name"/>
<result property="collegeId" column="college_id"/>
<result property="majorDescription" column="major_description"/>
</resultMap>
<resultMap id="deptResult" type="SysDept">
<id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id"/>
<result property="deptName" column="dept_name"/>
<result property="ancestors" column="ancestors"/>
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
</resultMap>
<resultMap id="studentName" type="CascaderEntity">
<id property="value" column="stu_id"/>
<result property="label" column="name"/>
</resultMap>
<!-- 学生表通过学号关联-->
<select id="selectSrsStudentByStuNo" resultMap="SrsStudentResult">
select *
from srs_student
<where>
<if test="stuNo != null and stuNo != ''">
and stu_no = #{stuNo}
</if>
</where>
</select>
<!-- 联表 材料上传-->
<resultMap type="SysDisMate" id="SysDisMateResult">
@@ -185,9 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<!--查询是否插入过记录-->
<select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
<include refid="selectSysDisBasicVo"/>
@@ -228,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectSysDisBasicVo">
select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id, student_id, test_data, test_test, zs_qmd, fd_qmd, xw_qmd, rj_qmd, xj_qmd, jwc_qmd from sys_dis_basic
select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id, student_id, test_data, test_test, zs_qmd, fd_qmd, xw_qmd, rj_qmd, xj_qmd, jwc_qmd, college_info, grade_info, major_info, class_info from sys_dis_basic
</sql>
<select id="selectSysDisBasicList" parameterType="SysDisBasic" resultMap="SysDisBasicResult">
@@ -285,6 +196,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="rjQmd != null and rjQmd != ''"> and rj_qmd = #{rjQmd}</if>
<if test="xjQmd != null and xjQmd != ''"> and xj_qmd = #{xjQmd}</if>
<if test="jwcQmd != null and jwcQmd != ''"> and jwc_qmd = #{jwcQmd}</if>
<if test="collegeInfo != null and collegeInfo != ''"> and college_info = #{collegeInfo}</if>
<if test="gradeInfo != null and gradeInfo != ''"> and grade_info = #{gradeInfo}</if>
<if test="majorInfo != null and majorInfo != ''"> and major_info = #{majorInfo}</if>
<if test="classInfo != null and classInfo != ''"> and class_info = #{classInfo}</if>
</where>
</select>
@@ -347,6 +262,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="rjQmd != null">rj_qmd,</if>
<if test="xjQmd != null">xj_qmd,</if>
<if test="jwcQmd != null">jwc_qmd,</if>
<if test="collegeInfo != null">college_info,</if>
<if test="gradeInfo != null">grade_info,</if>
<if test="majorInfo != null">major_info,</if>
<if test="classInfo != null">class_info,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fxId != null">#{fxId},</if>
@@ -400,6 +319,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="rjQmd != null">#{rjQmd},</if>
<if test="xjQmd != null">#{xjQmd},</if>
<if test="jwcQmd != null">#{jwcQmd},</if>
<if test="collegeInfo != null">#{collegeInfo},</if>
<if test="gradeInfo != null">#{gradeInfo},</if>
<if test="majorInfo != null">#{majorInfo},</if>
<if test="classInfo != null">#{classInfo},</if>
</trim>
</insert>
@@ -457,6 +380,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="rjQmd != null">rj_qmd = #{rjQmd},</if>
<if test="xjQmd != null">xj_qmd = #{xjQmd},</if>
<if test="jwcQmd != null">jwc_qmd = #{jwcQmd},</if>
<if test="collegeInfo != null">college_info = #{collegeInfo},</if>
<if test="gradeInfo != null">grade_info = #{gradeInfo},</if>
<if test="majorInfo != null">major_info = #{majorInfo},</if>
<if test="classInfo != null">class_info = #{classInfo},</if>
</trim>
where id = #{id}
</update>

53
srs-routine/src/main/resources/mapper/routine/SysDisMateMapper.xml
View File

@@ -1,9 +1,9 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.routine.mapper.SysDisMateMapper">
<resultMap type="SysDisMate" id="SysDisMateResult">
<result property="id" column="id" />
<result property="stId" column="st_id" />
@@ -23,15 +23,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="finaldata2" column="finaldata2" />
<result property="finalmajor" column="finalmajor" />
<result property="finallabel" column="finallabel" />
<result property="collegeInfo" column="college_info" />
<result property="gradeInfo" column="grade_info" />
<result property="majorInfo" column="major_info" />
<result property="classInfo" column="class_info" />
<result property="testData" column="test_data" />
<result property="testSave" column="test_save" />
</resultMap>
<sql id="selectSysDisMateVo">
select id, st_id, st_name, times, college, oldgrade, oldmajor, newgrade, newmajor, proof, idcard, material, data1, data2, finaldata1, finaldata2, finalmajor, finallabel from sys_dis_mate
select id, st_id, st_name, times, college, oldgrade, oldmajor, newgrade, newmajor, proof, idcard, material, data1, data2, finaldata1, finaldata2, finalmajor, finallabel, college_info, grade_info, major_info, class_info, test_data, test_save from sys_dis_mate
</sql>
<select id="selectSysDisMateList" parameterType="SysDisMate" resultMap="SysDisMateResult">
<include refid="selectSysDisMateVo"/>
<where>
<where>
<if test="stId != null and stId != ''"> and st_id = #{stId}</if>
<if test="stName != null and stName != ''"> and st_name like concat('%', #{stName}, '%')</if>
<if test="times != null and times != ''"> and times = #{times}</if>
@@ -49,6 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="finaldata2 != null and finaldata2 != ''"> and finaldata2 = #{finaldata2}</if>
<if test="finalmajor != null and finalmajor != ''"> and finalmajor = #{finalmajor}</if>
<if test="finallabel != null and finallabel != ''"> and finallabel = #{finallabel}</if>
<if test="collegeInfo != null and collegeInfo != ''"> and college_info = #{collegeInfo}</if>
<if test="gradeInfo != null and gradeInfo != ''"> and grade_info = #{gradeInfo}</if>
<if test="majorInfo != null and majorInfo != ''"> and major_info = #{majorInfo}</if>
<if test="classInfo != null and classInfo != ''"> and class_info = #{classInfo}</if>
<if test="testData != null and testData != ''"> and test_data = #{testData}</if>
<if test="testSave != null and testSave != ''"> and test_save = #{testSave}</if>
</where>
</select>
@@ -77,7 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="finaldata2 != null">finaldata2,</if>
<if test="finalmajor != null">finalmajor,</if>
<if test="finallabel != null">finallabel,</if>
</trim>
<if test="collegeInfo != null">college_info,</if>
<if test="gradeInfo != null">grade_info,</if>
<if test="majorInfo != null">major_info,</if>
<if test="classInfo != null">class_info,</if>
<if test="testData != null">test_data,</if>
<if test="testSave != null">test_save,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stId != null">#{stId},</if>
<if test="stName != null">#{stName},</if>
@@ -96,7 +114,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="finaldata2 != null">#{finaldata2},</if>
<if test="finalmajor != null">#{finalmajor},</if>
<if test="finallabel != null">#{finallabel},</if>
</trim>
<if test="collegeInfo != null">#{collegeInfo},</if>
<if test="gradeInfo != null">#{gradeInfo},</if>
<if test="majorInfo != null">#{majorInfo},</if>
<if test="classInfo != null">#{classInfo},</if>
<if test="testData != null">#{testData},</if>
<if test="testSave != null">#{testSave},</if>
</trim>
</insert>
<update id="updateSysDisMate" parameterType="SysDisMate">
@@ -119,6 +143,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="finaldata2 != null">finaldata2 = #{finaldata2},</if>
<if test="finalmajor != null">finalmajor = #{finalmajor},</if>
<if test="finallabel != null">finallabel = #{finallabel},</if>
<if test="collegeInfo != null">college_info = #{collegeInfo},</if>
<if test="gradeInfo != null">grade_info = #{gradeInfo},</if>
<if test="majorInfo != null">major_info = #{majorInfo},</if>
<if test="classInfo != null">class_info = #{classInfo},</if>
<if test="testData != null">test_data = #{testData},</if>
<if test="testSave != null">test_save = #{testSave},</if>
</trim>
where id = #{id}
</update>
@@ -144,16 +174,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="finaldata2 != null">finaldata2 = #{finaldata2},</if>
<if test="finalmajor != null">finalmajor = #{finalmajor},</if>
<if test="finallabel != null">finallabel = #{finallabel},</if>
<if test="collegeInfo != null">college_info = #{collegeInfo},</if>
<if test="gradeInfo != null">grade_info = #{gradeInfo},</if>
<if test="majorInfo != null">major_info = #{majorInfo},</if>
<if test="classInfo != null">class_info = #{classInfo},</if>
<if test="testData != null">test_data = #{testData},</if>
<if test="testSave != null">test_save = #{testSave},</if>
</trim>
where st_id = #{stId}
</update>
<delete id="deleteSysDisMateById" parameterType="Long">
delete from sys_dis_mate where id = #{id}
</delete>
<delete id="deleteSysDisMateByIds" parameterType="String">
delete from sys_dis_mate where id in
delete from sys_dis_mate where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>