xgxt_sd/zhxg_java
16
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
2025-12-10 09:38:43 +08:00
parent 79886171c7 23aec500b8
commit 37df108fb2
109 changed files with 6403 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java
View File

@@ -202,7 +202,7 @@ public class KnzzZzqApplyController extends BaseController {
/**
* 获取自治区人民政府奖学金详细信息
*/
@PreAuthorize("@ss.hasPermi('comprehensive:knzzZzqApply:query')")
// @PreAuthorize("@ss.hasPermi('comprehensive:knzzZzqApply:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取自治区人民政府奖学金详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)

249
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java
View File

@@ -7,6 +7,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.srs.common.annotation.NotNull;
import com.srs.common.core.domain.model.LoginUser;
import com.srs.common.utils.bean.BeanTrimmer;
@@ -44,8 +45,7 @@ import com.srs.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/knrdApply/apply")
public class SrsKnrdApplyController extends BaseController
{
public class SrsKnrdApplyController extends BaseController {
@Autowired
private ISrsKnrdApplyService srsKnrdApplyService;
@@ -58,16 +58,16 @@ public class SrsKnrdApplyController extends BaseController
@GetMapping("/listJwc")
@ApiOperation("查询学工下的学生申请的列表")
public TableDataInfo listJwc(CphSearch param){
boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
if(hasRole){
public TableDataInfo listJwc(CphSearch param) {
boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
if (hasRole) {
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("4");
}
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
return getDataTable(list);
}else{
} else {
List<String> list = new ArrayList<>();
return getDataTable(list);
}
@@ -75,19 +75,19 @@ public class SrsKnrdApplyController extends BaseController
@GetMapping("/listXw")
@ApiOperation("查询学务下的学生申请的列表")
public TableDataInfo listXw(CphSearch param){
public TableDataInfo listXw(CphSearch param) {
// boolean hasRole = RoleBool.isXw(getUserId(),_postService);
boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
if(ejxysj){
if (ejxysj) {
param.setDeptId(getDeptId());
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("3");
}
param.setUserName(getUsername());
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
return getDataTable(list);
}else{
} else {
List<String> list = new ArrayList<>();
return getDataTable(list);
}
@@ -96,14 +96,14 @@ public class SrsKnrdApplyController extends BaseController
@PostMapping("/countXw")
@ApiOperation("查询学务下的学生申请的列表")
public AjaxResult countXw(CphSearch param){
public AjaxResult countXw(CphSearch param) {
boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
if(ejxysj){
if (ejxysj) {
param.setDeptId(getDeptId());
param.setUserName(getUsername());
List<SrsKnrdApply> list = srsKnrdApplyService.countXw(param);
return AjaxResult.success(list);
}else{
} else {
List<String> list = new ArrayList<>();
return AjaxResult.success(list);
}
@@ -111,17 +111,17 @@ public class SrsKnrdApplyController extends BaseController
@GetMapping("/listFdy")
@ApiOperation("查询辅导员下的学生申请的列表")
public TableDataInfo listFdy(CphSearch param){
boolean hasRole = RoleBool.isFdy(getUserId(),_postService);
if(hasRole){
public TableDataInfo listFdy(CphSearch param) {
boolean hasRole = RoleBool.isFdy(getUserId(), _postService);
if (hasRole) {
param.setTNo(getUsername());
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("2");
}
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
return getDataTable(list);
}else{
} else {
List<String> list = new ArrayList<>();
return getDataTable(list);
}
@@ -130,7 +130,7 @@ public class SrsKnrdApplyController extends BaseController
@GetMapping("/listOwn")
@ApiOperation("查询学生自己申请的列表")
public TableDataInfo listOwn(SrsKnrdApply srsKnrdApply){
public TableDataInfo listOwn(SrsKnrdApply srsKnrdApply) {
String stuNo = getUsername();
startPage();
srsKnrdApply.setXh(stuNo);
@@ -139,7 +139,6 @@ public class SrsKnrdApplyController extends BaseController
}
/**
* 查询困难认定列表
*/
@@ -156,8 +155,7 @@ public class SrsKnrdApplyController extends BaseController
*/
@Log(title = "困难认定", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SrsKnrdApply srsKnrdApply)
{
public void export(HttpServletResponse response, SrsKnrdApply srsKnrdApply) {
List<SrsKnrdApply> list = srsKnrdApplyService.selectSrsKnrdApplyList(srsKnrdApply);
ExcelUtil<SrsKnrdApply> util = new ExcelUtil<SrsKnrdApply>(SrsKnrdApply.class);
util.exportExcel(response, list, "困难认定数据");
@@ -167,29 +165,26 @@ public class SrsKnrdApplyController extends BaseController
* 获取困难认定详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
SrsKnrdApply srsKnrdApply = srsKnrdApplyService.selectSrsKnrdApplyById(id);
boolean isStu = RoleBool.isStu(getUserId(), _roleService);
if(isStu){
if (isStu) {
String stuNo = getUsername();
if(srsKnrdApply.getXh().equals(stuNo)){
if (srsKnrdApply.getXh().equals(stuNo)) {
return success(srsKnrdApply);
}
else{
} else {
return error("无权访问");
}
}else{
} else {
return success(srsKnrdApply);
}
}
//获取当前学年
@PostMapping(value = "/findByXhAndApplyYear")
public AjaxResult findByXhAndApplyYear(@RequestBody SrsKnrdApply srsKnrdApply)
{
public AjaxResult findByXhAndApplyYear(@RequestBody SrsKnrdApply srsKnrdApply) {
return success(srsKnrdApplyService.selectByXhAndYear(srsKnrdApply));
}
@@ -197,60 +192,60 @@ public class SrsKnrdApplyController extends BaseController
@Autowired
private TokenService tokenService;
@GetMapping( "/xh")
public AjaxResult getInfoxh(HttpServletRequest request)
{
@GetMapping("/xh")
public AjaxResult getInfoxh(HttpServletRequest request) {
LoginUser loginUser = tokenService.getLoginUser(request);
return success(srsKnrdApplyService.getInfoxh(loginUser.getUser().getUserName()));
}
@GetMapping( "/getStuByXh")
public AjaxResult getStuByXh(String xh)
{
@GetMapping("/getStuByXh")
public AjaxResult getStuByXh(String xh) {
SrsStudent infoxh = srsKnrdApplyService.getInfoxh(xh);
if(infoxh==null){
return error("学号错误，没有这个学生");
if (infoxh == null) {
return error("学号错误，没有这个学生");
}
return success();
}
/**
* 新增困难认定
*/
@Log(title = "学生新增困难认定", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SrsKnrdApply srsKnrdApply)
{
public AjaxResult add(@RequestBody SrsKnrdApply srsKnrdApply) {
BeanTrimmer.trimFields(srsKnrdApply);
return srsKnrdApplyService.insertSrsKnrdApply(srsKnrdApply);
}
/**
* 修改困难认定
*/
@Log(title = "困难认定", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SrsKnrdApply srsKnrdApply)
{
public AjaxResult edit(@RequestBody SrsKnrdApply srsKnrdApply) {
SrsKnrdApply result = srsKnrdApplyService.selectSrsKnrdApplyById(srsKnrdApply.getId());
Long step = result.getStep();
if(step != 1 && step !=0){ //学生只能看不能操作
boolean isStudent = RoleBool.isStu(getUserId(),_roleService);
if(isStudent){
if (step != 1 && step != 0) { //学生只能看不能操作
boolean isStudent = RoleBool.isStu(getUserId(), _roleService);
if (isStudent) {
return AjaxResult.error("操作失败,权限不足!");
}
if(step == 2) {
if (step == 2) {
boolean isFdy = RoleBool.isFdy(getUserId(), _postService);
if (!isFdy) {
return AjaxResult.error("操作失败,权限不足!");
}
}
if(step == 3){
if (step == 3) {
boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
if (!ejxysj) {
return AjaxResult.error("操作失败,权限不足!");
}
}
if(step == 4){
boolean isJwc = RoleBool.isJwc(getUserId(),_postService);
if (step == 4) {
boolean isJwc = RoleBool.isJwc(getUserId(), _postService);
if (!isJwc) {
return AjaxResult.error("操作失败,权限不足!");
}
@@ -260,24 +255,25 @@ public class SrsKnrdApplyController extends BaseController
BeanTrimmer.trimFields(srsKnrdApply);
return toAjax(srsKnrdApplyService.updateSrsKnrdApply(srsKnrdApply));
}
/**
* 批量困难认定
*/
@Log(title = "困难认定", businessType = BusinessType.UPDATE)
@PostMapping("/updateAllSrsKnrdApply")
public AjaxResult updateAllSrsKnrdApply(@RequestBody SrsHandAllKnrd srsKnrdApply)
{
public AjaxResult updateAllSrsKnrdApply(@RequestBody SrsHandAllKnrd srsKnrdApply) {
return toAjax(srsKnrdApplyService.updateAllSrsKnrdApply(srsKnrdApply));
}
/**
* 删除困难认定
*/
@Log(title = "困难认定", businessType = BusinessType.DELETE)
@GetMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(srsKnrdApplyService.deleteSrsKnrdApplyByIds(ids));
}
@Autowired
private ISrsStudentService srsStudentService;
@@ -285,9 +281,10 @@ public class SrsKnrdApplyController extends BaseController
private ICphStuExtraInfoService cphStuExtraInfoService;
@Autowired
private IRtStuDisciplinaryApplicationService rtStuDisciplinaryApplicationService;
//学生基础信息校验
@PostMapping("/infoCheck")
public AjaxResult infoCheck(){
public AjaxResult infoCheck() {
AjaxResult ajaxResult = new AjaxResult();
String stuNo = getUsername();
@@ -297,24 +294,24 @@ public class SrsKnrdApplyController extends BaseController
check(res1);
check(res2);
if(rtStuDisciplinaryApplicationService.selectRtStuDisciplinaryApplicationByStuNo(stuNo)){
Map map = new HashMap<String,String>();
map.put("code",1);
ajaxResult.put("code",0 );
ajaxResult.put("data",map);
ajaxResult.put("msg","你当前处于学校处分状态，不允许申请贫困生条件");
if (rtStuDisciplinaryApplicationService.selectRtStuDisciplinaryApplicationByStuNo(stuNo)) {
Map map = new HashMap<String, String>();
map.put("code", 1);
ajaxResult.put("code", 0);
ajaxResult.put("data", map);
ajaxResult.put("msg", "你当前处于学校处分状态，不允许申请贫困生条件");
return ajaxResult;
}
ajaxResult.put("code",200);
ajaxResult.put("code", 200);
return ajaxResult;
}catch (Exception e){
Map map = new HashMap<String,String>();
map.put("code",0);
map.put("info",e.getMessage());
ajaxResult.put("code",0);
ajaxResult.put("data",map);
ajaxResult.put("msg","请先填写完成个人信息中的重要信息和其他信息");
} catch (Exception e) {
Map map = new HashMap<String, String>();
map.put("code", 0);
map.put("info", e.getMessage());
ajaxResult.put("code", 0);
ajaxResult.put("data", map);
ajaxResult.put("msg", "请先填写完成个人信息中的重要信息和其他信息");
return ajaxResult;
}
@@ -324,17 +321,17 @@ public class SrsKnrdApplyController extends BaseController
//获取所有字段
final Class<?> clazz = obj.getClass();
Field[] fields = clazz.getDeclaredFields();
for (Field field:fields) {
for (Field field : fields) {
field.setAccessible(true);
NotNull notNull = field.getAnnotation(NotNull.class);
String name = field.getName();//字段名
Type type = field.getGenericType();//字段类型
if(notNull != null){
if (notNull != null) {
Class<?> fieldClazz = field.getType();
Object fieldObj = field.get(obj);
if(field.get(obj) == null || "".equals(field.get(obj))){
if (field.get(obj) == null || "".equals(field.get(obj))) {
throw new Exception(notNull.value());
}
// //是数组
@@ -350,7 +347,7 @@ public class SrsKnrdApplyController extends BaseController
}
@PostMapping("/valid")
public AjaxResult valid(@RequestBody SrsKnrdApply apply){
public AjaxResult valid(@RequestBody SrsKnrdApply apply) {
AjaxResult ajaxResult = new AjaxResult();
// SrsKnrdApply srsKnrdApply = new SrsKnrdApply();
String stuNo = getUsername();
@@ -358,54 +355,54 @@ public class SrsKnrdApplyController extends BaseController
// SrsStuYear srsStuYear = srsStuYearService.listEnableYear().get(0);
// apply.setStuYearId(srsStuYear.getId());
SrsKnrdApply vaildResult = srsKnrdApplyService.selectByXhAndYear(apply);
if(vaildResult == null ){
ajaxResult.put("valid",1);
}else{
ajaxResult.put("valid",0);
if (vaildResult == null) {
ajaxResult.put("valid", 1);
} else {
ajaxResult.put("valid", 0);
}
return ajaxResult;
}
@PostMapping("/fdySave")
public AjaxResult fdySave(@RequestBody SrsKnrdApply srsKnrdApply){
public AjaxResult fdySave(@RequestBody SrsKnrdApply srsKnrdApply) {
int i = srsKnrdApplyService.fdySave(srsKnrdApply);
return toAjax(i);
}
@PostMapping("/getCurrentYear")
public AjaxResult getCurrentYear(){
public AjaxResult getCurrentYear() {
List<SrsStuYear> srsStuYears = srsStuYearService.listEnableYear();
return success(srsStuYears.get(0));
}
@PostMapping("/reject")
public AjaxResult reject(@RequestBody SrsKnrdApprovalRecord record){
public AjaxResult reject(@RequestBody SrsKnrdApprovalRecord record) {
return success(srsKnrdApplyService.reject(record));
}
@PostMapping("/jwcNext")
@ApiOperation("查询学工下的学生申请的列表")
public AjaxResult jwcNext(CphSearch param){
public AjaxResult jwcNext(CphSearch param) {
boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
if(hasRole){
boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
if (hasRole) {
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("4");
}
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
if(list.size() != 0){
if (list.size() != 0) {
SrsKnrdApply srsKnrdApply = list.get(0);
//锁定
srsKnrdApplyService.lock(srsKnrdApply);
return AjaxResult.success(srsKnrdApply);
}else{
} else {
return AjaxResult.success(null);
}
}else{
} else {
return AjaxResult.success(null);
}
}
@@ -413,44 +410,45 @@ public class SrsKnrdApplyController extends BaseController
@PostMapping("/fdyNext")
@ApiOperation("查询学工下的学生申请的列表")
public AjaxResult fdyNext(CphSearch param) {
boolean hasRole = RoleBool.isFdy(getUserId(),_postService);
if(hasRole){
boolean hasRole = RoleBool.isFdy(getUserId(), _postService);
if (hasRole) {
param.setTNo(getUsername());
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("2");
}
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
if(list.size() != 0){
if (list.size() != 0) {
return AjaxResult.success(list.get(0));
}else{
} else {
return AjaxResult.success(null);
}
}else{
} else {
return AjaxResult.success(null);
}
}
@PostMapping("/xwNext")
@ApiOperation("查询学务下的学生申请的列表")
public AjaxResult xwNext(CphSearch param){
public AjaxResult xwNext(CphSearch param) {
// boolean hasRole = RoleBool.isXw(getUserId(),_postService);
boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
if( ejxysj){
if (ejxysj) {
param.setDeptId(getDeptId());
startPage();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("3");
}
param.setUserName(getUsername());
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
if(list.size() != 0){
if (list.size() != 0) {
return AjaxResult.success(list.get(0));
}else{
} else {
return AjaxResult.success(null);
}
}else{
} else {
List<String> list = new ArrayList<>();
return AjaxResult.success(null);
}
@@ -460,10 +458,10 @@ public class SrsKnrdApplyController extends BaseController
@ApiOperation("困难认定撤回")
public AjaxResult revoke(@RequestBody SrsKnrdApply srsKnrdApply) {
int revoke = srsKnrdApplyService.revoke(srsKnrdApply);
if(revoke > 0){
return AjaxResult.success("操作成功！");
}else{
return AjaxResult.error("操作失败！");
if (revoke > 0) {
return AjaxResult.success("操作成功！");
} else {
return AjaxResult.error("操作失败！");
}
}
@@ -473,10 +471,10 @@ public class SrsKnrdApplyController extends BaseController
@ApiOperation("困难认定超级撤回")
public AjaxResult fdyRevoke(@RequestBody SrsKnrdApply srsKnrdApply) {
int revoke = srsKnrdApplyService.fdyRevoke(srsKnrdApply);
if(revoke > 0){
return AjaxResult.success("操作成功！");
}else{
return AjaxResult.error("操作失败！");
if (revoke > 0) {
return AjaxResult.success("操作成功！");
} else {
return AjaxResult.error("操作失败！");
}
}
@@ -484,10 +482,10 @@ public class SrsKnrdApplyController extends BaseController
@PostMapping("/lock")
public AjaxResult lock(@RequestBody SrsKnrdApply srsKnrdApply) {
int lock = srsKnrdApplyService.lock(srsKnrdApply);
if(lock > 0){
return AjaxResult.success("操作成功！");
}else{
return AjaxResult.error("操作失败！");
if (lock > 0) {
return AjaxResult.success("操作成功！");
} else {
return AjaxResult.error("操作失败！");
}
}
@@ -495,10 +493,10 @@ public class SrsKnrdApplyController extends BaseController
@PostMapping("/unlock")
public AjaxResult unlock(@RequestBody SrsKnrdApply srsKnrdApply) {
int unLock = srsKnrdApplyService.unlock(srsKnrdApply);
if(unLock > 0){
return AjaxResult.success("操作成功！");
}else{
return AjaxResult.error("操作失败！");
if (unLock > 0) {
return AjaxResult.success("操作成功！");
} else {
return AjaxResult.error("操作失败！");
}
}
@@ -506,24 +504,24 @@ public class SrsKnrdApplyController extends BaseController
//教务处一键审核
@PostMapping("/jwcUpdateAll")
@ApiOperation("查询学工下的学生申请的列表")
public AjaxResult jwcUpdateAll(@RequestBody SrsHandAllKnrd srsKnrdApply){
boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
if(hasRole){
public AjaxResult jwcUpdateAll(@RequestBody SrsHandAllKnrd srsKnrdApply) {
boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
if (hasRole) {
CphSearch param = new CphSearch();
if (param.getStep()==null) {
if (param.getStep() == null) {
param.setStep("4");
}
List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
int[] ids = new int[list.size()];
for (int i = 0; i < list.size(); i++) {
ids[i] = list.get(i).getId().intValue();
ids[i] = list.get(i).getId().intValue();
}
srsKnrdApply.setIds(ids);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String formatDate = format.format(new Date());
srsKnrdApply.setXsqmrq(formatDate);
return toAjax(srsKnrdApplyService.updateAllSrsKnrdApply(srsKnrdApply));
}else{
} else {
return toAjax(0);
}
@@ -531,11 +529,10 @@ public class SrsKnrdApplyController extends BaseController
// 更新签名
@PostMapping("/updateSignature")
public AjaxResult updateSignature(@RequestBody CphSearch cphSearch){
public AjaxResult updateSignature(@RequestBody CphSearch cphSearch) {
return AjaxResult.success(srsKnrdApplyService.updateSignature(cphSearch));
return AjaxResult.success(srsKnrdApplyService.updateSignature(cphSearch));
}
}

7
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java
View File

@@ -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));
}
}

6
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java
View File

@@ -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));
}
/**
* 新增学生信息

10
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java
View File

@@ -299,6 +299,16 @@ public class SrsZxjApplyController extends BaseController {
return toAjax(i);
}
@PostMapping("/updateSqly")
@ApiOperation("修改申请理由（sqly）")
public AjaxResult updateSqly(@RequestBody SrsZxjApply apply) {
if (apply == null || apply.getId() == null || apply.getSqly() == null) {
return AjaxResult.error("参数不完整");
}
int rows = srsZxjApplyService.updateSqly(apply.getId(), apply.getSqly());
return toAjax(rows);
}
@PostMapping("/nopass")
@ApiOperation("新增【贫困生申请】")

2
srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java
View File

@@ -1,4 +1,4 @@
package com.srs.comprehensive.controller;
package com.srs.web.controller.comprehensive;
import java.util.List;
import javax.servlet.http.HttpServletResponse;

128
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java Normal file
View File

@@ -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<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
return getDataTable(list);
} else{
dmsAccommodations.setStuNo(userName);
List<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
return getDataTable(list);
}
}
else{
List<DmsAccommodations> 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<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
ExcelUtil<DmsAccommodations> util = new ExcelUtil<DmsAccommodations>(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));
}
}

120
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java Normal file
View File

@@ -0,0 +1,120 @@
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.DmsOutsideAccommodationApply;
import com.srs.dormitory.service.IDmsOutsideAccommodationApplyService;
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-12-05
*/
@RestController
@RequestMapping("/dormitory/outsideAccommodationApply")
@Api(value = "外宿申请管理", tags = "外宿申请管理")
public class DmsOutsideAccommodationApplyController extends BaseController {
@Autowired
private IDmsOutsideAccommodationApplyService dmsOutsideAccommodationApplyService;
/**
* 查询外宿申请列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请列表")
public TableDataInfo list(DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
startPage();
List<DmsOutsideAccommodationApply> list = dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyList(dmsOutsideAccommodationApply);
return getDataTable(list);
}
/**
* 导出外宿申请列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:export')")
@Log(title = "外宿申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出外宿申请列表")
public void export(HttpServletResponse response, DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
List<DmsOutsideAccommodationApply> list = dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyList(dmsOutsideAccommodationApply);
ExcelUtil<DmsOutsideAccommodationApply> util = new ExcelUtil<DmsOutsideAccommodationApply>(DmsOutsideAccommodationApply.class);
util.exportExcel(response, list, "外宿申请数据");
}
/**
* 获取外宿申请详细信息
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取外宿申请详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyById(id));
}
/**
* 获取外宿申请详细信息
*/
@PreAuthorize("@ss.hasPermi('dormitory:enlistmentReserve:query')")
@GetMapping(value = "/process/{processInstanceId}")
@ApiOperation("获取应征入伍保留学籍申请详细信息")
public AjaxResult getInfoByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId) {
return success(dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyByProcessInstanceId(processInstanceId));
}
/**
* 新增外宿申请
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:add')")
@Log(title = "外宿申请", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增外宿申请")
public AjaxResult add(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
return success(dmsOutsideAccommodationApplyService.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
}
/**
* 修改外宿申请
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:edit')")
@Log(title = "外宿申请", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改外宿申请")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
return toAjax(dmsOutsideAccommodationApplyService.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
}
/**
* 删除外宿申请
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:remove')")
@Log(title = "外宿申请", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@ApiOperation("删除外宿申请")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(dmsOutsideAccommodationApplyService.deleteDmsOutsideAccommodationApplyByIds(ids));
}
}

110
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java Normal file
View File

@@ -0,0 +1,110 @@
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.DmsOutsideAccommodationApproval;
import com.srs.dormitory.service.IDmsOutsideAccommodationApprovalService;
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-12-05
*/
@RestController
@RequestMapping("/dormitory/outsideAccommodationApproval")
@Api(value = "外宿申请审批记录管理", tags = "外宿申请审批记录管理")
public class DmsOutsideAccommodationApprovalController extends BaseController {
@Autowired
private IDmsOutsideAccommodationApprovalService dmsOutsideAccommodationApprovalService;
/**
* 查询外宿申请审批记录列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请审批记录列表")
public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
startPage();
List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
return getDataTable(list);
}
/**
* 导出外宿申请审批记录列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:export')")
@Log(title = "外宿申请审批记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出外宿申请审批记录列表")
public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
ExcelUtil<DmsOutsideAccommodationApproval> util = new ExcelUtil<DmsOutsideAccommodationApproval>(DmsOutsideAccommodationApproval.class);
util.exportExcel(response, list, "外宿申请审批记录数据");
}
/**
* 获取外宿申请审批记录详细信息
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取外宿申请审批记录详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalById(id));
}
/**
* 新增外宿申请审批记录
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:add')")
@Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增外宿申请审批记录")
public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
return toAjax(dmsOutsideAccommodationApprovalService.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
}
/**
* 修改外宿申请审批记录
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:edit')")
@Log(title = "外宿申请审批记录", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改外宿申请审批记录")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
return toAjax(dmsOutsideAccommodationApprovalService.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
}
/**
* 删除外宿申请审批记录
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:remove')")
@Log(title = "外宿申请审批记录", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@ApiOperation("删除外宿申请审批记录")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(dmsOutsideAccommodationApprovalService.deleteDmsOutsideAccommodationApprovalByIds(ids));
}
}

110
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationAttachmentController.java Normal file
View File

@@ -0,0 +1,110 @@
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.DmsOutsideAccommodationAttachment;
import com.srs.dormitory.service.IDmsOutsideAccommodationAttachmentService;
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-12-05
*/
@RestController
@RequestMapping("/dormitory/outsideAccommodationAttachment")
@Api(value = "外宿申请附件管理", tags = "外宿申请附件管理")
public class DmsOutsideAccommodationAttachmentController extends BaseController {
@Autowired
private IDmsOutsideAccommodationAttachmentService dmsOutsideAccommodationAttachmentService;
/**
* 查询外宿申请附件列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请附件列表")
public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
startPage();
List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
return getDataTable(list);
}
/**
* 导出外宿申请附件列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:export')")
@Log(title = "外宿申请附件", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出外宿申请附件列表")
public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
ExcelUtil<DmsOutsideAccommodationAttachment> util = new ExcelUtil<DmsOutsideAccommodationAttachment>(DmsOutsideAccommodationAttachment.class);
util.exportExcel(response, list, "外宿申请附件数据");
}
/**
* 获取外宿申请附件详细信息
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取外宿申请附件详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentById(id));
}
/**
* 新增外宿申请附件
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:add')")
@Log(title = "外宿申请附件", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增外宿申请附件")
public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
return toAjax(dmsOutsideAccommodationAttachmentService.insertDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
}
/**
* 修改外宿申请附件
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:edit')")
@Log(title = "外宿申请附件", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改外宿申请附件")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
return toAjax(dmsOutsideAccommodationAttachmentService.updateDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
}
/**
* 删除外宿申请附件
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:remove')")
@Log(title = "外宿申请附件", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@ApiOperation("删除外宿申请附件")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(dmsOutsideAccommodationAttachmentService.deleteDmsOutsideAccommodationAttachmentByIds(ids));
}
}

17
srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java
View File

@@ -181,6 +181,9 @@ public class SrsDormitoryStudentController extends BaseController {
if (hasRole) {
DomInfo dorm = _dormService.getDormHas(dto.getDormitoryId());
SrsStudent stu = _stuService.getStuInfo(dto.getStuNo());
if (stu == null) {
return AjaxResult.error("学号不存在");
}
QueryWrapper<SrsDormitoryStudent> query = new QueryWrapper<>();
query.eq("stu_no", dto.getStuNo());
SrsDormitoryStudent find = srsDormitoryStudentService.getOne(query);
@@ -229,6 +232,9 @@ public class SrsDormitoryStudentController extends BaseController {
public AjaxResult addCheckInInformation(@RequestBody StudentDormitoryDto dto) {
DomInfo dorm = _dormService.getDormHas(dto.getDormitoryId());
SrsStudent stu = _stuService.getStuInfo(dto.getStuNo());
if (stu == null) {
return AjaxResult.error("学号不存在");
}
QueryWrapper<SrsDormitoryStudent> query = new QueryWrapper<>();
query.eq("stu_no", dto.getStuNo());
SrsDormitoryStudent find = srsDormitoryStudentService.getOne(query);
@@ -331,7 +337,8 @@ public class SrsDormitoryStudentController extends BaseController {
@PostMapping("/update")
public AjaxResult update(@RequestBody StudentDormitoryDto studentDormitoryDto) {
SrsDormitoryStudent dormitoryStudent = new SrsDormitoryStudent();
if(studentDormitoryDto.getIsInStudentsleep().equals("否")||studentDormitoryDto.getIsInStudentsleep().equals("外宿")||studentDormitoryDto.getIsInStudentsleep().equals("外出实习")){
String sleep = studentDormitoryDto.getIsInStudentsleep();
if("否".equals(sleep) || "外宿".equals(sleep) || "外出实习".equals(sleep)){
dormitoryStudent.setId(studentDormitoryDto.getId());
dormitoryStudent.setDormitoryId(null);
dormitoryStudent.setBedId(null);
@@ -339,9 +346,13 @@ public class SrsDormitoryStudentController extends BaseController {
dormitoryStudent.setIsDormitoryHead(0);
dormitoryStudent.setStatus(0);
dormitoryStudent.setCheckinTime(null);
dormitoryStudent.setIsInStudentsleep(studentDormitoryDto.getIsInStudentsleep());
dormitoryStudent.setIsInStudentsleep(sleep);
}else{
dormitoryStudent.setCheckinTime(studentDormitoryDto.getCheckinTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
if (studentDormitoryDto.getCheckinTime() != null) {
dormitoryStudent.setCheckinTime(studentDormitoryDto.getCheckinTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
} else {
dormitoryStudent.setCheckinTime(null);
}
BeanUtils.copyProperties(studentDormitoryDto, dormitoryStudent);
}
//boolean b = srsDormitoryStudentService.updateById(dormitoryStudent);

26
srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
View File

@@ -3,6 +3,7 @@ package com.srs.web.controller.routine;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -112,4 +113,29 @@ public class RtEnlistmentReserveController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(rtEnlistmentReserveService.deleteRtEnlistmentReserveByIds(ids));
}
/**
* 新增外宿申请
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:add')")
@Log(title = "外宿申请", businessType = BusinessType.INSERT)
@PostMapping("/outsideAccommodationApply/add")
@ApiOperation("新增外宿申请")
public AjaxResult add(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
return success(rtEnlistmentReserveService.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
}
/**
* 修改外宿申请
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:edit')")
@Log(title = "外宿申请", businessType = BusinessType.UPDATE)
@PostMapping("/outsideAccommodationApply/update")
@ApiOperation("修改外宿申请")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
{
return toAjax(rtEnlistmentReserveService.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
}
}

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

@@ -1,8 +1,20 @@
package com.srs.web.controller.routine;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.srs.common.utils.poi.ExcelExp;
import com.srs.common.utils.poi.ExcelUtilManySheet;
import com.srs.routine.domain.SysDisMate;
import com.srs.routine.domain.dto.SysDisBasicDao;
import com.srs.routine.domain.dto.SysDisMateDao;
import com.srs.teacher.domain.SysPerformance;
import com.srs.teacher.domain.SysTeacherThesis;
import com.srs.teacher.domain.dto.SysPerformanceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -34,6 +46,9 @@ public class SysDisBasicController extends BaseController {
@Autowired
private ISysDisBasicService sysDisBasicService;
@Value("${srs.url}")
private String baseUrl;
/**
* 查询退伍复学申请列表
*/
@@ -54,11 +69,61 @@ public class SysDisBasicController extends BaseController {
@Log(title = "退伍复学申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出退伍复学申请列表")
public void export(HttpServletResponse response, SysDisBasic sysDisBasic)
{
public void export(HttpServletResponse response, SysDisBasic sysDisBasic) throws IOException {
List<SysDisBasic> list = sysDisBasicService.selectSysDisBasicList(sysDisBasic);
ExcelUtil<SysDisBasic> util = new ExcelUtil<SysDisBasic>(SysDisBasic.class);
util.exportExcel(response, list, "退伍复学申请数据");
// 基础材料
List<SysDisBasicDao> sysDisBasicDaos = new ArrayList<>();
// 转专业
List<SysDisMateDao> sysDisMateDaos = new ArrayList<>();
// 基础材料
for (SysDisBasic item : list){
SysDisBasicDao dao = new SysDisBasicDao();
dao.setStId(item.getStId());
dao.setStName(item.getStName());
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.setReasons(item.getReasons());
dao.setConversion(item.getConversion());
sysDisBasicDaos.add(dao);
}
// 转专业材料
for(SysDisBasic item :list){
SysDisMateDao dao1 = new SysDisMateDao();
dao1.setStId(item.getStId());
dao1.setStName(item.getStName());
dao1.setCollege(item.getCollege());
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());
}
sysDisMateDaos.add(dao1);
}
ExcelExp e1 = new ExcelExp("基础材料", sysDisBasicDaos, SysDisBasicDao.class);
ExcelExp e2 = new ExcelExp("转专业材料", sysDisMateDaos, SysDisMateDao.class);
List<ExcelExp> mysheet = new ArrayList<ExcelExp>();
mysheet.add(e1);
mysheet.add(e2);
ExcelUtilManySheet<List<SysDisBasic>> util2 = new ExcelUtilManySheet<List<SysDisBasic>>(mysheet);
util2.exportExcelManySheet(response, mysheet);
// ExcelUtil<SysDisBasic> util = new ExcelUtil<SysDisBasic>(SysDisBasic.class);
// util.exportExcel(response, list, "退伍复学申请数据");
}
/**
@@ -72,6 +137,23 @@ public class SysDisBasicController extends BaseController {
return success(sysDisBasicService.selectSysDisBasicById(id));
}
// 根据学号查询信息
@PreAuthorize("@ss.hasPermi('routine:basic:query')")
@GetMapping(value = "/name/{stName}")
public AjaxResult getStNameInfo(@PathVariable("stName") String stName)
{
return success(sysDisBasicService.selectSysDisBasicByStName(stName));
}
// 根据流程ID查询流程信息
// selectSysDisBasicByProcessInstanceId
@PreAuthorize("@ss.hasPermi('routine:basic:query')")
@GetMapping(value = "/processId/{processId}")
public AjaxResult getProcessId(@PathVariable("processId") String processId)
{
return success(sysDisBasicService.selectSysDisBasicByProcessInstanceId(processId));
}
/**
* 新增退伍复学申请
*/

16
srs-admin/src/main/resources/application.yml
View File

@@ -15,7 +15,7 @@ srs:
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
url: http://zhxg:gxsdxy.cn/srs/prod_api/
url: https://zhxg.gxsdxy.cn/srs/prod_api/
# 开发环境配置
@@ -81,15 +81,15 @@ spring:
# redis 配置
redis:
# 地址
# host: localhost #正式环境redis
host: 47.112.118.149 #测试开发地址
host: localhost #正式环境redis
# host: 47.112.118.149 #测试开发地址
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码SSSS
password: Houpuyfb #测试开发密码
# password: #正式环境密码
# password: Houpuyfb #测试开发密码
password: #正式环境密码
# 连接超时时间
timeout: 10s
lettuce:
@@ -180,15 +180,15 @@ app:
casEnable: false
server:
host:
url: http://zhxgjava.gxsdxy.cn
url: https://zhxgjava.gxsdxy.cn
#应用登录地址
login_url: /
#应用登出地址
logout_url: /logout
#前端登录地址
web_url: http://zhxg.gxsdxy.cn/cas/#/index
web_url: https://zhxg.gxsdxy.cn/cas/#/index
#移动端登录地址
wab_url: http://zhxg.gxsdxy.cn/wab/#/pages/index/index
wab_url: https://zhxg.gxsdxy.cn/wab/
wechat:
corpId: wx129e6bf0f36b8b3d
secret: qoNhKNJc2vCeV0700u5d0F7wLFX2U_uUx3YC1PYuwL0