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

学生资助、学生奖惩、学籍异动内容修改

Browse Source
This commit is contained in:
18154758993
2025-12-03 10:00:14 +08:00
parent 310bedb4b5
commit f8b635f060
54 changed files with 518 additions and 389 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));
}
}

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;

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

20
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/
# 开发环境配置
@@ -64,8 +64,8 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
# active: druid #正式环境
active: dev #测试环境
active: druid #正式环境
# active: dev #测试环境
# 文件上传
servlet:
multipart:
@@ -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