Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改创建主题学期计划bug

Browse Source
This commit is contained in:
sk1551
2020-11-16 14:01:08 +08:00
parent 60209b9b88
commit 34cd4a12ba
2 changed files with 116 additions and 114 deletions
ruoyi-ui
vue.config.js
ruoyi/src/main/java/com/ruoyi/project/benyi/controller
ByThemeTermplanController.java

4
ruoyi-ui/vue.config.js

@ -33,8 +33,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8083`, target: `http://localhost:8083`,
target: `http://120.53.14.147:9990/`, // target: `http://120.53.14.147:9990/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java

@ -112,9 +112,11 @@ public class ByThemeTermplanController extends BaseController {
List<ByThemeTermplan> list = null; List<ByThemeTermplan> list = null;
xnxqNew = byThemeTermplan.getXnxq(); xnxqNew = byThemeTermplan.getXnxq();
mybyThemeTermplan.setXnxq(xnxqNew); mybyThemeTermplan.setXnxq(xnxqNew);
mybyThemeTermplan.setClassid(classId);
mybyThemeTermplan.setStartmonth(null); mybyThemeTermplan.setStartmonth(null);
mybyThemeTermplan.setEndmonth(null); mybyThemeTermplan.setEndmonth(null);
list = byThemeTermplanService.selectByThemeTermplanList(mybyThemeTermplan); list = byThemeTermplanService.selectByThemeTermplanList(mybyThemeTermplan);
System.out.println(list + "学期列表");
// 判断是否存在当前学期计划 // 判断是否存在当前学期计划
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
return AjaxResult.error("当前学年学期计划已经存在，无法创建学期计划"); return AjaxResult.error("当前学年学期计划已经存在，无法创建学期计划");