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

ios日期不显示 周计划审核不显示主题 直接跳转到课程树折叠

Browse Source
This commit is contained in:
zhanglipeng
2021-09-04 22:05:25 +08:00
parent f88a929c20
commit 7d44e1650d
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/utils/ruoyi.js
View File

@ -18,7 +18,7 @@ export function parseTime(time, pattern) {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time) time = parseInt(time)
} else if (typeof time === 'string') { } else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/'); time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
} }
if ((typeof time === 'number') && (time.toString().length === 10)) { if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000 time = time * 1000

2
ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue
View File

@ -19,7 +19,7 @@
:expand-on-click-node="true" :expand-on-click-node="true"
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
default-expand-all :default-expand-all="false"
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
</div> </div>

25
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
View File

@ -63,11 +63,18 @@ public class ByThemeMonthplanController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) { public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) {
byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
String classId = schoolCommon.getClassId(); //参数传进来的班级编号
String strClassId = byThemeMonthplan.getClassid();
List<ByThemeMonthplan> list = null; List<ByThemeMonthplan> list = null;
//首先判断当前账户是否为幼儿园账号 //如果传进来的班级编号为空，那么就认为是本身查询
if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) { if (schoolCommon.isStringEmpty(strClassId)) {
byThemeMonthplan.setClassid(classId); String classId = schoolCommon.getClassId();
//首先判断当前账户是否为幼儿园账号
if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
byThemeMonthplan.setClassid(classId);
}
}else{
byThemeMonthplan.setClassid(strClassId);
} }
startPage(); startPage();
list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan); list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
@ -105,11 +112,11 @@ public class ByThemeMonthplanController extends BaseController {
@PreAuthorize("@ss.hasPermi('benyi:thememonthplan:query')") @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) { public AjaxResult getInfo(@PathVariable("id") String id) {
AjaxResult ajax=AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ByThemeMonthplan byThemeMonthplan=byThemeMonthplanService.selectByThemeMonthplanById(id); ByThemeMonthplan byThemeMonthplan = byThemeMonthplanService.selectByThemeMonthplanById(id);
ajax.put(AjaxResult.DATA_TAG, byThemeMonthplan); ajax.put(AjaxResult.DATA_TAG, byThemeMonthplan);
ajax.put("classname",byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc()); ajax.put("classname", byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc());
ajax.put("createusername",userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName()); ajax.put("createusername", userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName());
return ajax; return ajax;
} }
@ -127,7 +134,7 @@ public class ByThemeMonthplanController extends BaseController {
String bjtypeNew = byClassService.selectByClassById(classId).getBjtype(); String bjtypeNew = byClassService.selectByClassById(classId).getBjtype();
if (bjtypeNew.equals("1")) { if (bjtypeNew.equals("1")) {
return AjaxResult.error("当前班级为托班，无法创建计划"); return AjaxResult.error("当前班级为托班，无法创建计划");
}else { } else {
//根据当前月份 查找学期计划的主题 //根据当前月份 查找学期计划的主题
ByThemeTermplan byThemeTermplan = new ByThemeTermplan(); ByThemeTermplan byThemeTermplan = new ByThemeTermplan();
byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());