diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index 3e719087..9f84b5d1 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -4432,9 +4432,9 @@ Shadow=0 1662647833 -1665583780 -((277230,14785), (285141,27625)) -((277230,14785),(277230,20457),(284841,20457),(284841,27625)) +1665821828 +((276450,14759), (285141,27625)) +((276450,14759),(276450,20457),(284841,20457),(284841,27625)) 1 8 16744576 @@ -5776,11 +5776,11 @@ LABL 0 新宋体,8,N - + 1661955443 -1665583780 +1665821830 -1 -((267863,10624), (286863,18804)) +((270513,-376), (289513,7804)) 0 12615680 16570034 @@ -5800,7 +5800,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5827,7 +5827,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5852,7 +5852,7 @@ LABL 0 新宋体,8,N 65 16777215 - + @@ -5879,7 +5879,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5906,10 +5906,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662045362 1665199908 -1 @@ -5933,7 +5933,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5960,7 +5960,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5987,7 +5987,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6014,10 +6014,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662554252 1663853151 -1 @@ -6041,10 +6041,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662648377 1662650462 -1 @@ -6068,10 +6068,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662648708 1662650462 -1 @@ -6095,7 +6095,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6122,7 +6122,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6149,7 +6149,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6176,14 +6176,14 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662982569 -1665583780 +1665821833 -1 -((271478,-1181), (289616,7449)) +((267828,9850), (285966,18998)) 0 12615680 16570034 @@ -13842,15 +13842,15 @@ COLLATE = utf8_general_ci - + 719165CF-662B-4A1D-B61A-61F3E22AAD95 teacher_open_course_merge_student teacher_open_course_merge_student 1661850632 lx -1663402294 +1665821823 lx -课程开课-关联-学生 +课程开课-关联-学生（暂时没用到） auto_increment = 1 ENGINE = InnoDB DEFAULT CHARACTER SET = utf8 @@ -13943,7 +13943,7 @@ COLLATE = utf8_general_ci - + 45F61D05-97D1-445E-9E51-21891A114F4B teacher_open_course_schedule_session_tag teacher_open_course_schedule_session_tag @@ -14069,7 +14069,7 @@ COLLATE = utf8_general_ci - + A4E7AF70-5FE3-4492-846C-7D9DF4898C1B teacher_open_course_student_signin_setting teacher_open_course_student_signin_setting @@ -14249,7 +14249,7 @@ COLLATE = utf8_general_ci - + A0A79325-1780-4971-9340-DEFA00A2BA0F teacher_open_course_chat_log teacher_open_course_chat_log @@ -14444,7 +14444,7 @@ COLLATE = utf8_general_ci - + 520E1690-D890-46CE-A852-B26097FAB204 teacher_open_course_question_log teacher_open_course_question_log @@ -14700,7 +14700,7 @@ COLLATE = utf8_general_ci - + 91A7D22A-A6C5-4B52-B64F-D0BABC0C48C1 core_setting core_setting @@ -14819,7 +14819,7 @@ COLLATE = utf8_general_ci - + 33716A99-CF47-4683-BFD3-ACC1CD227EF6 teacher_open_course_score_dashboard teacher_open_course_score_dashboard @@ -15020,7 +15020,7 @@ COLLATE = utf8_general_ci - + F4E82872-4068-46F7-9B5C-B433DE7B6C23 teacher_open_course_notice teacher_open_course_notice @@ -15174,7 +15174,7 @@ COLLATE = utf8_general_ci - + BD914759-3D83-49FF-93CC-41EE47EB15E9 teacher_open_course_knowledge_point teacher_open_course_knowledge_point @@ -15315,7 +15315,7 @@ COLLATE = utf8_general_ci - + CF45BE88-FE14-4BD6-86FC-5E873A2A4556 student_client_link student_client_link @@ -15475,7 +15475,7 @@ COLLATE = utf8_general_ci - + BA9D5B11-390C-4ABE-AFA7-1ED14A6FD2AB university_system university_system @@ -15612,7 +15612,7 @@ COLLATE = utf8_general_ci - + 27EC9DD6-9440-4F6A-B972-818911A7DEFC university_faculty university_faculty @@ -15761,7 +15761,7 @@ COLLATE = utf8_general_ci - + D5147AE5-08B1-41FE-A2F9-990459D06929 teacher_open_course_schedule_session_class teacher_open_course_schedule_session_class @@ -15864,7 +15864,7 @@ COLLATE = utf8_general_ci - + D847CA4B-D140-400C-BB77-A4FBB89EB9D8 teacher_open_course_schedule_session teacher_open_course_schedule_session @@ -16023,7 +16023,7 @@ COLLATE = utf8_general_ci - + 77852AFF-718A-4027-9410-5E6B6AB883C5 teacher_open_course_merge_teacher teacher_open_course_merge_teacher @@ -18159,7 +18159,7 @@ COLLATE = utf8_general_ci - + @@ -18169,7 +18169,7 @@ COLLATE = utf8_general_ci 1661960842 lx - + @@ -18182,10 +18182,10 @@ COLLATE = utf8_general_ci 1662809978 lx - + - + @@ -18198,7 +18198,7 @@ COLLATE = utf8_general_ci - + @@ -18211,7 +18211,7 @@ COLLATE = utf8_general_ci - + @@ -18224,7 +18224,7 @@ COLLATE = utf8_general_ci - + @@ -18237,20 +18237,20 @@ COLLATE = utf8_general_ci - + 0DDD8BBF-82DB-43A4-BDB8-B43EFB2BCDD2 1662647833 lx -1662647861 +1665821809 lx - + @@ -18260,10 +18260,10 @@ COLLATE = utf8_general_ci 1662810021 lx - + - + @@ -18276,7 +18276,7 @@ COLLATE = utf8_general_ci - + @@ -18289,7 +18289,7 @@ COLLATE = utf8_general_ci - + @@ -18338,7 +18338,7 @@ COLLATE = utf8_general_ci 1664461421 Administrator - + @@ -18354,7 +18354,7 @@ COLLATE = utf8_general_ci - + diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 3e719087..9a06ac0a 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4432,9 +4432,9 @@ Shadow=0 1662647833 -1665583780 -((277230,14785), (285141,27625)) -((277230,14785),(277230,20457),(284841,20457),(284841,27625)) +1665821828 +((276450,14759), (285141,27625)) +((276450,14759),(276450,20457),(284841,20457),(284841,27625)) 1 8 16744576 @@ -5776,11 +5776,11 @@ LABL 0 新宋体,8,N - + 1661955443 -1665583780 +1665821830 -1 -((267863,10624), (286863,18804)) +((270513,-376), (289513,7804)) 0 12615680 16570034 @@ -5800,7 +5800,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5827,7 +5827,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5852,7 +5852,7 @@ LABL 0 新宋体,8,N 65 16777215 - + @@ -5879,7 +5879,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5906,10 +5906,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662045362 1665199908 -1 @@ -5933,7 +5933,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5960,7 +5960,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -5987,7 +5987,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6014,10 +6014,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662554252 1663853151 -1 @@ -6041,10 +6041,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662648377 1662650462 -1 @@ -6068,10 +6068,10 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662648708 1662650462 -1 @@ -6095,7 +6095,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6122,7 +6122,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6149,7 +6149,7 @@ LABL 0 新宋体,8,N 16777215 1 - + @@ -6176,14 +6176,14 @@ LABL 0 新宋体,8,N 16777215 1 - + - + 1662982569 -1665583780 +1665821833 -1 -((271478,-1181), (289616,7449)) +((267828,9850), (285966,18998)) 0 12615680 16570034 @@ -13528,9 +13528,9 @@ COLLATE = utf8_general_ci school_class_student 1563157584 lx -1661953827 +1665822005 lx -班级-学生-关联 +班级-学生-关联（没用到） auto_increment = 1 ENGINE = InnoDB DEFAULT CHARACTER SET = utf8 @@ -13842,15 +13842,15 @@ COLLATE = utf8_general_ci - + 719165CF-662B-4A1D-B61A-61F3E22AAD95 teacher_open_course_merge_student teacher_open_course_merge_student 1661850632 lx -1663402294 +1665821823 lx -课程开课-关联-学生 +课程开课-关联-学生（暂时没用到） auto_increment = 1 ENGINE = InnoDB DEFAULT CHARACTER SET = utf8 @@ -13943,7 +13943,7 @@ COLLATE = utf8_general_ci - + 45F61D05-97D1-445E-9E51-21891A114F4B teacher_open_course_schedule_session_tag teacher_open_course_schedule_session_tag @@ -14069,7 +14069,7 @@ COLLATE = utf8_general_ci - + A4E7AF70-5FE3-4492-846C-7D9DF4898C1B teacher_open_course_student_signin_setting teacher_open_course_student_signin_setting @@ -14249,7 +14249,7 @@ COLLATE = utf8_general_ci - + A0A79325-1780-4971-9340-DEFA00A2BA0F teacher_open_course_chat_log teacher_open_course_chat_log @@ -14444,7 +14444,7 @@ COLLATE = utf8_general_ci - + 520E1690-D890-46CE-A852-B26097FAB204 teacher_open_course_question_log teacher_open_course_question_log @@ -14700,7 +14700,7 @@ COLLATE = utf8_general_ci - + 91A7D22A-A6C5-4B52-B64F-D0BABC0C48C1 core_setting core_setting @@ -14819,7 +14819,7 @@ COLLATE = utf8_general_ci - + 33716A99-CF47-4683-BFD3-ACC1CD227EF6 teacher_open_course_score_dashboard teacher_open_course_score_dashboard @@ -15020,7 +15020,7 @@ COLLATE = utf8_general_ci - + F4E82872-4068-46F7-9B5C-B433DE7B6C23 teacher_open_course_notice teacher_open_course_notice @@ -15174,7 +15174,7 @@ COLLATE = utf8_general_ci - + BD914759-3D83-49FF-93CC-41EE47EB15E9 teacher_open_course_knowledge_point teacher_open_course_knowledge_point @@ -15315,7 +15315,7 @@ COLLATE = utf8_general_ci - + CF45BE88-FE14-4BD6-86FC-5E873A2A4556 student_client_link student_client_link @@ -15475,7 +15475,7 @@ COLLATE = utf8_general_ci - + BA9D5B11-390C-4ABE-AFA7-1ED14A6FD2AB university_system university_system @@ -15612,7 +15612,7 @@ COLLATE = utf8_general_ci - + 27EC9DD6-9440-4F6A-B972-818911A7DEFC university_faculty university_faculty @@ -15761,7 +15761,7 @@ COLLATE = utf8_general_ci - + D5147AE5-08B1-41FE-A2F9-990459D06929 teacher_open_course_schedule_session_class teacher_open_course_schedule_session_class @@ -15864,7 +15864,7 @@ COLLATE = utf8_general_ci - + D847CA4B-D140-400C-BB77-A4FBB89EB9D8 teacher_open_course_schedule_session teacher_open_course_schedule_session @@ -16023,7 +16023,7 @@ COLLATE = utf8_general_ci - + 77852AFF-718A-4027-9410-5E6B6AB883C5 teacher_open_course_merge_teacher teacher_open_course_merge_teacher @@ -18159,7 +18159,7 @@ COLLATE = utf8_general_ci - + @@ -18169,7 +18169,7 @@ COLLATE = utf8_general_ci 1661960842 lx - + @@ -18182,10 +18182,10 @@ COLLATE = utf8_general_ci 1662809978 lx - + - + @@ -18198,7 +18198,7 @@ COLLATE = utf8_general_ci - + @@ -18211,7 +18211,7 @@ COLLATE = utf8_general_ci - + @@ -18224,7 +18224,7 @@ COLLATE = utf8_general_ci - + @@ -18237,20 +18237,20 @@ COLLATE = utf8_general_ci - + 0DDD8BBF-82DB-43A4-BDB8-B43EFB2BCDD2 1662647833 lx -1662647861 +1665821809 lx - + @@ -18260,10 +18260,10 @@ COLLATE = utf8_general_ci 1662810021 lx - + - + @@ -18276,7 +18276,7 @@ COLLATE = utf8_general_ci - + @@ -18289,7 +18289,7 @@ COLLATE = utf8_general_ci - + @@ -18338,7 +18338,7 @@ COLLATE = utf8_general_ci 1664461421 Administrator - + @@ -18354,7 +18354,7 @@ COLLATE = utf8_general_ci - + diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassStudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassStudentDao.java deleted file mode 100644 index b451e371..00000000 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassStudentDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ibeetl.jlw.dao; - -import com.ibeetl.jlw.entity.SchoolClassStudent; -import com.ibeetl.jlw.web.query.SchoolClassStudentQuery; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.mapper.BaseMapper; -import org.beetl.sql.mapper.annotation.SqlResource; -import org.beetl.sql.mapper.annotation.Update; - -import java.util.List; - -/** - * 班级关联学生 Dao - */ -@SqlResource("jlw.schoolClassStudent") -public interface SchoolClassStudentDao extends BaseMapper{ - PageQuery queryByCondition(PageQuery query); - PageQuery queryByConditionQuery(PageQuery query); - @Update - void deleteSchoolClassStudentByIds(String ids); - @Update - int updateGivenByIds(SchoolClassStudentQuery schoolClassStudentQuery); - List getByIds(String ids); - List getValuesByQuery(SchoolClassStudentQuery schoolClassStudentQuery); -} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClassStudent.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClassStudent.java deleted file mode 100644 index 7e0a19d7..00000000 --- a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClassStudent.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.ibeetl.jlw.entity; - -import com.ibeetl.admin.core.annotation.Dict; -import com.ibeetl.admin.core.entity.BaseEntity; -import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.annotation.entity.AssignID; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/* -* 班级-学生-关联 -* gen by Spring Boot2 Admin 2022-09-20 -*/ -public class SchoolClassStudent extends BaseEntity{ - - //班级-学生-关联ID - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - // @SeqID(name = ORACLE_CORE_SEQ_NAME) - @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.SchoolClassStudent") - - private Long schoolClassStudentId ; - - //班级ID - @Dict(type="school_class.class_name.class_status=1") - - private Long schoolClassId ; - - //学生ID - @Dict(type="student.student_name.student_status=1") - - private String studentId ; - - //添加时间 - - private Date addTime ; - - //组织机构ID - - private Long orgId ; - - //后台用户ID - - private Long userId ; - - public SchoolClassStudent(){ - } - - /**班级-学生-关联ID - *@return - */ - public Long getSchoolClassStudentId(){ - return schoolClassStudentId; - } - /**班级-学生-关联ID - *@param schoolClassStudentId - */ - public void setSchoolClassStudentId(Long schoolClassStudentId){ - this.schoolClassStudentId = schoolClassStudentId; - } - - /**班级ID - *@return - */ - public Long getSchoolClassId(){ - return schoolClassId; - } - /**班级ID - *@param schoolClassId - */ - public void setSchoolClassId(Long schoolClassId){ - this.schoolClassId = schoolClassId; - } - - /**学生ID - *@return - */ - public String getStudentId(){ - return studentId; - } - /**学生ID - *@param studentId - */ - public void setStudentId(String studentId){ - this.studentId = studentId; - } - - /**添加时间 - *@return - */ - public Date getAddTime(){ - return addTime; - } - /**添加时间 - *@param addTime - */ - public void setAddTime(Date addTime){ - this.addTime = addTime; - } - - /**组织机构ID - *@return - */ - public Long getOrgId(){ - return orgId; - } - /**组织机构ID - *@param orgId - */ - public void setOrgId(Long orgId){ - this.orgId = orgId; - } - - /**后台用户ID - *@return - */ - public Long getUserId(){ - return userId; - } - /**后台用户ID - *@param userId - */ - public void setUserId(Long userId){ - this.userId = userId; - } - - -} diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassStudentService.java deleted file mode 100644 index cea658ae..00000000 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassStudentService.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.ibeetl.jlw.service; - -import cn.jlw.util.ToolUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.ibeetl.admin.core.service.CoreBaseService; -import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.admin.core.web.JsonReturnCode; -import com.ibeetl.jlw.dao.SchoolClassStudentDao; -import com.ibeetl.jlw.entity.SchoolClassStudent; -import com.ibeetl.jlw.web.query.SchoolClassStudentQuery; -import org.apache.commons.lang3.StringUtils; -import org.beetl.sql.core.SqlId; -import org.beetl.sql.core.engine.PageQuery; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 班级关联学生 Service - * 当分布式ID开启后请勿使用insert(*,true) - */ - -@Service -@Transactional -public class SchoolClassStudentService extends CoreBaseService{ - - @Resource private SchoolClassStudentDao schoolClassStudentDao; - - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = schoolClassStudentDao.queryByCondition(query); - queryListAfter(ret.getList()); - return ret; - } - - public PageQueryqueryByConditionQuery(PageQuery query){ - PageQuery ret = schoolClassStudentDao.queryByConditionQuery(query); - queryListAfter(ret.getList()); - return ret; - } - - public void deleteByList(List list){ - String ids = ""; - ToolUtils.deleteNullList(list); - for(int i=0;null != list && i schoolClassStudentList = new ArrayList<>(); - try { - schoolClassStudentList = JSON.parseArray(schoolClassStudentQuery.getSchoolClassStudentJsonStr(), SchoolClassStudent.class); - } catch (Exception e) { - try { - schoolClassStudentList.add(JSONObject.parseObject(schoolClassStudentQuery.getSchoolClassStudentJsonStr(), SchoolClassStudent.class)); - } catch (Exception e1) {} - } - ToolUtils.deleteNullList(schoolClassStudentList); - if(null != schoolClassStudentList && schoolClassStudentList.size()>0){ - for(int i=0;i 0; - if(!flag){ - msg = "更新指定参数失败"; - } - }else{ - msg = "指定参数为空"; - } - return msg; - } - - public List getValues (Object paras){ - return sqlManager.select(SqlId.of("jlw.schoolClassStudent.getSchoolClassStudentValues"), SchoolClassStudent.class, paras); - } - - public List getValuesByQuery (SchoolClassStudentQuery schoolClassStudentQuery){ - return schoolClassStudentDao.getValuesByQuery(schoolClassStudentQuery); - } - - public SchoolClassStudent getInfo (Long schoolClassStudentId){ - SchoolClassStudentQuery schoolClassStudentQuery = new SchoolClassStudentQuery(); - schoolClassStudentQuery.setSchoolClassStudentId(schoolClassStudentId); - List list = schoolClassStudentDao.getValuesByQuery(schoolClassStudentQuery); - if(null != list && list.size()>0){ - return list.get(0); - }else{ - return null; - } - } - - public SchoolClassStudent getInfo (SchoolClassStudentQuery schoolClassStudentQuery){ - List list = schoolClassStudentDao.getValuesByQuery(schoolClassStudentQuery); - if(null != list && list.size()>0){ - return list.get(0); - }else{ - return null; - } - } - -} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java index 9d546a9b..1db09a5d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java @@ -8,12 +8,12 @@ import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; -import com.ibeetl.jlw.dao.SchoolClassStudentDao; +import com.ibeetl.jlw.dao.StudentDao; import com.ibeetl.jlw.dao.TeacherOpenCourseMergeSchoolClassDao; import com.ibeetl.jlw.dao.TeacherOpenCourseMergeStudentDao; +import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; -import com.ibeetl.jlw.web.query.SchoolClassStudentQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeSchoolClassQuery; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.SqlId; @@ -38,7 +38,7 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseMergeSchoolClassDao.queryByCondition(query); @@ -109,28 +109,30 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService teacherOpenCourseMergeStudentList = Optional // 查询该班级下的学生列表 - .fromNullable(schoolClassStudentDao.getValuesByQuery(schoolClassStudentQuery)).get() + .fromNullable(studentDao.template(student)).get() .stream().map(scs -> { TeacherOpenCourseMergeStudent entity = new TeacherOpenCourseMergeStudent(); entity.setTeacherOpenCourseId(teacherOpenCourseMergeSchoolClass.getTeacherOpenCourseId()); - entity.setStudentId(Long.parseLong(scs.getStudentId())); + entity.setStudentId(scs.getStudentId()); entity.setTeacherOpenCourseSchoolClassMergeStudentAddTime(new Date()); return entity; }).collect(Collectors.toList()); @@ -139,7 +141,7 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService getFirstErrorMessage(isAbsentValidationResult.getErrorMessages())); signinLogQuery.setTeacherOpenCourseStudentSigninLogRemark(signinDTO.getTeacherOpenCourseStudentSigninLogRemark()); @@ -372,10 +371,11 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService getPageList(SchoolClassStudentQuery condition,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - PageQuery page = condition.getPageQuery(); - schoolClassStudentService.queryByConditionQuery(page); - return JsonResult.success(page); - } - } - - - @GetMapping(API + "/getInfo.do") - public JsonResultgetInfo(SchoolClassStudentQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - SchoolClassStudent schoolClassStudent = schoolClassStudentService.getInfo(param); - return JsonResult.success(schoolClassStudent); - } - } - - - @GetMapping(API + "/getList.do") - public JsonResult>getList(SchoolClassStudentQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - Listlist = schoolClassStudentService.getValuesByQuery(param); - return JsonResult.success(list); - } - } - - - /* 后台页面 */ - - @GetMapping(MODEL + "/index.do") - @Function("schoolClassStudent.query") - public ModelAndView index() { - ModelAndView view = new ModelAndView("/jlw/schoolClassStudent/index.html") ; - view.addObject("search", SchoolClassStudentQuery.class.getName()); - return view; - } - - @GetMapping(MODEL + "/edit.do") - @Function("schoolClassStudent.edit") - public ModelAndView edit(Long schoolClassStudentId) { - ModelAndView view = new ModelAndView("/jlw/schoolClassStudent/edit.html"); - SchoolClassStudent schoolClassStudent = schoolClassStudentService.queryById(schoolClassStudentId); - view.addObject("schoolClassStudent", schoolClassStudent); - return view; - } - - @GetMapping(MODEL + "/add.do") - @Function("schoolClassStudent.add") - public ModelAndView add(Long schoolClassStudentId) { - ModelAndView view = new ModelAndView("/jlw/schoolClassStudent/add.html"); - if(null != schoolClassStudentId){ - SchoolClassStudent schoolClassStudent = schoolClassStudentService.queryById(schoolClassStudentId); - view.addObject("schoolClassStudent", schoolClassStudent); - }else { - view.addObject("schoolClassStudent", new SchoolClassStudent()); - } - return view; - } - - /* 后台接口 */ - - @PostMapping(MODEL + "/list.json") - @Function("schoolClassStudent.query") - public JsonResult list(SchoolClassStudentQuery condition){ - PageQuery page = condition.getPageQuery(); - schoolClassStudentService.queryByCondition(page); - return JsonResult.success(page); - } - - @PostMapping(MODEL + "/addAll.json") - @Function("schoolClassStudent.add") - public JsonResult addAll(SchoolClassStudentQuery schoolClassStudentQuery,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - schoolClassStudentQuery.setUserId(coreUser.getId()); - schoolClassStudentQuery.setOrgId(coreUser.getOrgId()); - String msg = schoolClassStudentService.addAll(schoolClassStudentQuery); - if (StringUtils.isBlank(msg)) { - return JsonResult.success(); - } else { - return JsonResult.failMessage("新增失败,"+msg); - } - } - } - - @PostMapping(MODEL + "/add.json") - @Function("schoolClassStudent.add") - public JsonResult add(@Validated(ValidateConfig.ADD.class) SchoolClassStudentQuery schoolClassStudentQuery, BindingResult result,@SCoreUser CoreUser coreUser){ - if(result.hasErrors()){ - return JsonResult.failMessage(result); - }else{ - schoolClassStudentQuery.setUserId(coreUser.getId()); - schoolClassStudentQuery.setOrgId(coreUser.getOrgId()); - return schoolClassStudentService.add(schoolClassStudentQuery); - } - } - - @PostMapping(MODEL + "/edit.json") - @Function("schoolClassStudent.edit") - public JsonResult update(@Validated(ValidateConfig.UPDATE.class) SchoolClassStudentQuery schoolClassStudentQuery, BindingResult result) { - if(result.hasErrors()){ - return JsonResult.failMessage(result); - }else { - schoolClassStudentQuery.setUserId(null); - schoolClassStudentQuery.setOrgId(null); - String msg = schoolClassStudentService.edit(schoolClassStudentQuery); - if (StringUtils.isBlank(msg)) { - return JsonResult.success(); - } else { - return JsonResult.failMessage("更新失败,"+msg); - } - } - } - - - @GetMapping(MODEL + "/view.json") - @Function("schoolClassStudent.query") - public JsonResultqueryInfo(Long schoolClassStudentId) { - SchoolClassStudent schoolClassStudent = schoolClassStudentService.queryById( schoolClassStudentId); - return JsonResult.success(schoolClassStudent); - } - - @GetMapping(MODEL + "/getValues.json") - @Function("schoolClassStudent.query") - public JsonResult>getValues(SchoolClassStudentQuery param) { - Listlist = schoolClassStudentService.getValuesByQuery(param); - return JsonResult.success(list); - } - - - @PostMapping(MODEL + "/delete.json") - @Function("schoolClassStudent.delete") - @ResponseBody - public JsonResult delete(String ids) { - schoolClassStudentService.deleteSchoolClassStudent(ids); - return JsonResult.success(); - } - - -} diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index ebe5f774..1fddffb9 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -206,14 +206,14 @@ public class TeacherOpenCourseStudentSigninLogController{ /** * 教师端-签到日志 - * @param signinDTO 签到DTO + * @param query * @return */ @PostMapping(MODEL + "/signinLog.json") @Function("teacherOpenCourseStudentSigninLog.add") @ResponseBody - public JsonResult signinLog(TeacherOpenCourseStudentSigninLogSigninDTO signinDTO) { - return JsonResult.success(teacherOpenCourseStudentSigninLogService.signinLog(signinDTO)); + public JsonResult signinLog(TeacherOpenCourseStudentSigninLogQuery query) { + return JsonResult.success(teacherOpenCourseStudentSigninLogService.signinLog(query)); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassStudentQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassStudentQuery.java deleted file mode 100644 index 521465a9..00000000 --- a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassStudentQuery.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.ibeetl.jlw.web.query; - -import cn.jlw.validate.ValidateConfig; -import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.web.query.PageParam; -import com.ibeetl.jlw.entity.SchoolClassStudent; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - *班级关联学生查询 - */ -public class SchoolClassStudentQuery extends PageParam { - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @Query(name = "班级-学生-关联ID", display = false) - private Long schoolClassStudentId; - @Query(name = "班级ID", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1") - private Long schoolClassId; - @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1") - private String studentId; - @Query(name = "添加时间", display = false) - private Date addTime; - @Query(name = "组织机构ID", display = false) - private Long orgId; - @Query(name = "后台用户ID", display = false) - private Long userId; - - private String schoolClassStudentIdPlural; - private String schoolClassIdPlural; - private String orgIdPlural; - private String userIdPlural; - - private String schoolClassStudentJsonStr;//json格式 - - private String _given;//指定更新的特定字段，多个逗号隔开 - - public Long getSchoolClassStudentId(){ - return schoolClassStudentId; - } - public void setSchoolClassStudentId(Long schoolClassStudentId ){ - this.schoolClassStudentId = schoolClassStudentId; - } - public Long getSchoolClassId(){ - return schoolClassId; - } - public void setSchoolClassId(Long schoolClassId ){ - this.schoolClassId = schoolClassId; - } - public String getStudentId(){ - return studentId; - } - public void setStudentId(String studentId ){ - this.studentId = studentId; - } - public Date getAddTime(){ - return addTime; - } - public void setAddTime(Date addTime ){ - this.addTime = addTime; - } - public Long getOrgId(){ - return orgId; - } - public void setOrgId(Long orgId ){ - this.orgId = orgId; - } - public Long getUserId(){ - return userId; - } - public void setUserId(Long userId ){ - this.userId = userId; - } - - public SchoolClassStudent pojo(){ - SchoolClassStudent pojo = new SchoolClassStudent(); - pojo.setSchoolClassStudentId(this.getSchoolClassStudentId()); - pojo.setSchoolClassId(this.getSchoolClassId()); - pojo.setStudentId(this.getStudentId()); - pojo.setAddTime(this.getAddTime()); - pojo.setOrgId(this.getOrgId()); - pojo.setUserId(this.getUserId()); - return pojo; - } - - public String getSchoolClassStudentIdPlural(){ - return schoolClassStudentIdPlural; - } - public void setSchoolClassStudentIdPlural(String schoolClassStudentIdPlural){ - this.schoolClassStudentIdPlural = schoolClassStudentIdPlural; - } - public String getSchoolClassIdPlural(){ - return schoolClassIdPlural; - } - public void setSchoolClassIdPlural(String schoolClassIdPlural){ - this.schoolClassIdPlural = schoolClassIdPlural; - } - public String getOrgIdPlural(){ - return orgIdPlural; - } - public void setOrgIdPlural(String orgIdPlural){ - this.orgIdPlural = orgIdPlural; - } - public String getUserIdPlural(){ - return userIdPlural; - } - public void setUserIdPlural(String userIdPlural){ - this.userIdPlural = userIdPlural; - } - public String getSchoolClassStudentJsonStr(){ - return schoolClassStudentJsonStr; - } - public void setSchoolClassStudentJsonStr(String schoolClassStudentJsonStr ){ - this.schoolClassStudentJsonStr = schoolClassStudentJsonStr; - } - public String get_given() { - return _given; - } - public void set_given(String _given) { - this._given = _given; - } -} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java index 683b4ddc..83deeb0e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java @@ -143,6 +143,7 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam { pojo.setTeacherOpenCourseStudentSigninLogIp(this.getTeacherOpenCourseStudentSigninLogIp()); pojo.setTeacherOpenCourseStudentSigninLogTag(this.getTeacherOpenCourseStudentSigninLogTag()); pojo.setTeacherOpenCourseStudentSigninSettingId(this.getTeacherOpenCourseStudentSigninSettingId()); + pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(this.getTeacherOpenCourseStudentSigninSettingSessionTime()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo; diff --git a/web/src/main/resources/sql/jlw/schoolClassStudent.md b/web/src/main/resources/sql/jlw/schoolClassStudent.md deleted file mode 100644 index c39d9ba5..00000000 --- a/web/src/main/resources/sql/jlw/schoolClassStudent.md +++ /dev/null @@ -1,219 +0,0 @@ -queryByCondition -=== -* 根据不为空的参数进行分页查询 - - select - @pageTag(){ - t.* - @} - from school_class_student t - where 1=1 - @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 - and #function("schoolClassStudent.query")# - @if(!isEmpty(schoolClassStudentId)){ - and t.school_class_student_id =#schoolClassStudentId# - @} - @if(!isEmpty(schoolClassStudentIdPlural)){ - and find_in_set(t.school_class_student_id,#schoolClassStudentIdPlural#) - @} - @if(!isEmpty(schoolClassId)){ - and t.school_class_id =#schoolClassId# - @} - @if(!isEmpty(schoolClassIdPlural)){ - and find_in_set(t.school_class_id,#schoolClassIdPlural#) - @} - @if(!isEmpty(studentId)){ - and t.student_id =#studentId# - @} - @if(!isEmpty(addTime)){ - and t.add_time =#addTime# - @} - @if(!isEmpty(orgId)){ - and t.org_id =#orgId# - @} - @if(!isEmpty(orgIdPlural)){ - and find_in_set(t.org_id,#orgIdPlural#) - @} - @if(!isEmpty(userId)){ - and t.user_id =#userId# - @} - @if(!isEmpty(userIdPlural)){ - and find_in_set(t.user_id,#userIdPlural#) - @} - - -queryByConditionQuery -=== -* 根据不为空的参数进行分页查询(无权限) - - select - @pageTag(){ - t.* - @} - from school_class_student t - where 1=1 - @if(!isEmpty(schoolClassStudentId)){ - and t.school_class_student_id =#schoolClassStudentId# - @} - @if(!isEmpty(schoolClassStudentIdPlural)){ - and find_in_set(t.school_class_student_id,#schoolClassStudentIdPlural#) - @} - @if(!isEmpty(schoolClassId)){ - and t.school_class_id =#schoolClassId# - @} - @if(!isEmpty(schoolClassIdPlural)){ - and find_in_set(t.school_class_id,#schoolClassIdPlural#) - @} - @if(!isEmpty(studentId)){ - and t.student_id =#studentId# - @} - @if(!isEmpty(addTime)){ - and t.add_time =#addTime# - @} - @if(!isEmpty(orgId)){ - and t.org_id =#orgId# - @} - @if(!isEmpty(orgIdPlural)){ - and find_in_set(t.org_id,#orgIdPlural#) - @} - @if(!isEmpty(userId)){ - and t.user_id =#userId# - @} - @if(!isEmpty(userIdPlural)){ - and find_in_set(t.user_id,#userIdPlural#) - @} - - - - -deleteSchoolClassStudentByIds -=== - -* 批量删除 - - delete from school_class_student where find_in_set(school_class_student_id,#ids#) - - - -getByIds -=== - -select * from school_class_student where find_in_set(school_class_student_id,#ids#) - - -updateGivenByIds -=== - -* 批量更新指定字段，无论此字段是否有值 - - update school_class_student - set - @if(contain("schoolClassId",_given)){ - @if(isEmpty(schoolClassId)){ - school_class_id = null , - @}else{ - school_class_id = #schoolClassId# , - @} - @} - @if(contain("studentId",_given)){ - @if(isEmpty(studentId)){ - student_id = null , - @}else{ - student_id = #studentId# , - @} - @} - @if(contain("addTime",_given)){ - @if(isEmpty(addTime)){ - add_time = null , - @}else{ - add_time = #addTime# , - @} - @} - @if(contain("orgId",_given)){ - @if(isEmpty(orgId)){ - org_id = null , - @}else{ - org_id = #orgId# , - @} - @} - @if(contain("userId",_given)){ - @if(isEmpty(userId)){ - user_id = null , - @}else{ - user_id = #userId# , - @} - @} - school_class_student_id = school_class_student_id - where find_in_set(school_class_student_id,#schoolClassStudentIdPlural#) - - - -getSchoolClassStudentValues -=== - -* 根据不为空的参数进行查询 - - select t.* - from school_class_student t - where 1=1 - @if(!isEmpty(schoolClassStudentId)){ - and t.school_class_student_id =#schoolClassStudentId# - @} - @if(!isEmpty(schoolClassId)){ - and t.school_class_id =#schoolClassId# - @} - @if(!isEmpty(studentId)){ - and t.student_id =#studentId# - @} - @if(!isEmpty(addTime)){ - and t.add_time =#addTime# - @} - @if(!isEmpty(orgId)){ - and t.org_id =#orgId# - @} - @if(!isEmpty(userId)){ - and t.user_id =#userId# - @} - - -getValuesByQuery -=== - -* 根据不为空的参数进行查询 - - select t.* - from school_class_student t - where 1=1 and #function("schoolClassStudent.query")# - @if(!isEmpty(schoolClassStudentId)){ - and t.school_class_student_id =#schoolClassStudentId# - @} - @if(!isEmpty(schoolClassStudentIdPlural)){ - and find_in_set(t.school_class_student_id,#schoolClassStudentIdPlural#) - @} - @if(!isEmpty(schoolClassId)){ - and t.school_class_id =#schoolClassId# - @} - @if(!isEmpty(schoolClassIdPlural)){ - and find_in_set(t.school_class_id,#schoolClassIdPlural#) - @} - @if(!isEmpty(studentId)){ - and t.student_id =#studentId# - @} - @if(!isEmpty(addTime)){ - and t.add_time =#addTime# - @} - @if(!isEmpty(orgId)){ - and t.org_id =#orgId# - @} - @if(!isEmpty(orgIdPlural)){ - and find_in_set(t.org_id,#orgIdPlural#) - @} - @if(!isEmpty(userId)){ - and t.user_id =#userId# - @} - @if(!isEmpty(userIdPlural)){ - and find_in_set(t.user_id,#userIdPlural#) - @} - - - diff --git a/web/src/main/resources/static/js/jlw/schoolClassStudent/add.js b/web/src/main/resources/static/js/jlw/schoolClassStudent/add.js deleted file mode 100644 index d6690bf6..00000000 --- a/web/src/main/resources/static/js/jlw/schoolClassStudent/add.js +++ /dev/null @@ -1,38 +0,0 @@ -layui.define([ 'form', 'laydate', 'table','schoolClassStudentApi'], function(exports) { - var form = layui.form; - var schoolClassStudentApi = layui.schoolClassStudentApi; - var index = layui.index; - var view = { - init:function(){ - Lib.initGenrealForm($("#addForm"),form); - this.initSubmit(); - }, - initSubmit:function(){ - $("#addButton").click(function(){ - form.on('submit(form)', function(){ - var schoolClassStudentId = $("#addForm input[name='schoolClassStudentId']").val(); - if(!$.isEmpty(schoolClassStudentId)){ - schoolClassStudentApi.updateSchoolClassStudent($('#addForm'),function(){ - parent.window.dataReload(); - Common.info("更新成功"); - Lib.closeFrame(); - }); - }else{ - schoolClassStudentApi.addSchoolClassStudent($('#addForm'),function(){ - parent.window.dataReload(); - Common.info("添加成功"); - Lib.closeFrame(); - }); - } - - }); - }); - - $("#addButton-cancel").click(function(){ - Lib.closeFrame(); - }); - } - - } - exports('add',view); -}); diff --git a/web/src/main/resources/static/js/jlw/schoolClassStudent/del.js b/web/src/main/resources/static/js/jlw/schoolClassStudent/del.js deleted file mode 100644 index 93d48f17..00000000 --- a/web/src/main/resources/static/js/jlw/schoolClassStudent/del.js +++ /dev/null @@ -1,23 +0,0 @@ -layui.define(['table', 'schoolClassStudentApi'], function(exports) { - var schoolClassStudentApi = layui.schoolClassStudentApi; - var table=layui.table; - var view = { - init:function(){ - }, - delBatch:function(){ - var data = Common.getMoreDataFromTable(table,"schoolClassStudentTable"); - if(data==null){ - return ; - } - Common.openConfirm("确认要删除这些班级关联学生?",function(){ - var ids =Common.concatBatchId(data,"schoolClassStudentId"); - schoolClassStudentApi.del(ids,function(){ - Common.info("删除成功"); - dataReload(); - }) - }) - } - } - exports('del',view); - -}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/schoolClassStudent/edit.js b/web/src/main/resources/static/js/jlw/schoolClassStudent/edit.js deleted file mode 100644 index 35608cc0..00000000 --- a/web/src/main/resources/static/js/jlw/schoolClassStudent/edit.js +++ /dev/null @@ -1,28 +0,0 @@ -layui.define([ 'form', 'laydate', 'table','schoolClassStudentApi'], function(exports) { - var form = layui.form; - var schoolClassStudentApi = layui.schoolClassStudentApi; - var index = layui.index; - var view = { - init:function(){ - Lib.initGenrealForm($("#updateForm"),form); - this.initSubmit(); - }, - initSubmit:function(){ - $("#updateButton").click(function(){ - form.on('submit(form)', function(){ - schoolClassStudentApi.updateSchoolClassStudent($('#updateForm'),function(){ - parent.window.dataReload(); - Common.info("更新成功"); - Lib.closeFrame(); - }); - }); - }); - $("#updateButton-cancel").click(function(){ - Lib.closeFrame(); - }); - } - - } - exports('edit',view); - -}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/schoolClassStudent/index.js b/web/src/main/resources/static/js/jlw/schoolClassStudent/index.js deleted file mode 100644 index 38148361..00000000 --- a/web/src/main/resources/static/js/jlw/schoolClassStudent/index.js +++ /dev/null @@ -1,164 +0,0 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { - var form = layui.form; - var laydate = layui.laydate; - var table = layui.table; - var schoolClassStudentTable = null; - var view ={ - init:function(){ - var that = this - this.initTable(); - this.initSearchForm(); - this.initToolBar(); - window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),schoolClassStudentTable) - that.initToolBar(); - } - }, - initTable:function(){ - var sx_ = localStorage.getItem("schoolClassStudentTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 - if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} - schoolClassStudentTable = table.render({ - elem : '#schoolClassStudentTable', - height : Lib.getTableHeight(1), - cellMinWidth: 100, - method : 'post', - url : Common.ctxPath + '/jlw/schoolClassStudent/list.json' // 数据接口 - ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_schoolClassStudent' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 - ,limit : 10, - cols : [ [ // 表头 - { - type : 'checkbox', - - }, - { - field : 'schoolClassStudentId', - title : '班级-学生-关联ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['schoolClassStudentId'])?false:sx_['schoolClassStudentId'], - - width : 60, - }, - { - field : 'schoolClassIdText', //数据字典类型为 school_class.class_name.class_status=1 - title : '班级ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['schoolClassIdText'])?false:sx_['schoolClassIdText'], - }, - { - field : 'studentIdText', //数据字典类型为 student.student_name.student_status=1 - title : '学生ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['studentIdText'])?false:sx_['studentIdText'], - }, - { - field : 'addTime', - title : '添加时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['addTime'])?false:sx_['addTime'], - }, - { - field : 'orgId', - title : '组织机构ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], - }, - { - field : 'userId', - title : '后台用户ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], - } - ,{ - field : 'operation_',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; - return htm; - } - } - - ] ] - - }); - - table.on('checkbox(schoolClassStudentTable)', function(obj){ - var schoolClassStudent = obj.data; - if(obj.checked){ - //按钮逻辑Lib.buttonEnable() - }else{ - - } - }) - }, - - initSearchForm:function(){ - Lib.initSearchForm( $("#searchForm"),schoolClassStudentTable,form); - }, - - initToolBar:function(){ - toolbar = { - add: function () { - var url = "/jlw/schoolClassStudent/add.do"; - Common.openDlg(url,"班级关联学生管理>新增"); - }, - edit: function () { - var data = Common.getOneFromTable(table,"schoolClassStudentTable"); - if(data==null){ - return ; - } - var url = "/jlw/schoolClassStudent/add.do?schoolClassStudentId="+data.schoolClassStudentId; - Common.openDlg(url,"班级关联学生管理>"+data.schoolClassStudentId+">编辑"); - }, - del: function () { - layui.use(['del'], function(){ - var delView = layui.del - delView.delBatch(); - }); - }, - search: function () { - Lib.doSearchForm($("#searchForm"), schoolClassStudentTable, 1); - view.initToolBar() - }, - refresh: function () { - searchForm.reset(); - Lib.doSearchForm($("#searchForm"), schoolClassStudentTable, 1); - view.initToolBar() - }, - } - //触发事件 - $('.ext-toolbar').on('click', function() { - var type = $(this).data('type'); - toolbar[type] ? toolbar[type].call(this) : ''; - }); - - }, initTableTool: table.on('tool(schoolClassStudentTable)', function (obj) { - var data = obj.data; - if (obj.event === 'edit') { - var url = "/jlw/schoolClassStudent/add.do?schoolClassStudentId="+data.schoolClassStudentId; - Common.openDlg(url,"班级关联学生管理>"+data.schoolClassStudentId+">编辑"); - }else if(obj.event === "del"){ - layer.confirm('是否确定删除该信息？', function (index) { - var ret = Common.postAjax("/jlw/schoolClassStudent/delete.json",{ids:data.schoolClassStudentId}); - layer.msg(ret.code == 0?"删除成功！":ret.msg, { - offset: ['50%'], - icon: ret.code == 0?1:2, - time: 1500 //2秒关闭（如果不配置，默认是3秒） - },function (){ - if(ret.code == 0){ - Lib.tableRefresh(); - } - }); - }); - } - }) - } - exports('index',view); - -}); diff --git a/web/src/main/resources/static/js/jlw/schoolClassStudent/schoolClassStudentApi.js b/web/src/main/resources/static/js/jlw/schoolClassStudent/schoolClassStudentApi.js deleted file mode 100644 index aae9bda8..00000000 --- a/web/src/main/resources/static/js/jlw/schoolClassStudent/schoolClassStudentApi.js +++ /dev/null @@ -1,18 +0,0 @@ -/*访问后台的代码*/ -layui.define([], function(exports) { - var api={ - updateSchoolClassStudent:function(form,callback){ - Lib.submitForm("/jlw/schoolClassStudent/edit.json",form,{},callback) - }, - addSchoolClassStudent:function(form,callback){ - Lib.submitForm("/jlw/schoolClassStudent/add.json",form,{},callback) - }, - del:function(ids,callback){ - Common.post("/jlw/schoolClassStudent/delete.json",{"ids":ids},function(){ - callback(); - }) - } - - }; - exports('schoolClassStudentApi',api); -}); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/schoolClassStudent/add.html b/web/src/main/resources/templates/jlw/schoolClassStudent/add.html deleted file mode 100644 index 25f57aac..00000000 --- a/web/src/main/resources/templates/jlw/schoolClassStudent/add.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- - - - - - diff --git a/web/src/main/resources/templates/jlw/schoolClassStudent/edit.html b/web/src/main/resources/templates/jlw/schoolClassStudent/edit.html deleted file mode 100644 index eae5d3f5..00000000 --- a/web/src/main/resources/templates/jlw/schoolClassStudent/edit.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- - - - - - diff --git a/web/src/main/resources/templates/jlw/schoolClassStudent/index.html b/web/src/main/resources/templates/jlw/schoolClassStudent/index.html deleted file mode 100644 index 2dc2370a..00000000 --- a/web/src/main/resources/templates/jlw/schoolClassStudent/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - -
- - - -