园历优化
This commit is contained in:
zhanglipeng
parent
22530d650d
commit
71aa96ced9
@ -148,8 +148,8 @@ public class ByCalendarController extends BaseController {
|
||||
//将类型颜色样式加载到字典
|
||||
HashMap<String, String> hashMap = new HashMap<>();
|
||||
for (SysDictData calendartype : dictDataService.selectDictDataByType("sys_schoolcalendartype")) {
|
||||
System.out.println("====sys_yebjlx.getDictValue()" + calendartype.getDictValue());
|
||||
System.out.println("=====calendartype.getCssClass()" + calendartype.getCssClass());
|
||||
//System.out.println("====sys_yebjlx.getDictValue()" + calendartype.getDictValue());
|
||||
//System.out.println("=====calendartype.getCssClass()" + calendartype.getCssClass());
|
||||
hashMap.put(calendartype.getDictValue(), calendartype.getCssClass());
|
||||
}
|
||||
//定义返回列表
|
||||
@ -162,7 +162,7 @@ public class ByCalendarController extends BaseController {
|
||||
ByCalendarShow by = new ByCalendarShow();
|
||||
by.setId(calendar.getId());
|
||||
by.setTitle(calendar.getName());
|
||||
System.out.println("title:" + calendar.getName());
|
||||
//System.out.println("title:" + calendar.getName());
|
||||
by.setStart(formatter.format(calendar.getActivitytime()));
|
||||
by.setEnd(formatter.format(calendar.getActivityendtime()));
|
||||
by.setColor(hashMap.get(calendar.getType()));
|
||||
@ -189,12 +189,15 @@ public class ByCalendarController extends BaseController {
|
||||
listvi.addAll(getbyclassthemes(classId, formatter, hashMap));
|
||||
//根据班级加载幼儿生日
|
||||
listvi.addAll(getbychilds(classId, formatter));
|
||||
}else{
|
||||
} else {
|
||||
Long schoolId = SecurityUtils.getLoginUser().getUser().getDeptId();
|
||||
//幼儿一日流程评估计划
|
||||
listvi.addAll(getdayflowdata(classId, formatter));
|
||||
//根据不同的幼儿园加载教职工
|
||||
listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap));
|
||||
//只有管理员可见
|
||||
if (schoolCommon.isSchoolAdmin()) {
|
||||
listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap));
|
||||
}
|
||||
}
|
||||
|
||||
//幼儿出勤人数
|
||||
@ -261,7 +264,7 @@ public class ByCalendarController extends BaseController {
|
||||
|
||||
List<ByCalendarShow> listvi = new ArrayList<>();
|
||||
//系统内员工的生日、入职日期信息
|
||||
System.out.println("listTeacherBirth.size()===" + listTeacherBirth.size());
|
||||
//System.out.println("listTeacherBirth.size()===" + listTeacherBirth.size());
|
||||
if (listTeacherBirth != null && listTeacherBirth.size() > 0) {
|
||||
for (int i = 0; i < listTeacherBirth.size(); i++) {
|
||||
|
||||
@ -270,7 +273,7 @@ public class ByCalendarController extends BaseController {
|
||||
//创建一个教师实体类，并赋值
|
||||
byTeacherJbxx = listTeacherBirth.get(i);
|
||||
String strCurrentYear = schoolCommon.getCurrentYear();
|
||||
System.out.println("当前年===" + strCurrentYear);
|
||||
//System.out.println("当前年===" + strCurrentYear);
|
||||
|
||||
//参加工作日期
|
||||
if (byTeacherJbxx.getCjgzrq() != null) {
|
||||
@ -285,7 +288,7 @@ public class ByCalendarController extends BaseController {
|
||||
//教师生日颜色
|
||||
by.setColor("#13c2c2");
|
||||
listvi.add(by);
|
||||
System.out.println("当前年工作日期timefor===" + timefor + "=====" + listTeacherBirth.get(i).getUser().getNickName() + "-合同满年期限");
|
||||
//System.out.println("当前年工作日期timefor===" + timefor + "=====" + listTeacherBirth.get(i).getUser().getNickName() + "-合同满年期限");
|
||||
}
|
||||
//生日
|
||||
if (byTeacherJbxx.getCsrq() != null) {
|
||||
@ -300,7 +303,7 @@ public class ByCalendarController extends BaseController {
|
||||
//教师生日颜色
|
||||
by.setColor("#722ed1");
|
||||
listvi.add(by);
|
||||
System.out.println("当前年生日timefor===" + timefor + "=====" + listTeacherBirth.get(i).getUser().getNickName() + "-生日");
|
||||
//System.out.println("当前年生日timefor===" + timefor + "=====" + listTeacherBirth.get(i).getUser().getNickName() + "-生日");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,9 +69,6 @@ public class BySchoolcalendarController extends BaseController {
|
||||
bySchoolcalendar.setXnxq(schoolCommon.getCurrentXn());
|
||||
//系统内设置的园历信息
|
||||
List<BySchoolcalendar> list = bySchoolcalendarService.selectBySchoolcalendarList(bySchoolcalendar);
|
||||
//系统内员工生日信息 系统内员工入职日期
|
||||
ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();
|
||||
List<ByTeacherJbxx> listTeacherBirth = byTeacherJbxxService.selectByTeacherJbxxList(byTeacherJbxx);
|
||||
ByThings byThings = null;
|
||||
List<ByThings> listThings = new ArrayList<>();
|
||||
//系统内设置的园历信息
|
||||
@ -90,6 +87,10 @@ public class BySchoolcalendarController extends BaseController {
|
||||
}
|
||||
}
|
||||
|
||||
//系统内员工生日信息 系统内员工入职日期
|
||||
ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();
|
||||
List<ByTeacherJbxx> listTeacherBirth = byTeacherJbxxService.selectByTeacherJbxxList(byTeacherJbxx);
|
||||
|
||||
//系统内员工的生日、入职日期信息
|
||||
if (listTeacherBirth != null && listTeacherBirth.size() > 0) {
|
||||
for (int i = 0; i < listTeacherBirth.size(); i++) {
|
||||
@ -97,28 +98,28 @@ public class BySchoolcalendarController extends BaseController {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
//创建一个教师实体类，并赋值
|
||||
byTeacherJbxx=listTeacherBirth.get(i);
|
||||
String strCurrentYear=schoolCommon.getCurrentYear();
|
||||
byTeacherJbxx = listTeacherBirth.get(i);
|
||||
String strCurrentYear = schoolCommon.getCurrentYear();
|
||||
System.out.println("当前年===" + strCurrentYear);
|
||||
|
||||
//参加工作日期
|
||||
if(byTeacherJbxx.getCjgzrq()!=null){
|
||||
if (byTeacherJbxx.getCjgzrq() != null) {
|
||||
byThings = new ByThings();
|
||||
byThings.setYears(strCurrentYear);
|
||||
System.out.println("参加工作日期==="+sdf.format(byTeacherJbxx.getCjgzrq()));
|
||||
System.out.println("参加工作日期===" + sdf.format(byTeacherJbxx.getCjgzrq()));
|
||||
byThings.setMonths(sdf.format(byTeacherJbxx.getCjgzrq()).split("-")[1]);//2020-04-12 月
|
||||
byThings.setDays(sdf.format(byTeacherJbxx.getCjgzrq()).split("-")[2]);//2020-04-12 日
|
||||
byThings.setThings(listTeacherBirth.get(i).getUser().getNickName()+"-合同满年期限");
|
||||
byThings.setThings(listTeacherBirth.get(i).getUser().getNickName() + "-合同满年期限");
|
||||
|
||||
listThings.add(byThings);
|
||||
}
|
||||
//生日
|
||||
if(byTeacherJbxx.getCsrq()!=null){
|
||||
if (byTeacherJbxx.getCsrq() != null) {
|
||||
byThings = new ByThings();
|
||||
byThings.setYears(strCurrentYear);
|
||||
byThings.setMonths(sdf.format(byTeacherJbxx.getCsrq()).split("-")[1]);//2020-04-12 月
|
||||
byThings.setDays(sdf.format(byTeacherJbxx.getCsrq()).split("-")[2]);//2020-04-12 日
|
||||
byThings.setThings(listTeacherBirth.get(i).getUser().getNickName()+"-生日");
|
||||
byThings.setThings(listTeacherBirth.get(i).getUser().getNickName() + "-生日");
|
||||
|
||||
listThings.add(byThings);
|
||||
}
|
||||
|
||||
@ -149,6 +149,26 @@ public class SchoolCommon {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 判断当前用户是否为学校管理员(学校管理员和教学主任)
|
||||
**/
|
||||
public boolean isSchoolAdmin() {
|
||||
boolean b = false;
|
||||
List<SysRole> list = SecurityUtils.getLoginUser().getUser().getRoles();
|
||||
System.out.println("roles:" + list.size());
|
||||
|
||||
if (list != null && list.size() > 0) {
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
String strKey = list.get(i).getRoleKey();
|
||||
if (strKey.equals("school_admin") || strKey.equals("school_director")) {
|
||||
b = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断当前用户是否拥有班级
|
||||
**/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user