diff --git a/bin/run.bat b/bin/run.bat index 99e3538..3b8ceb3 100644 --- a/bin/run.bat +++ b/bin/run.bat @@ -8,7 +8,8 @@ cd ../srs-admin/target set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -jar %JAVA_OPTS% srs-admin.jar +rem 正确传递 JVM 参数应放在 -jar 之前 +java %JAVA_OPTS% -jar srs-admin.jar cd bin -pause \ No newline at end of file +pause diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java index 03a67fc..94a307d 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java @@ -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) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java index 111c85c..40e8702 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java @@ -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 list = srsKnrdApplyService.listView(param); return getDataTable(list); - }else{ + } else { List 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 list = srsKnrdApplyService.listView(param); return getDataTable(list); - }else{ + } else { List 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 list = srsKnrdApplyService.countXw(param); return AjaxResult.success(list); - }else{ + } else { List 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 list = srsKnrdApplyService.listView(param); return getDataTable(list); - }else{ + } else { List 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 list = srsKnrdApplyService.selectSrsKnrdApplyList(srsKnrdApply); ExcelUtil util = new ExcelUtil(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(); - map.put("code",1); - ajaxResult.put("code",0 ); - ajaxResult.put("data",map); - ajaxResult.put("msg","你当前处于学校处分状态,不允许申请贫困生条件"); + if (rtStuDisciplinaryApplicationService.selectRtStuDisciplinaryApplicationByStuNo(stuNo)) { + Map map = new HashMap(); + 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(); - 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(); + 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 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 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 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 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 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 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)); } } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java index 07855e8..beca00b 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java @@ -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("新增【贫困生申请】") diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java index 243445a..14c76ef 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java @@ -1,4 +1,4 @@ -package com.srs.comprehensive.controller; +package com.srs.web.controller.comprehensive; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java index 6c3e207..746513a 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java @@ -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 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 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); diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml index e874272..0d4b3c2 100644 --- a/srs-admin/src/main/resources/application.yml +++ b/srs-admin/src/main/resources/application.yml @@ -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 diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java index d1092cd..b766564 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import com.srs.comprehensive.domain.SrsZxjApply; import com.srs.comprehensive.domain.Vo.CphSearch; @@ -107,4 +108,9 @@ public interface SrsZxjApplyMapper extends BaseMapper { int updateFdySignature(CphSearch cphSearch); int updateEjxySignature(CphSearch cphSearch); int updateScSignature(CphSearch cphSearch); + + /** + * 仅更新申请理由(sqly) + */ + int updateSqly(@Param("id") Long id, @Param("sqly") String sqly); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java index 09fd3ec..2502b8e 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java @@ -95,4 +95,9 @@ public interface ISrsZxjApplyService extends IService { List countXw(CphSearch param); int updateSignature(CphSearch cphSearch); + + /** + * 仅更新申请理由(sqly) + */ + int updateSqly(Long id, String sqly); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java index 768646f..66984c6 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java @@ -47,9 +47,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", apply.getId()) // 需要重置的审批流程相关字段 @@ -225,9 +225,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml index e1618ae..0bc4f90 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml @@ -192,7 +192,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from srs_knrd_apply + select t.knrd_type as knlx, a.* + from srs_knrd_apply as a + left join srs_knrd_type as t + on t.stu_no = a.xh + and t.stu_year_id = a.stu_year_id - where id = #{id} + where a.id = #{id} - and step = #{step} - and xm = #{xm} - and xb = #{xb} - and mz = #{mz} - and zzmm = #{zzmm} - and xh = #{xh} - and rxsj = #{rxsj} - and csny = #{csny} - and dh = #{dh} - and nj = #{nj} - and xy = #{xy} - and zy = #{zy} - and bj = #{bj} - and kndj = #{kndj} - and knlx = #{knlx} - and knlx2 = #{knlx2} - and rkzs = #{rkzs} - and yzsr = #{yzsr} - and rjyr = #{rjyr} - and srly = #{srly} - and jtcy = #{jtcy} - and sqly = #{sqly} - and fdyqm = #{fdyqm} - and fdyqmrq = #{fdyqmrq} - and ejxyldqm = #{ejxyldqm} - and ejxyldqmrq = #{ejxyldqmrq} - and xsqm = #{xsqm} - and xsqmrq = #{xsqmrq} - and csdj = #{csdj} - and zzdj = #{zzdj} - and zzls = #{zzls} - and zp = #{zp} - and affix_id = #{affixId} - and status1 = #{status1} - and status2 = #{status2} - and status3 = #{status3} - and dz = #{dz} - and yb = #{yb} - and xxyjrq = #{xxyjrq} - and apply_year = #{applyYear} - and stu_year_id = #{stuYearId} + and a.step = #{step} + and a.xm = #{xm} + and a.xb = #{xb} + and a.mz = #{mz} + and a.zzmm = #{zzmm} + and a.xh = #{xh} + and a.rxsj = #{rxsj} + and a.csny = #{csny} + and a.dh = #{dh} + and a.nj = #{nj} + and a.xy = #{xy} + and a.zy = #{zy} + and a.bj = #{bj} + and a.kndj = #{kndj} + and t.knrd_type = #{knlx} + and a.knlx2 = #{knlx2} + and a.rkzs = #{rkzs} + and a.yzsr = #{yzsr} + and a.rjyr = #{rjyr} + and a.srly = #{srly} + and a.jtcy = #{jtcy} + and a.sqly = #{sqly} + and a.fdyqm = #{fdyqm} + and a.fdyqmrq = #{fdyqmrq} + and a.ejxyldqm = #{ejxyldqm} + and a.ejxyldqmrq = #{ejxyldqmrq} + and a.xsqm = #{xsqm} + and a.xsqmrq = #{xsqmrq} + and a.csdj = #{csdj} + and a.zzdj = #{zzdj} + and a.zzls = #{zzls} + and a.zp = #{zp} + and a.affix_id = #{affixId} + and a.status1 = #{status1} + and a.status2 = #{status2} + and a.status3 = #{status3} + and a.dz = #{dz} + and a.yb = #{yb} + and a.xxyjrq = #{xxyjrq} + and a.apply_year = #{applyYear} + and a.stu_year_id = #{stuYearId} + + + + update srs_zxj_apply + set sqly = #{sqly} + where id = #{id} + - + and name like concat('%', #{name}, '%') and gender = #{gender} and birthday = #{birthday} @@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and level2units = #{level2units} and serviceHours = #{serviceHours} and jobNature = #{jobNature} + and professional_title = #{professionalTitle} and joinWorkHours = #{joinWorkHours} and highestEducation = #{highestEducation} and educated = #{educated} @@ -78,15 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and college = #{college} - + - + insert into sys_teacher_basicmessage @@ -107,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" level2units, serviceHours, jobNature, + professional_title, joinWorkHours, highestEducation, educated, @@ -134,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{level2units}, #{serviceHours}, #{jobNature}, + #{professionalTitle}, #{joinWorkHours}, #{highestEducation}, #{educated}, @@ -164,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" level2units = #{level2units}, serviceHours = #{serviceHours}, jobNature = #{jobNature}, + professional_title = #{professionalTitle}, joinWorkHours = #{joinWorkHours}, highestEducation = #{highestEducation}, educated = #{educated}, @@ -181,14 +186,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_teacher_basicmessage where teacher_id in + delete from sys_teacher_basicmessage where teacher_id in #{teacherId} - + - delete from sys_teacher_takeclass where teacher_id in + delete from sys_teacher_takeclass where teacher_id in #{teacherId} @@ -204,4 +209,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.takeclassId}, #{item.teacherId}, #{item.college}, #{item.grade}, #{item.classteam}, #{item.number}) - \ No newline at end of file + diff --git a/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java b/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java index acf29ad..fefa2fc 100644 --- a/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java +++ b/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java @@ -218,7 +218,7 @@ public class QgzxStuPostServiceImpl extends ServiceImpl= Integer.parseInt(post.postCount)) { - throw new Exception("该岗位已有别的记录被其指导老师审核通过,不能申请通过"); + throw new Exception("请检查该岗位的在岗人数是否正确"); } param.applyStatus = QgzxApplyStatus.INSTRUCTOR_APPROVED.getCode();