tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、授课管理

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 62d3df6162
commit 106fcceefa
3 changed files with 206 additions and 112 deletions
Show Stats Download Patch File Download Diff File

123
web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java
Unescape Escape View File

@ -1,17 +1,19 @@
package com.ibeetl.jlw.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeachingManagementDao;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.TeachingManagement;
import com.ibeetl.jlw.dao.*;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.TeachingManagementQuery;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -41,7 +43,13 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
@Validated
public class TeachingManagementService extends CoreBaseService<TeachingManagement> {
@Autowired private TeachingManagementDao teachingManagementDao;
@Autowired
private TeachingManagementDao teachingManagementDao;
@Autowired
private UniversityFacultyDao universityFacultyDao;
@Autowired
private UniversitySystemDao universitySystemDao;
public PageQuery<TeachingManagement> queryByCondition(PageQuery query) {
PageQuery ret = teachingManagementDao.queryByCondition(query);
@ -82,7 +90,8 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
} catch (Exception e) {
try {
teachingManagementList.add(JSONObject.parseObject(teachingManagementQuery.getTeachingManagementJsonStr(), TeachingManagement.class));
} catch (Exception e1) {}
} catch (Exception e1) {
}
}
ToolUtils.deleteNullList(teachingManagementList);
if (null != teachingManagementList && teachingManagementList.size() > 0) {
@ -97,21 +106,91 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
}
public JsonResult add(TeachingManagementQuery teachingManagementQuery) {
String msg = "";
TeachingManagement teachingManagement = teachingManagementQuery.pojo();
teachingManagementDao.insert(teachingManagement);
teachingManagementQuery.setTeacherMergeClassThirdId(teachingManagement.getTeacherMergeClassThirdId());
if (ObjectUtil.isEmpty(teachingManagementQuery.getUniversityFacultyInfo())) {
return JsonResult.failMessage("请选择所属院系");
}
UniversityFaculty universityFaculty = universityFacultyDao.getSQLManager()
.lambdaQuery(UniversityFaculty.class)
.andEq(UniversityFaculty::getUniversityFacultyId, teachingManagementQuery.getUniversityFacultyInfo()).single();
if (ObjectUtil.isEmpty(universityFaculty)) {
return JsonResult.failMessage("查询不到所属院系");
}
if (ObjectUtil.isEmpty(teachingManagementQuery.getUniversitySystemInfo())) {
return JsonResult.failMessage("请选择所属院系");
}
UniversitySystem universitySystem = universitySystemDao.getSQLManager()
.lambdaQuery(UniversitySystem.class)
.andEq(UniversitySystem::getUniversitySystemId, teachingManagementQuery.getUniversitySystemInfo()).single();
if (ObjectUtil.isEmpty(universitySystem)) {
return JsonResult.failMessage("查询不到所属院系");
}
List<TeachingManagement> teacherBoundClassList = JSONObject.parseObject(teachingManagementQuery.getTeacherBoundClass(), new TypeReference<List<TeachingManagement>>() {
});
if (CollectionUtil.isEmpty(teacherBoundClassList)) {
return JsonResult.failMessage("请选择老师绑定班级");
}
List<TeachingManagement> teachingManagementList = new ArrayList<>();
for (TeachingManagement teacherBoundClass : teacherBoundClassList) {
TeachingManagement teachingManagement = new TeachingManagement();
teachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
teachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
teachingManagement.setTeacherInfo(teacherBoundClass.getTeacherInfo());
teachingManagement.setSchoolClassInfo(teacherBoundClass.getSchoolClassInfo());
teachingManagement.setTeacherMergeClassThirdAddTime(new Date());
teachingManagement.setTeacherMergeClassThirdStatus(1);
teachingManagement.setOrgId(teachingManagementQuery.getOrgId());
teachingManagement.setUserId(teachingManagementQuery.getUserId());
teachingManagementList.add(teachingManagement);
}
if (CollectionUtil.isNotEmpty(teachingManagementList)){
teachingManagementDao.insertBatch(teachingManagementList);
}
JsonResult jsonResult = new JsonResult();
jsonResult.setData(teachingManagement.getTeacherMergeClassThirdId());//自增的ID丢进去
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg);
jsonResult.setMsg("新增成功");
// String msg = "";
// teachingManagementQuery.setTeacherMergeClassThirdAddTime(new Date());
// TeachingManagement teachingManagement = teachingManagementQuery.pojo();
// teachingManagementDao.insert(teachingManagement);
// teachingManagementQuery.setTeacherMergeClassThirdId(teachingManagement.getTeacherMergeClassThirdId());
// JsonResult jsonResult = new JsonResult();
// jsonResult.setData(teachingManagement.getTeacherMergeClassThirdId());//自增的ID丢进去
// jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
// jsonResult.setMsg(msg);
return jsonResult;
}
public String edit(TeachingManagementQuery teachingManagementQuery) {
String msg = "";
TeachingManagement teachingManagement = teachingManagementQuery.pojo();
List<TeachingManagement> teacherBoundClassList = JSONObject.parseObject(teachingManagementQuery.getTeacherBoundClass(), new TypeReference<List<TeachingManagement>>() {
});
if (CollectionUtil.isEmpty(teacherBoundClassList)) {
return "请选择老师绑定班级";
}
TeachingManagement teachingManagement = new TeachingManagement();
teachingManagement.setTeacherMergeClassThirdId(teachingManagementQuery.getTeacherMergeClassThirdId());
for (TeachingManagement management : teacherBoundClassList) {
teachingManagement.setSchoolClassInfo(management.getSchoolClassInfo());
}
teachingManagementDao.updateTemplateById(teachingManagement);
String msg = "";
// TeachingManagement teachingManagement = teachingManagementQuery.pojo();
// teachingManagementDao.updateTemplateById(teachingManagement);
return msg;
}
@ -256,28 +335,22 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
if (StringUtils.isBlank(universityFacultyInfo)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行院系信息为空"});
continue;
}else
if(StringUtils.isBlank(universitySystemInfo)){
} else if (StringUtils.isBlank(universitySystemInfo)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行专业信息为空"});
continue;
}else
if(StringUtils.isBlank(teacherInfo)){
} else if (StringUtils.isBlank(teacherInfo)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行教师信息为空"});
continue;
}else
if(StringUtils.isBlank(schoolClassInfo)){
} else if (StringUtils.isBlank(schoolClassInfo)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行班级信息，多个逗号隔开为空"});
continue;
}else
if(StringUtils.isBlank(teacherMergeClassThirdAddTime)){
} else if (StringUtils.isBlank(teacherMergeClassThirdAddTime)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行创建时间为空"});
continue;
}else
if(StringUtils.isBlank(teacherMergeClassThirdStatus)){
} else if (StringUtils.isBlank(teacherMergeClassThirdStatus)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[5]) + 1) + "列，第" + (i + 1) + "行状态 1正常 2删除为空"});
continue;
}else
{
} else {
//TODO 保存
TeachingManagement teachingManagement = new TeachingManagement();
teachingManagement.setUniversityFacultyInfo(universityFacultyInfo);

10
web/src/main/java/com/ibeetl/jlw/web/query/TeachingManagementQuery.java
Unescape Escape View File

@ -50,6 +50,8 @@ public class TeachingManagementQuery extends PageParam {
private String _given;//指定更新的特定字段，多个逗号隔开
private String teacherBoundClass;
public Long getTeacherMergeClassThirdId(){
return teacherMergeClassThirdId;
}
@ -157,4 +159,12 @@ public class TeachingManagementQuery extends PageParam {
public void setTeacherMergeClassThirdStatusPlural(String teacherMergeClassThirdStatusPlural) {
this.teacherMergeClassThirdStatusPlural = teacherMergeClassThirdStatusPlural;
}
public String getTeacherBoundClass() {
return teacherBoundClass;
}
public void setTeacherBoundClass(String teacherBoundClass) {
this.teacherBoundClass = teacherBoundClass;
}
}

17
web/src/main/resources/sql/jlw/teachingManagement.md
Unescape Escape View File

@ -4,9 +4,17 @@ queryByCondition
select
@pageTag(){
t.*
t.*,
la.university_faculty_name AS universityFacultyName,
lb.university_system_name AS universitySystemName,
GROUP_CONCAT(lc.class_name) AS className,
ld.teacher_name AS teacherName
@}
from teaching_management t
LEFT JOIN university_faculty la ON la.university_faculty_id = t.university_faculty_info
LEFT JOIN university_system lb ON lb.university_system_id = t.university_system_info
LEFT JOIN school_class lc ON FIND_IN_SET(lc.class_id,t.school_class_info)
LEFT JOIN teacher ld ON ld.teacher_id = t.teacher_info
where 1=1
@//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
and #function("teachingManagement.query")#
@ -23,7 +31,7 @@ queryByCondition
and t.university_system_info =#universitySystemInfo#
@}
@if(!isEmpty(teacherInfo)){
and t.teacher_info =#teacherInfo#
and ld.teacher_name =#teacherInfo#
@}
@if(!isEmpty(schoolClassInfo)){
and t.school_class_info =#schoolClassInfo#
@ -52,7 +60,10 @@ queryByCondition
@if(!isEmpty(orgIdPlural)){
and find_in_set(t.org_id,#orgIdPlural#)
@}
@pageIgnoreTag(){
GROUP BY
t.teacher_merge_class_third_id
@}
queryByConditionQuery
===

Write Preview
Loading…
Cancel
Save