|
@@ -143,25 +143,25 @@ public class ExportController extends BaseController {
|
|
|
Employee employee = employeeDao.get(sysUser.getId());
|
|
|
if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
throw new BizException("用户所在分部异常");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
throw new BizException("非法请求");
|
|
|
}
|
|
|
}
|
|
|
List<ClassGroupTeachersDto> rows = classGroupService.queryClassGroupPage(queryInfo).getRows();
|
|
|
for (ClassGroupTeachersDto row : rows) {
|
|
|
List<ClassGroupTeacherMapper> classGroupTeacherMapperList = row.getClassGroupTeacherMapperList();
|
|
|
- if(classGroupTeacherMapperList.size() > 0){
|
|
|
+ if (classGroupTeacherMapperList.size() > 0) {
|
|
|
List<ClassGroupTeacherMapper> teachingTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.TEACHING).collect(Collectors.toList());
|
|
|
- if(teachingTeachers.size() > 0){
|
|
|
- row.setTeachingTeacherName(StringUtils.join(teachingTeachers.stream().map(e->e.getUserName()).collect(Collectors.toList()), ","));
|
|
|
+ if (teachingTeachers.size() > 0) {
|
|
|
+ row.setTeachingTeacherName(StringUtils.join(teachingTeachers.stream().map(e -> e.getUserName()).collect(Collectors.toList()), ","));
|
|
|
}
|
|
|
List<ClassGroupTeacherMapper> bishopTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.BISHOP).collect(Collectors.toList());
|
|
|
- if(bishopTeachers.size() > 0){
|
|
|
- row.setBishopTeacherName(StringUtils.join(bishopTeachers.stream().map(e->e.getUserName()).collect(Collectors.toList()),","));
|
|
|
+ if (bishopTeachers.size() > 0) {
|
|
|
+ row.setBishopTeacherName(StringUtils.join(bishopTeachers.stream().map(e -> e.getUserName()).collect(Collectors.toList()), ","));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -288,17 +288,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<ExportStudentAttendanceDto> rows = studentAttendanceService.exportStudentAttendancesQueryPage(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
@@ -367,17 +367,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
queryInfo.setPage(1);
|
|
|
queryInfo.setRows(49999);
|
|
|
List<MusicGroupPaymentCalenderAuditDto> rows = musicGroupPaymentCalenderService.auditList(queryInfo).getRows();
|
|
@@ -416,17 +416,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List rows = teacherAttendanceService.queryTeacherAttendances(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
@@ -496,17 +496,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<StudentBuyPracticeDto> rows = practiceGroupService.studentBuys(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
@@ -621,17 +621,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
Date endTime = queryInfo.getEndTime();
|
|
|
if (endTime != null) {
|
|
|
queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
|
|
@@ -672,17 +672,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
queryInfo.setIsExport(true);
|
|
|
List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
@@ -724,17 +724,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<PracticeGroupDto> rows = practiceGroupService.findPracticeGroups(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
if (rows != null && rows.size() > 0) {
|
|
@@ -787,17 +787,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<VipGroup> rows = vipGroupService.findVipGroups(queryInfo).getRows();
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
if (rows != null && rows.size() > 0) {
|
|
@@ -841,17 +841,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
- queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
+ queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<CourseScheduleEndDto> rows = scheduleService.endFindCourseSchedules(queryInfo).getRows();
|
|
|
for (CourseScheduleEndDto row : rows) {
|
|
|
row.setIsComplaints(StringUtils.equals(row.getIsComplaints(), "1") ? "有" : "无");
|
|
@@ -860,9 +860,9 @@ public class ExportController extends BaseController {
|
|
|
try {
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "课程编号", "开始时间", "结束时间",
|
|
|
"班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
|
|
|
- "教学点", "课程状态", "指导老师", "学员编号", "是否点名", "是否有考勤申诉","预计上课人数"}, new String[]{
|
|
|
+ "教学点", "课程状态", "指导老师", "学员编号", "是否点名", "是否有考勤申诉", "预计上课人数"}, new String[]{
|
|
|
"organName", "id", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
|
|
|
- "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId", "isCallNames.msg", "isComplaints","studentNum"}, rows);
|
|
|
+ "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId", "isCallNames.msg", "isComplaints", "studentNum"}, rows);
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
|
|
|
ouputStream = response.getOutputStream();
|
|
@@ -893,17 +893,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
|
|
|
for (SporadicChargeInfo row : rows) {
|
|
|
row.setOpenFlagStr(row.getOpenFlag().equals(0) ? "开启" : "关闭");
|
|
@@ -1078,12 +1078,12 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/orderList')")
|
|
|
public void orderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && "3".equals(queryInfo.getOrderType())) {
|
|
|
- queryInfo.setRoutingOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && "3".equals(queryInfo.getOrderType())) {
|
|
|
+ queryInfo.setRoutingOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(queryInfo.getSearch())) {
|
|
|
List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
|
|
|
List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
|
|
@@ -1335,9 +1335,9 @@ public class ExportController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
|
|
|
- "下次缴费日期", "是否报名缴费", "是否激活", "是否有剩余VIP", "是否有剩余网管课", "欠费总额"};
|
|
|
+ "下次缴费日期", "是否报名缴费", "是否激活", "是否有剩余VIP", "是否有剩余网管课", "欠费总额"};
|
|
|
String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
|
|
|
- "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName", "hasVip ? '是' : '否'", "hasPractice ? '是' : '否'","noPaymentAmount"};
|
|
|
+ "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName", "hasVip ? '是' : '否'", "hasPractice ? '是' : '否'", "noPaymentAmount"};
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
|
|
@@ -1604,17 +1604,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
- queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
+ queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<ExtraExerciseStudentsDto> rows = extracurricularExercisesReplyService.findExtraExercises(queryInfo).getRows();
|
|
|
if (CollectionUtils.isEmpty(rows)) {
|
|
|
response.setStatus(500);
|
|
@@ -1663,17 +1663,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
- queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
+ queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<StudentExercisesSituationDto> rows = studentExtracurricularExercisesSituationService.findStudentExtracurricularExercisesSituations(queryInfo).getRows();
|
|
|
if (CollectionUtils.isEmpty(rows)) {
|
|
|
response.setStatus(500);
|
|
@@ -1716,17 +1716,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
- queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
+ queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
List<TeacherCourseSalaryDetail4WebDto> rows = courseScheduleTeacherSalaryService.findIsSettlementCourseSalarys(queryInfo).getRows();
|
|
|
if (CollectionUtils.isEmpty(rows)) {
|
|
|
response.setStatus(500);
|
|
@@ -1799,17 +1799,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
PageInfo<Student4operating> PageOperatingStudents = studentManageService.getOperatingStudents(queryInfo);
|
|
|
|
|
|
if (PageOperatingStudents.getTotal() <= 0) {
|
|
@@ -1872,8 +1872,8 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/vipCourseReviews')")
|
|
|
public void vipCourseReviews(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
queryInfo.setIsExport(1);
|
|
|
queryInfo.setPage(1);
|
|
|
queryInfo.setRows(49999);
|
|
@@ -2014,17 +2014,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new IOException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new IOException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
- throw new IOException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new IOException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
|
|
|
+ throw new IOException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
queryInfo.setRows(65000);
|
|
|
PageInfo<CooperationOrgan> pageList = cooperationOrganService.queryPage(queryInfo);
|
|
|
if (pageList.getTotal() <= 0) {
|
|
@@ -2038,7 +2038,7 @@ public class ExportController extends BaseController {
|
|
|
try {
|
|
|
|
|
|
String[] header = {"分部", "单位编号", "单位名称", "联系人", "职位", "手机号", "是否启用"};
|
|
|
- String[] body = {"organization.name", "id", "name", "linkman", "job", "mobileNo","isEnable == true ? '是':'否'"};
|
|
|
+ String[] body = {"organization.name", "id", "name", "linkman", "job", "mobileNo", "isEnable == true ? '是':'否'"};
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=cooperationOrgan-" + DateUtil.getDate(new Date()) + ".xls");
|
|
@@ -2064,10 +2064,10 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/musicGroupRegister')")
|
|
|
public void musicGroupRegister(String organIds, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isBlank(organIds)) {
|
|
|
- organIds = employee.getOrganIdList();
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isBlank(organIds)) {
|
|
|
+ organIds = employee.getOrganIdList();
|
|
|
+ }
|
|
|
List<MusicGroupStatusEnum> musicGroupStatusList = new ArrayList<>();
|
|
|
musicGroupStatusList.add(MusicGroupStatusEnum.APPLY);
|
|
|
musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
|
|
@@ -2189,12 +2189,12 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/routeOrderList')")
|
|
|
public void routeOrderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
|
|
|
- queryInfo.setRoutingOrganId(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
|
|
|
+ queryInfo.setRoutingOrganId(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
+ queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(queryInfo.getSearch())) {
|
|
|
List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
|
|
|
List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
|
|
@@ -2467,10 +2467,10 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/musicGroupNormalStudentNum')")
|
|
|
public void musicGroupNormalStudentNum(String organIds, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isBlank(organIds)) {
|
|
|
- organIds = employee.getOrganIdList();
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isBlank(organIds)) {
|
|
|
+ organIds = employee.getOrganIdList();
|
|
|
+ }
|
|
|
|
|
|
List<MusicGroupStatusEnum> musicGroupStatusList = new ArrayList<>();
|
|
|
musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
|
|
@@ -2561,10 +2561,10 @@ public class ExportController extends BaseController {
|
|
|
@PreAuthorize("@pcs.hasPermissions('export/studentOrder')")
|
|
|
public void studentOrder(String organIds, Date date, HttpServletResponse response) throws IOException {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isBlank(organIds)) {
|
|
|
- organIds = employee.getOrganIdList();
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isBlank(organIds)) {
|
|
|
+ organIds = employee.getOrganIdList();
|
|
|
+ }
|
|
|
Date startTime = DateUtil.getFirstDayOfMonth(date);
|
|
|
Date EndTime = DateUtil.getLastSecondWithDay(DateUtil.getLastDayOfMonth(date));
|
|
|
|
|
@@ -2657,17 +2657,17 @@ public class ExportController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
|
}
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
- queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
- } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
- throw new BizException("用户所在分部异常");
|
|
|
- } else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
- throw new BizException("非法请求");
|
|
|
- }
|
|
|
+ Employee employee = employeeDao.get(sysUser.getId());
|
|
|
+ if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
|
|
|
+ queryInfo.setOrganIdList(employee.getOrganIdList());
|
|
|
+ } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
|
|
|
+ throw new BizException("用户所在分部异常");
|
|
|
+ } else {
|
|
|
+ List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
+ if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
|
|
|
+ throw new BizException("非法请求");
|
|
|
}
|
|
|
+ }
|
|
|
if (queryInfo.getEndTime() != null) {
|
|
|
queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
|
|
|
}
|