diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java new file mode 100644 index 0000000..a04e9bc --- /dev/null +++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java @@ -0,0 +1,368 @@ +package com.srs.dormitory.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.srs.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import com.srs.common.core.domain.BaseEntity; + + + +/** + * 外宿申请对象 dms_accommodations + * + * @author srs + * @date 2025-11-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel(value = "DmsAccommodations对象" , description = "外宿申请表") +@TableName("dms_accommodations") +public class DmsAccommodations extends BaseEntity{ +private static final long serialVersionUID=1L; + + /** + * # + */ + @ApiModelProperty("#") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 学号 + */ + @ApiModelProperty("学号") + @TableField("stu_no") + @Excel(name = "学号") + private String stuNo; + + /** + * 姓名 + */ + @ApiModelProperty("姓名") + @TableField("stu_name") + @Excel(name = "姓名") + private String stuName; + + /** + * 出生日期 + */ + @ApiModelProperty("出生日期") + @TableField("birthday") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date birthday; + + /** + * 性别 + */ + @ApiModelProperty("性别") + @TableField("gender") + @Excel(name = "性别") + private String gender; + + /** + * 班级 + */ + @ApiModelProperty("班级") + @TableField("class_name") + @Excel(name = "班级") + private String className; + + /** + * 联系电话 + */ + @ApiModelProperty("联系电话") + @TableField("stu_phone") + @Excel(name = "联系电话") + private String stuPhone; + + /** + * 身份证号 + */ + @ApiModelProperty("身份证号") + @TableField("sfzh") + @Excel(name = "身份证号") + private String sfzh; + + /** + * 学院 + */ + @ApiModelProperty("学院") + @TableField("dept_name") + @Excel(name = "学院") + private String deptName; + + /** + * 专业 + */ + @ApiModelProperty("专业") + @TableField("major_name") + @Excel(name = "专业") + private String majorName; + + /** + * 年级 + */ + @ApiModelProperty("年级") + @TableField("grade_name") + @Excel(name = "年级") + private String gradeName; + + /** + * 房间号 + */ + @ApiModelProperty("房间号") + @TableField("room_no") + @Excel(name = "房间号") + private String roomNo; + + /** + * 宿舍缴费情况 + */ + @ApiModelProperty("宿舍缴费情况") + @TableField("isCharge") + @Excel(name = "宿舍缴费情况") + private Long isCharge; + + /** + * 外宿原因 + */ + @ApiModelProperty("外宿原因") + @TableField("sleep_out_remark") + @Excel(name = "外宿原因") + private String sleepOutRemark; + + /** + * 外宿地址 + */ + @ApiModelProperty("外宿地址") + @TableField("address") + @Excel(name = "外宿地址") + private String address; + + /** + * 紧急联系人 + */ + @ApiModelProperty("紧急联系人") + @TableField("emergency_contact") + @Excel(name = "紧急联系人") + private String emergencyContact; + + /** + * 家长意见 + */ + @ApiModelProperty("家长意见") + @TableField("parent_comment") + @Excel(name = "家长意见") + private String parentComment; + + /** + * 家长联系电话 + */ + @ApiModelProperty("家长联系电话") + @TableField("parent_tel") + @Excel(name = "家长联系电话") + private String parentTel; + + /** + * 家长联系地址 + */ + @ApiModelProperty("家长联系地址") + @TableField("parent_address") + @Excel(name = "家长联系地址") + private String parentAddress; + + /** + * 状态（0：保存；1：待审核；2：已审核) + */ + @ApiModelProperty("状态（0：保存；1：待审核；2：已审核)") + @TableField("reviewer_status") + @Excel(name = "状态" , readConverterExp = "状态（0：保存；1：待审核；2：已审核)") + private Long reviewerStatus; + + /** + * 申请人签名 + */ + @ApiModelProperty("申请人签名") + @TableField("apply_sign") + @Excel(name = "申请人签名") + private String applySign; + + /** + * 申请日期 + */ + @ApiModelProperty("申请日期") + @TableField("apply_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "申请日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date applyDate; + + /** + * 申请人签名 + */ + @ApiModelProperty("申请人签名") + @TableField("apply_sign") + @Excel(name = "申请人签名") + private String applySign2; + + /** + * 申请日期 + */ + @ApiModelProperty("申请日期") + @TableField("apply_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "申请日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date applyDate2; + + /** + * 辅导员意见 + */ + @ApiModelProperty("辅导员意见") + @TableField("fdy_cmt") + @Excel(name = "辅导员意见") + private String fdyCmt; + + /** + * 辅导员签名 + */ + @ApiModelProperty("辅导员签名") + @TableField("fdy_sign") + @Excel(name = "辅导员签名") + private String fdySign; + + /** + * 辅导员审核日期 + */ + @ApiModelProperty("辅导员审核日期") + @TableField("fdy_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "辅导员审核日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date fdyDate; + + /** + * 辅导员工号 + */ + @ApiModelProperty("辅导员工号") + @TableField("fdy_no") + @Excel(name = "辅导员工号") + private String fdyNo; + + /** + * 二级学院审核意见 + */ + @ApiModelProperty("二级学院审核意见") + @TableField("dept_cmt") + @Excel(name = "二级学院审核意见") + private String deptCmt; + + /** + * 二级学院签名（公章） + */ + @ApiModelProperty("二级学院签名（公章）") + @TableField("dept_sign") + @Excel(name = "二级学院签名" , readConverterExp = "公=章") + private String deptSign; + + /** + * 二级学院审核日期 + */ + @ApiModelProperty("二级学院审核日期") + @TableField("dept_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "二级学院审核日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date deptDate; + + /** + * 二级学院审核工号 + */ + @ApiModelProperty("二级学院审核工号") + @TableField("dept_no") + @Excel(name = "二级学院审核工号") + private String deptNo; + + /** + * 学工意见 + */ + @ApiModelProperty("学工意见") + @TableField("xg_cmt") + @Excel(name = "学工意见") + private String xgCmt; + + /** + * 学工签名 + */ + @ApiModelProperty("学工签名") + @TableField("xg_sign") + @Excel(name = "学工签名") + private String xgSign; + + /** + * 学工审核日期 + */ + @ApiModelProperty("学工审核日期") + @TableField("xg_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "学工审核日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date xgDate; + + /** + * 学工审核工号 + */ + @ApiModelProperty("学工审核工号") + @TableField("xg_no") + @Excel(name = "学工审核工号") + private String xgNo; + + /** + * 校领导意见 + */ + @ApiModelProperty("校领导意见") + @TableField("leader_cmt") + @Excel(name = "校领导意见") + private String leaderCmt; + + /** + * 校领导 + */ + @ApiModelProperty("校领导") + @TableField("leader_sign") + @Excel(name = "校领导") + private String leaderSign; + + /** + * 校领导审核日期 + */ + @ApiModelProperty("校领导审核日期") + @TableField("leader_date") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "校领导审核日期" , width = 30, dateFormat = "yyyy-MM-dd") + private Date leaderDate; + + /** + * 校领导审核工号 + */ + @ApiModelProperty("校领导审核工号") + @TableField("leader_no") + @Excel(name = "校领导审核工号") + private String leaderNo; + + @ApiModelProperty("园区") + @TableField(exist = false) + private String Name; + + @ApiModelProperty("签名") + @TableField(exist = false) + private String signature; + + @ApiModelProperty("学年") + @TableField("stu_year_name") + @Excel(name = "学年") + private String stuYearName; +} diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java new file mode 100644 index 0000000..8c97882 --- /dev/null +++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java @@ -0,0 +1,64 @@ +package com.srs.dormitory.mapper; + +import java.util.List; + +import com.srs.dormitory.domain.DmsAccommodations; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 外宿申请Mapper接口 + * + * @author srs + * @date 2025-11-11 + */ +public interface DmsAccommodationsMapper extends BaseMapper { + /** + * 查询外宿申请 + * + * @param id 外宿申请主键 + * @return 外宿申请 + */ + public DmsAccommodations selectDmsAccommodationsById(Long id); + + /** + * 查询外宿申请列表 + * + * @param dmsAccommodations 外宿申请 + * @return 外宿申请集合 + */ + List selectDmsAccommodationsList(DmsAccommodations dmsAccommodations); + + /** + * 新增外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + int insertDmsAccommodations(DmsAccommodations dmsAccommodations); + + /** + * 修改外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + int updateDmsAccommodations(DmsAccommodations dmsAccommodations); + + /** + * 删除外宿申请 + * + * @param id 外宿申请主键 + * @return 结果 + */ + int deleteDmsAccommodationsById(Long id); + + /** + * 批量删除外宿申请 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteDmsAccommodationsByIds(Long[] ids); + + DmsAccommodations getStuDormitory(String stuNo); +} diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java new file mode 100644 index 0000000..3ce54a5 --- /dev/null +++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java @@ -0,0 +1,64 @@ +package com.srs.dormitory.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.srs.dormitory.domain.DmsAccommodations; + +/** + * 外宿申请Service接口 + * + * @author srs + * @date 2025-11-11 + */ +public interface IDmsAccommodationsService extends IService { + /** + * 查询外宿申请 + * + * @param id 外宿申请主键 + * @return 外宿申请 + */ + public DmsAccommodations selectDmsAccommodationsById(Long id); + + /** + * 查询外宿申请列表 + * + * @param dmsAccommodations 外宿申请 + * @return 外宿申请集合 + */ + List selectDmsAccommodationsList(DmsAccommodations dmsAccommodations); + + /** + * 新增外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + int insertDmsAccommodations(DmsAccommodations dmsAccommodations); + + /** + * 修改外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + int updateDmsAccommodations(DmsAccommodations dmsAccommodations); + + /** + * 批量删除外宿申请 + * + * @param ids 需要删除的外宿申请主键集合 + * @return 结果 + */ + int deleteDmsAccommodationsByIds(Long[] ids); + + /** + * 删除外宿申请信息 + * + * @param id 外宿申请主键 + * @return 结果 + */ + int deleteDmsAccommodationsById(Long id); + + DmsAccommodations getStuDormitory(String stuNo); +} diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java new file mode 100644 index 0000000..48038dd --- /dev/null +++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java @@ -0,0 +1,96 @@ +package com.srs.dormitory.service.impl; + +import java.util.List; + +import com.srs.common.utils.DateUtils; +import com.srs.dormitory.domain.DmsAccommodations; +import com.srs.dormitory.mapper.DmsAccommodationsMapper; +import com.srs.dormitory.service.IDmsAccommodationsService; +import org.springframework.beans.factory.annotation.Autowired; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 外宿申请Service业务层处理 + * + * @author srs + * @date 2025-11-11 + */ +@Service +public class DmsAccommodationsServiceImpl extends ServiceImpl implements IDmsAccommodationsService { + @Autowired + private DmsAccommodationsMapper dmsAccommodationsMapper; + + /** + * 查询外宿申请 + * + * @param id 外宿申请主键 + * @return 外宿申请 + */ + @Override + public DmsAccommodations selectDmsAccommodationsById(Long id) { + return dmsAccommodationsMapper.selectDmsAccommodationsById(id); + } + + /** + * 查询外宿申请列表 + * + * @param dmsAccommodations 外宿申请 + * @return 外宿申请 + */ + @Override + public List selectDmsAccommodationsList(DmsAccommodations dmsAccommodations) { + return dmsAccommodationsMapper.selectDmsAccommodationsList(dmsAccommodations); + } + + /** + * 新增外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + @Override + public int insertDmsAccommodations(DmsAccommodations dmsAccommodations) { + dmsAccommodations.setCreateTime(DateUtils.getNowDate()); + return dmsAccommodationsMapper.insertDmsAccommodations(dmsAccommodations); + } + + /** + * 修改外宿申请 + * + * @param dmsAccommodations 外宿申请 + * @return 结果 + */ + @Override + public int updateDmsAccommodations(DmsAccommodations dmsAccommodations) { + dmsAccommodations.setUpdateTime(DateUtils.getNowDate()); + return dmsAccommodationsMapper.updateDmsAccommodations(dmsAccommodations); + } + + /** + * 批量删除外宿申请 + * + * @param ids 需要删除的外宿申请主键 + * @return 结果 + */ + @Override + public int deleteDmsAccommodationsByIds(Long[] ids) { + return dmsAccommodationsMapper.deleteDmsAccommodationsByIds(ids); + } + + /** + * 删除外宿申请信息 + * + * @param id 外宿申请主键 + * @return 结果 + */ + @Override + public int deleteDmsAccommodationsById(Long id) { + return dmsAccommodationsMapper.deleteDmsAccommodationsById(id); + } + + @Override + public DmsAccommodations getStuDormitory(String stuNo){ + return dmsAccommodationsMapper.getStuDormitory(stuNo); + } +} diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml new file mode 100644 index 0000000..80d77b0 --- /dev/null +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, stu_no, stu_name, birthday, gender, class_name, stu_phone, sfzh, dept_name, major_name, grade_name, room_no, isCharge, sleep_out_remark, address, emergency_contact, parent_comment, parent_tel, parent_address, reviewer_status, apply_sign, apply_date, apply_sign2, apply_date2,fdy_cmt, fdy_sign, fdy_date, fdy_no, dept_cmt, dept_sign, dept_date, dept_no, xg_cmt, xg_sign, xg_date, xg_no, leader_cmt, leader_sign, leader_date, leader_no, stu_year_name, create_time, create_by, update_time, update_by from dms_accommodations + + + + + + + + + insert into dms_accommodations + + stu_no, + stu_name, + birthday, + gender, + class_name, + stu_phone, + sfzh, + dept_name, + major_name, + grade_name, + room_no, + isCharge, + sleep_out_remark, + address, + emergency_contact, + parent_comment, + parent_tel, + parent_address, + reviewer_status, + apply_sign, + apply_date, + apply_sign2, + apply_date2, + fdy_cmt, + fdy_sign, + fdy_date, + fdy_no, + dept_cmt, + dept_sign, + dept_date, + dept_no, + xg_cmt, + xg_sign, + xg_date, + xg_no, + leader_cmt, + leader_sign, + leader_date, + leader_no, + stu_year_name, + create_time, + create_by, + update_time, + update_by, + + + #{stuNo}, + #{stuName}, + #{birthday}, + #{gender}, + #{className}, + #{stuPhone}, + #{sfzh}, + #{deptName}, + #{majorName}, + #{gradeName}, + #{roomNo}, + #{isCharge}, + #{sleepOutRemark}, + #{address}, + #{emergencyContact}, + #{parentComment}, + #{parentTel}, + #{parentAddress}, + #{reviewerStatus}, + #{applySign}, + #{applyDate}, + #{applySign2}, + #{applyDate2}, + #{fdyCmt}, + #{fdySign}, + #{fdyDate}, + #{fdyNo}, + #{deptCmt}, + #{deptSign}, + #{deptDate}, + #{deptNo}, + #{xgCmt}, + #{xgSign}, + #{xgDate}, + #{xgNo}, + #{leaderCmt}, + #{leaderSign}, + #{leaderDate}, + #{leaderNo}, + #{stuYearName}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + + + + + update dms_accommodations + + stu_no = #{stuNo}, + stu_name = #{stuName}, + birthday = #{birthday}, + gender = #{gender}, + class_name = #{className}, + stu_phone = #{stuPhone}, + sfzh = #{sfzh}, + dept_name = #{deptName}, + major_name = #{majorName}, + grade_name = #{gradeName}, + room_no = #{roomNo}, + isCharge = #{isCharge}, + sleep_out_remark = #{sleepOutRemark}, + address = #{address}, + emergency_contact = #{emergencyContact}, + parent_comment = #{parentComment}, + parent_tel = #{parentTel}, + parent_address = #{parentAddress}, + reviewer_status = #{reviewerStatus}, + apply_sign = #{applySign}, + apply_date = #{applyDate}, + apply_sign2 = #{applySign2}, + apply_date2 = #{applyDate2}, + fdy_cmt = #{fdyCmt}, + fdy_sign = #{fdySign}, + fdy_date = #{fdyDate}, + fdy_no = #{fdyNo}, + dept_cmt = #{deptCmt}, + dept_sign = #{deptSign}, + dept_date = #{deptDate}, + dept_no = #{deptNo}, + xg_cmt = #{xgCmt}, + xg_sign = #{xgSign}, + xg_date = #{xgDate}, + xg_no = #{xgNo}, + leader_cmt = #{leaderCmt}, + leader_sign = #{leaderSign}, + leader_date = #{leaderDate}, + leader_no = #{leaderNo}, + stu_year_name = #{stuYearName}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from dms_accommodations where id = #{id} + + + + delete from dms_accommodations where id in + + #{id} + + + diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java index 096e594..9ad4f75 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java @@ -28,7 +28,7 @@ import com.srs.common.core.page.TableDataInfo; /** * 【请填写功能名称】Controller - * + * * @author srs * @date 2023-06-27 */ @@ -124,4 +124,9 @@ public class SrsMajorsController extends BaseController return AjaxResult.success(srsMajorsService.dataSync()); } + @GetMapping("/getOwnMajorName") + public AjaxResult getOwnMajorName(){ + String stuNo = getUsername(); + return AjaxResult.success(srsMajorsService.getOwnMajorName(stuNo)); + } } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java index 49605b6..6841a29 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java @@ -404,6 +404,12 @@ public class SrsStudentController extends BaseController { public AjaxResult getInfo(@PathVariable("stuId") Long stuId) { return success(srsStudentService.selectSrsStudentByStuId(stuId)); } + //获取登陆学生信息 + @GetMapping("/getLoginStudent") + public AjaxResult getLoginStudent() { + String stuNo = getUsername(); + return success(srsStudentService.getSrsStudentByStuNoNew(stuNo)); + } /** * 新增学生信息 diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java new file mode 100644 index 0000000..f69a1ed --- /dev/null +++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java @@ -0,0 +1,128 @@ +package com.srs.web.controller.dormitory; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.*; +import org.springframework.security.access.prepost.PreAuthorize; + +import com.srs.dormitory.domain.DmsAccommodations; +import com.srs.dormitory.service.IDmsAccommodationsService; +import com.srs.common.core.controller.BaseController; +import com.srs.common.core.domain.AjaxResult; +import com.srs.common.utils.poi.ExcelUtil; +import com.srs.common.enums.BusinessType; +import com.srs.common.annotation.Log; +import com.srs.common.core.page.TableDataInfo; + +/** + * 外宿申请Controller + * + * @author srs + * @date 2025-11-11 + */ +@RestController +@RequestMapping("/dormitory/accommodations") +@Api(value = "外宿申请管理", tags = "外宿申请管理") +public class DmsAccommodationsController extends BaseController { + @Autowired + private IDmsAccommodationsService dmsAccommodationsService; + + /** + * 查询外宿申请列表 + */ +//@PreAuthorize("@ss.hasPermi('dormitory:accommodations:list')") +@GetMapping("/list") +@ApiOperation("查询外宿申请列表") + public TableDataInfo list(DmsAccommodations dmsAccommodations) + { + startPage(); + String userName = getUsername(); + if(dmsAccommodations==null) { + if (userName.equals("admin")) { + List list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations); + return getDataTable(list); + } else{ + dmsAccommodations.setStuNo(userName); + List list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations); + return getDataTable(list); + } + } + else{ + List list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations); + return getDataTable(list); + } + } + + /** + * 导出外宿申请列表 + */ + @PreAuthorize("@ss.hasPermi('dormitory:accommodations:export')") + @Log(title = "外宿申请", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("导出外宿申请列表") + public void export(HttpServletResponse response, DmsAccommodations dmsAccommodations) + { + List list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations); + ExcelUtil util = new ExcelUtil(DmsAccommodations.class); + util.exportExcel(response, list, "外宿申请数据"); + } + + /** + * 获取外宿申请详细信息 + */ + //@PreAuthorize("@ss.hasPermi('dormitory:accommodations:query')") + @GetMapping(value = "/{id}") + @ApiOperation("获取外宿申请详细信息") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dmsAccommodationsService.selectDmsAccommodationsById(id)); + } + + /** + * 新增外宿申请 + */ +// @PreAuthorize("@ss.hasPermi('dormitory:accommodations:add')") + @Log(title = "外宿申请", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ApiOperation("新增外宿申请") + public AjaxResult add(@RequestBody DmsAccommodations dmsAccommodations) + { + return toAjax(dmsAccommodationsService.insertDmsAccommodations(dmsAccommodations)); + } + + /** + * 修改外宿申请 + */ + // @PreAuthorize("@ss.hasPermi('dormitory:accommodations:edit')") + @Log(title = "外宿申请", businessType = BusinessType.UPDATE) + @PostMapping("/update") + @ApiOperation("修改外宿申请") + public AjaxResult edit(@RequestBody DmsAccommodations dmsAccommodations) + { + return toAjax(dmsAccommodationsService.updateDmsAccommodations(dmsAccommodations)); + } + + /** + * 删除外宿申请 + */ + // @PreAuthorize("@ss.hasPermi('dormitory:accommodations:remove')") + @Log(title = "外宿申请", businessType = BusinessType.DELETE) + @PostMapping("/{ids}") + @ApiOperation("删除外宿申请") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dmsAccommodationsService.deleteDmsAccommodationsByIds(ids)); + } + @GetMapping("/getStuDormitory") + public AjaxResult getStuDormitory(){ + String stuNo = getUsername(); + return success(dmsAccommodationsService.getStuDormitory(stuNo)); + } +} diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java index 0c18418..bdda339 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java @@ -80,6 +80,8 @@ public class SrsStudent extends BaseEntity }) @TableField(exist = false) private SysDept dept; + @TableField(exist = false) + private String deptName; @Excel(name = "年级") @TableField(exist = false) private String gradeName; @@ -114,7 +116,10 @@ public class SrsStudent extends BaseEntity @TableField(exist = false) // @NotNull("家庭地址") private String address; - + @TableField(exist = false) + private String stuYearName; + @TableField(exist = false) + private String needMoney; /** 状态（0正常 */ @Excel(name = "状态", diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java index c57a7d2..f6e2f5f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java @@ -23,7 +23,7 @@ public interface SrsMajorsMapper extends EasyBaseMapper * @return 【请填写功能名称】 */ public SrsMajors selectSrsMajorsByMajorId(Long majorId); - + public SrsMajors getOwnMajorName(String stuNo); //根据专业名获取专业id public Long getMajorIdByName(String name); /** diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java index 94c46de..4b95355 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java @@ -68,11 +68,12 @@ public interface SrsStudentMapper extends EasyBaseMapper /** * 通过学号查询信息 * - * @param stuNO 学号 + * @param stuNo 学号 * @return 学生信息 */ - public SrsStudent selectSrsStudentByStuNo(String stuNO); + public SrsStudent selectSrsStudentByStuNo(String stuNo); + public SrsStudent selectSrsStudentByStuNoNew(String stuNo); /** * 连表查询 * diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java index 19645a9..8d157c8 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java @@ -70,4 +70,7 @@ public interface ISrsMajorsService void sqlserverSynchronousMYSQL(List list); //根据专业名称获取专业id public Long getMajorIdByName(String name); + //获取学生的专业名称 + public SrsMajors getOwnMajorName(String stuNo); + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java index bda1f3d..04410a4 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java @@ -43,7 +43,9 @@ public interface ISrsStudentService extends IService List countGoodBiyeGradeStu(); List countDeptGradeStu(); + List countDeptStu(); + public AjaxResult changeStuInfo( SrsStudent param); public SrsStudent getStuInfo(String stuNo); @@ -56,9 +58,14 @@ public interface ISrsStudentService extends IService */ public SrsStudent selectSrsStudentByStuId(Long stuId); + public SrsStudent getSrsStudentByStuNo(String stuNo); + + public SrsStudent getSrsStudentByStuNoNew(String stuNo); + public List listEnableStu(); public StuClass getOwnClass(String stuNo); + public List statusList(); /** diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index f5bb357..81ae353 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -53,6 +53,10 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService { return srsMajorsMapper.selectSrsMajorsByMajorId(majorId); } + @Override + public SrsMajors getOwnMajorName(String stuNo){ + return srsMajorsMapper.getOwnMajorName(stuNo); + } @Override public Long getMajorIdByName(String name){ return srsMajorsMapper.getMajorIdByName(name); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java index d164601..ffc2a0e 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java @@ -323,7 +323,16 @@ public class SrsStudentServiceImpl extends ServiceImpl res = srsStudentMapper.getOwnClass(stuNo); diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml index 3191fb7..86b61d9 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml @@ -176,4 +176,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept as b on a.old_dept_id = b.dept_id where b.dept_name = #{deptName} + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml index 7a58159..6e197b9 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml @@ -28,6 +28,7 @@ + @@ -200,7 +201,7 @@ where stu_id = #{stuId} - where stu_no = #{stuNo} @@ -729,7 +730,7 @@ total_count, male_count, female_count - from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count + from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count from srs_student d left join srs_class e on d.class_id=e.class_id left join srs_grade f on f.grade_id=e.grade_id @@ -749,7 +750,7 @@ order by grade_code desc +