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

幼儿园和幼儿园班级园历展示优化，弹出层显示

Browse Source
This commit is contained in:
zhanglipeng
2021-08-02 15:20:55 +08:00
parent 13f5bcfe89
commit 23dc256ce0
5 changed files with 139 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java
View File

@ -237,6 +237,7 @@ public class ByCalendarController extends BaseController {
by.setStart(formatter.format(bsc.getActivitytime()));
by.setEnd(formatter.format(bsc.getActivityendtime()));
by.setColor(hashMap.get(bsc.getType()));
by.setGroupId("2");//代表学校园历信息
listvi.add(by);
}
}
@ -324,6 +325,7 @@ public class ByCalendarController extends BaseController {
by.setStart(formatter.format(bscc.getActivitytime()));
by.setEnd(formatter.format(bscc.getActivityendtime()));
by.setColor(hashMap.get(bscc.getType()));
by.setGroupId("1");//代表班级园历信息
listvi.add(by);
}
}

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarClassController.java
View File

@ -87,7 +87,7 @@ public class BySchoolcalendarClassController extends BaseController {
/**
* 获取园历管理(班级)详细信息
*/
@PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:query')")
@PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:query')"+ "||@ss.hasPermi('benyi:schoolcalendar:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(bySchoolcalendarClassService.selectBySchoolcalendarClassById(id));

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarController.java
View File

@ -145,7 +145,7 @@ public class BySchoolcalendarController extends BaseController {
/**
* 获取园历管理详细信息
*/
@PreAuthorize("@ss.hasPermi('benyi:schoolcalendar:query')")
@PreAuthorize("@ss.hasPermi('benyi:schoolcalendar:query')" + "||@ss.hasPermi('benyi:schoolcalendarclass:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
AjaxResult ajax = AjaxResult.success();

9
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCalendarShow.java
View File

@ -11,6 +11,7 @@ public class ByCalendarShow {
private String start;
private String end;
private String color;
private String groupId;
public Long getId() {
return id;
@ -51,4 +52,12 @@ public class ByCalendarShow {
public void setColor(String color) {
this.color = color;
}
public String getGroupId() {
return groupId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
}