From 7c98015f37e29a65f42d4111718de8f7b71ce2ca Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 15 Sep 2022 14:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7beetlSQL3.0=E5=90=8E,=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B7=B2=E7=9F=A5=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/console/dao/DictConsoleDao.java | 4 ++-- .../admin/console/dao/FunctionConsoleDao.java | 2 -- .../admin/console/dao/MenuConsoleDao.java | 2 -- .../admin/console/dao/OrgConsoleDao.java | 2 ++ .../admin/console/dao/RoleConsoleDao.java | 5 +++++ .../console/dao/RoleFunctionConsoleDao.java | 4 ++-- .../admin/console/dao/UserConsoleDao.java | 4 ++++ .../ibeetl/admin/core/dao/CoreDictDao.java | 2 -- .../ibeetl/admin/core/dao/CoreFileDao.java | 2 ++ .../admin/core/dao/CoreFunctionDao.java | 2 -- .../ibeetl/admin/core/dao/CoreMenuDao.java | 4 ++-- .../com/ibeetl/admin/core/dao/CoreOrgDao.java | 2 -- .../ibeetl/admin/core/dao/CoreRoleDao.java | 2 -- .../admin/core/dao/CoreRoleFunctionDao.java | 2 -- .../admin/core/dao/CoreRoleMenuDao.java | 5 +++-- .../ibeetl/admin/core/dao/CoreUserDao.java | 2 -- .../admin/core/dao/CoreUserRoleDao.java | 2 -- .../ibeetl/admin/core/entity/CoreDict.java | 3 +-- .../admin/core/entity/CoreFunction.java | 3 +-- .../ibeetl/admin/core/entity/CoreMenu.java | 3 +-- .../com/ibeetl/admin/core/entity/CoreOrg.java | 3 +-- .../ibeetl/admin/core/entity/CoreRole.java | 3 +-- .../admin/core/entity/CoreRoleFunction.java | 3 +-- .../admin/core/entity/CoreRoleMenu.java | 3 +-- .../ibeetl/admin/core/entity/CoreUser.java | 3 +-- .../main/resources/codeTemplate/java/dao.java | 7 +++++-- .../resources/codeTemplate/java/pojo.java | 2 +- .../main/java/cn/jlw/web/WebApplication.java | 2 +- .../ApplicationMergeTeacherOpenCourseDao.java | 5 +++-- .../java/com/ibeetl/jlw/dao/AttributeDao.java | 4 ++-- .../ibeetl/jlw/dao/AttributeGroupingDao.java | 4 ++-- .../ibeetl/jlw/dao/AttributeRelationDao.java | 5 +++-- .../com/ibeetl/jlw/dao/CompetitionDao.java | 5 +++-- .../ibeetl/jlw/dao/CompetitionNewsDao.java | 5 +++-- .../jlw/dao/CompetitionStudentsDao.java | 6 ++++-- .../dao/CompetitionTaskOneQuestionDao.java | 5 +++-- .../dao/CompetitionTaskSecondQuestionDao.java | 5 +++-- .../CompetitionTaskSecondQuestionStepDao.java | 5 +++-- .../dao/CompetitionTeacherEvaluationDao.java | 4 ++-- .../com/ibeetl/jlw/dao/CourseInfoDao.java | 13 +++++++++++-- .../com/ibeetl/jlw/dao/CourseLabelDao.java | 4 ++-- .../main/java/com/ibeetl/jlw/dao/ExamDao.java | 4 ++-- .../com/ibeetl/jlw/dao/ExamStudentsDao.java | 6 ++++-- .../jlw/dao/ExamTaskOneQuestionDao.java | 5 +++-- .../jlw/dao/ExamTaskSecondQuestionDao.java | 5 +++-- .../dao/ExamTaskSecondQuestionStepDao.java | 5 +++-- .../jlw/dao/ExamTaskThreeQuestionDao.java | 5 +++-- .../jlw/dao/ExamTaskThreeQuestionStepDao.java | 5 +++-- .../java/com/ibeetl/jlw/dao/IpAddressDao.java | 4 ++-- .../dao/ResourcesApplicationCourseDao.java | 6 ++++-- .../jlw/dao/ResourcesApplicationDao.java | 4 ++-- .../jlw/dao/ResourcesCompetitionDao.java | 4 ++-- .../jlw/dao/ResourcesCompetitionStepDao.java | 4 ++-- .../com/ibeetl/jlw/dao/ResourcesInfoDao.java | 6 +++--- .../ibeetl/jlw/dao/ResourcesQuestionDao.java | 6 +++--- .../ibeetl/jlw/dao/ResourcesTrainingDao.java | 15 +++++++++------ .../jlw/dao/ResourcesTrainingStepDao.java | 4 ++-- .../com/ibeetl/jlw/dao/SchoolClassDao.java | 4 ++-- .../ibeetl/jlw/dao/StudentClientLinkDao.java | 5 +++-- .../java/com/ibeetl/jlw/dao/StudentDao.java | 5 +++-- .../ibeetl/jlw/dao/StudentDefenceLogDao.java | 4 ++-- .../jlw/dao/StudentDefenceLogInfoDao.java | 4 ++-- .../jlw/dao/StudentDefenceLogNoteDao.java | 4 ++-- .../jlw/dao/StudentDirectMessagesDao.java | 4 ++-- .../jlw/dao/StudentQuestionLogAnswerDao.java | 4 ++-- .../ibeetl/jlw/dao/StudentQuestionLogDao.java | 4 ++-- .../jlw/dao/StudentQuestionLogInfoDao.java | 4 ++-- .../java/com/ibeetl/jlw/dao/SysLogDao.java | 2 -- .../java/com/ibeetl/jlw/dao/TeacherDao.java | 4 +++- .../jlw/dao/TeacherMergeApplicationDao.java | 4 +++- .../jlw/dao/TeacherMergeSchoolClassDao.java | 5 +++-- .../ibeetl/jlw/dao/TeacherOpenCourseDao.java | 5 +++-- .../dao/TeacherOpenCourseMergeTeacherDao.java | 5 +++-- ...cherOpenCourseScheduleSessionClassDao.java | 5 +++-- .../TeacherOpenCourseScheduleSessionDao.java | 6 ++++-- ...eacherOpenCourseScheduleSessionTagDao.java | 5 +++-- .../jlw/dao/UniversitiesCollegesDao.java | 3 +-- ...gesJurisdictionCurriculumResourcesDao.java | 5 +++-- ...egesJurisdictionExperimentalSystemDao.java | 5 +++-- .../ibeetl/jlw/dao/UniversityFacultyDao.java | 6 ++++-- .../ibeetl/jlw/dao/UniversitySystemDao.java | 6 ++++-- .../com/ibeetl/jlw/dao/WrongQuestionDao.java | 4 ++-- .../ApplicationMergeTeacherOpenCourse.java | 3 +-- .../java/com/ibeetl/jlw/entity/Attribute.java | 3 +-- .../ibeetl/jlw/entity/AttributeGrouping.java | 3 +-- .../ibeetl/jlw/entity/AttributeRelation.java | 3 +-- .../com/ibeetl/jlw/entity/Competition.java | 3 +-- .../ibeetl/jlw/entity/CompetitionNews.java | 3 +-- .../jlw/entity/CompetitionStudents.java | 3 +-- .../entity/CompetitionTaskOneQuestion.java | 3 +-- .../entity/CompetitionTaskSecondQuestion.java | 3 +-- .../CompetitionTaskSecondQuestionStep.java | 3 +-- .../entity/CompetitionTeacherEvaluation.java | 3 +-- .../com/ibeetl/jlw/entity/CourseInfo.java | 3 +-- .../com/ibeetl/jlw/entity/CourseLabel.java | 3 +-- .../main/java/com/ibeetl/jlw/entity/Exam.java | 3 +-- .../com/ibeetl/jlw/entity/ExamStudents.java | 3 +-- .../jlw/entity/ExamTaskOneQuestion.java | 3 +-- .../jlw/entity/ExamTaskSecondQuestion.java | 3 +-- .../entity/ExamTaskSecondQuestionStep.java | 3 +-- .../jlw/entity/ExamTaskThreeQuestion.java | 3 +-- .../jlw/entity/ExamTaskThreeQuestionStep.java | 3 +-- .../java/com/ibeetl/jlw/entity/IpAddress.java | 3 +-- .../jlw/entity/ResourcesApplication.java | 3 +-- .../entity/ResourcesApplicationCourse.java | 3 +-- .../jlw/entity/ResourcesCompetition.java | 3 +-- .../jlw/entity/ResourcesCompetitionStep.java | 3 +-- .../com/ibeetl/jlw/entity/ResourcesInfo.java | 3 +-- .../ibeetl/jlw/entity/ResourcesQuestion.java | 16 +++------------- .../ibeetl/jlw/entity/ResourcesTraining.java | 19 ++++--------------- .../jlw/entity/ResourcesTrainingStep.java | 3 +-- .../com/ibeetl/jlw/entity/SchoolClass.java | 3 +-- .../java/com/ibeetl/jlw/entity/Student.java | 3 +-- .../ibeetl/jlw/entity/StudentClientLink.java | 3 +-- .../ibeetl/jlw/entity/StudentDefenceLog.java | 3 +-- .../jlw/entity/StudentDefenceLogInfo.java | 3 +-- .../jlw/entity/StudentDefenceLogNote.java | 3 +-- .../jlw/entity/StudentDirectMessages.java | 3 +-- .../ibeetl/jlw/entity/StudentQuestionLog.java | 3 +-- .../jlw/entity/StudentQuestionLogAnswer.java | 3 +-- .../jlw/entity/StudentQuestionLogInfo.java | 3 +-- .../java/com/ibeetl/jlw/entity/SysLog.java | 3 +-- .../java/com/ibeetl/jlw/entity/Teacher.java | 2 +- .../jlw/entity/TeacherMergeApplication.java | 2 +- .../jlw/entity/TeacherMergeSchoolClass.java | 4 +--- .../ibeetl/jlw/entity/TeacherOpenCourse.java | 3 +-- .../entity/TeacherOpenCourseMergeTeacher.java | 3 +-- .../TeacherOpenCourseScheduleSession.java | 3 +-- ...TeacherOpenCourseScheduleSessionClass.java | 3 +-- .../TeacherOpenCourseScheduleSessionTag.java | 3 +-- .../jlw/entity/UniversitiesColleges.java | 3 +-- ...llegesJurisdictionCurriculumResources.java | 3 +-- ...ollegesJurisdictionExperimentalSystem.java | 3 +-- .../ibeetl/jlw/entity/UniversityFaculty.java | 3 +-- .../ibeetl/jlw/entity/UniversitySystem.java | 3 +-- .../com/ibeetl/jlw/entity/WrongQuestion.java | 3 +-- 136 files changed, 254 insertions(+), 289 deletions(-) diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java index 60e001df..03d519c7 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java @@ -4,7 +4,7 @@ import com.ibeetl.admin.core.entity.CoreDict; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -12,8 +12,8 @@ import java.util.List; * CoreDict Dao */ @SqlResource("console.dict") -@Repository public interface DictConsoleDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void batchDelCoreDictByIds( List ids); } \ No newline at end of file diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java index 3fb8672f..094caec6 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java @@ -4,10 +4,8 @@ import com.ibeetl.admin.core.entity.CoreFunction; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; @SqlResource("console.function") -@Repository public interface FunctionConsoleDao extends BaseMapper { /** diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java index 6d1cee33..236d6a39 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java @@ -4,10 +4,8 @@ import com.ibeetl.admin.core.entity.CoreMenu; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; @SqlResource("console.menu") -@Repository public interface MenuConsoleDao extends BaseMapper { /** diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java index 802f1157..40ef8949 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java @@ -6,6 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,5 +15,6 @@ public interface OrgConsoleDao extends BaseMapper { void queryByCondition(PageQuery query); // @SqlStatement(type=SqlStatementType.SELECT) void queryUserByCondition(PageQuery query); + @Update void batchDelByIds(@Param(value = "ids") List ids); } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java index 83bc2d1d..c529b32d 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java @@ -5,6 +5,7 @@ import com.ibeetl.admin.core.entity.CoreUser; 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; @@ -21,10 +22,14 @@ public interface RoleConsoleDao extends BaseMapper { * 批量删除角色 * @param ids 角色id */ + @Update void batchDelByIds(List ids); + @Update void batchDeleteRoleFunction(List ids); + @Update void batchDeleteRoleMenu(List ids); + @Update void batchDeleteUserRole(List ids); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java index 09d3332f..75b6ce6c 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java @@ -4,15 +4,15 @@ import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction; import com.ibeetl.admin.core.entity.CoreRoleFunction; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @SqlResource("console.roleFunction") -@Repository public interface RoleFunctionConsoleDao extends BaseMapper { + @Update void deleteRoleFunction(List ids); List getFunctionIdByRole(Long roleId); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java index 18bce0a9..37e3187d 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.enums.GeneralStateEnum; 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; @@ -14,9 +15,12 @@ public interface UserConsoleDao extends BaseMapper { PageQuery queryByCondition(PageQuery query); + @Update void batchDelUserByIds( List ids); + @Update void batchSetCodeNullByIds(String ids); + @Update void batchUpdateUserState(List ids, GeneralStateEnum state); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index 0908ebf5..edb1fcf8 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -3,7 +3,6 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreDict; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -12,7 +11,6 @@ import java.util.Map; * 字典DAO接口 */ @SqlResource("core.coreDict") -@Repository public interface CoreDictDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java index 99530a84..75f33633 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java @@ -3,8 +3,10 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreFile; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Sql; +import org.beetl.sql.mapper.annotation.Update; public interface CoreFileDao extends BaseMapper { @Sql("update core_file set biz_type=?,biz_id=? where file_batch_id=?") + @Update public void updateBatchIdInfo( String bizType, String bizId,String fileBatchId); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java index 7219c300..90de51c6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java @@ -5,10 +5,8 @@ import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.Sql; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; @SqlResource("core.coreFunction") -@Repository public interface CoreFunctionDao extends BaseMapper { @Sql("select * from core_function where code = ?") CoreFunction getFunctionByCode(@Param(value = "code") String code); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java index 7b0e6a76..951eee3e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java @@ -4,15 +4,15 @@ import com.ibeetl.admin.core.entity.CoreMenu; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @SqlResource("core.coreMenu") -@Repository public interface CoreMenuDao extends BaseMapper { public void queryByCondition(PageQuery query); + @Update public void clearMenuFunction( List functionIds); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java index 06d5ac9a..76b1abec 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java @@ -4,12 +4,10 @@ import com.ibeetl.admin.core.entity.CoreOrg; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Sql; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; import java.util.List; @SqlResource("core.coreOrg") -@Repository public interface CoreOrgDao extends BaseMapper { List queryOrgByUser(Long userId); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java index a46fe387..33051afc 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java @@ -3,10 +3,8 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreRole; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; @SqlResource("core.coreRole") -@Repository public interface CoreRoleDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java index ea4cdf7c..bdd3c55a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java @@ -3,12 +3,10 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreRoleFunction; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; import java.util.List; @SqlResource("core.coreRoleFunction") -@Repository public interface CoreRoleFunctionDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java index 36cbf32a..054a686e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java @@ -3,12 +3,11 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreRoleMenu; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @SqlResource("core.coreRoleMenu") -@Repository public interface CoreRoleMenuDao extends BaseMapper { /** @@ -23,11 +22,13 @@ public interface CoreRoleMenuDao extends BaseMapper { * 根据菜单id删除角色和菜单关系 * @param ids */ + @Update void deleteRoleMenu(List ids); /** * 删除角色的所有菜单 * @param roleId */ + @Update void deleteByRoleId(Long roleId); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 851dd56c..2ecf0e9e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -3,12 +3,10 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUser; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; import java.util.List; @SqlResource("core.coreUser") -@Repository public interface CoreUserDao extends BaseMapper { /** diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java index e0ec0184..c1dbbab0 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java @@ -3,10 +3,8 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUserRole; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; @SqlResource("core.coresUserRole") -@Repository public interface CoreUserRoleDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java index 6e7fdba9..781de0d2 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -17,7 +16,7 @@ import java.util.Date; public class CoreDict extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java index 8bc5020e..42cb0598 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java @@ -4,7 +4,6 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import org.beetl.sql.annotation.entity.UpdateIgnore; import javax.validation.constraints.NotBlank; @@ -15,7 +14,7 @@ import java.util.Date; public class CoreFunction extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java index 5bcb0edb..5f6baefc 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java @@ -4,7 +4,6 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import org.beetl.sql.annotation.entity.UpdateIgnore; import javax.validation.constraints.NotBlank; @@ -21,7 +20,7 @@ public class CoreMenu extends BaseEntity { public static final String TYPE_MENUITEM = "MENU_M"; @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java index 080def8c..a05560fc 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java @@ -5,7 +5,6 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -24,7 +23,7 @@ public class CoreOrg extends BaseEntity { // 自增id @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java index 028c7931..1fad1e5e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java @@ -4,7 +4,6 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,7 +15,7 @@ import java.util.Date; public class CoreRole extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java index bebd0279..eb2126ac 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java @@ -3,7 +3,6 @@ package com.ibeetl.admin.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -14,7 +13,7 @@ import java.util.Date; */ public class CoreRoleFunction extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; // 删除标识 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java index 194ca6cb..aeac866d 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java @@ -2,7 +2,6 @@ package com.ibeetl.admin.core.entity; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -13,7 +12,7 @@ import java.util.Date; */ public class CoreRoleMenu extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java index 9e7ff9a6..cc8b1f41 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java @@ -6,7 +6,6 @@ import com.ibeetl.admin.core.enums.MenuEnums; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -23,7 +22,7 @@ public class CoreUser extends BaseEntity { @NotNull(message = "ID不能为空", groups =ValidateConfig. UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; // 删除标识 diff --git a/admin-core/src/main/resources/codeTemplate/java/dao.java b/admin-core/src/main/resources/codeTemplate/java/dao.java index de21f878..12834745 100644 --- a/admin-core/src/main/resources/codeTemplate/java/dao.java +++ b/admin-core/src/main/resources/codeTemplate/java/dao.java @@ -9,23 +9,26 @@ import ${basePackage}.web.query.${entity.name}Query; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Repository; - /** * ${entity.displayName} Dao */ \@SqlResource("${entity.system}.${entity.code}") -\@Repository public interface ${entity.name}Dao extends BaseMapper<${entity.name}>{ public PageQuery<${entity.name}> queryByCondition(PageQuery query); public PageQuery<${entity.name}> queryByConditionQuery(PageQuery query); @if(null != entity.status){ + @Update public void delete${entity.name}ByIds(String ids); + @Update public void deleteByIds(String ids); @}else{ + @Update public void delete${entity.name}ByIds(String ids); @} + @Update public int updateGivenByIds(${entity.name}Query ${entity.code}Query); public List<${entity.name}> getByIds(String ids); public List<${entity.name}> getValuesByQuery(${entity.name}Query ${entity.code}Query); diff --git a/admin-core/src/main/resources/codeTemplate/java/pojo.java b/admin-core/src/main/resources/codeTemplate/java/pojo.java index 65b4935a..8abefc8d 100644 --- a/admin-core/src/main/resources/codeTemplate/java/pojo.java +++ b/admin-core/src/main/resources/codeTemplate/java/pojo.java @@ -24,7 +24,7 @@ public class ${className} extends BaseEntity{ @} @if(attr.isId) { \@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - \@SeqID(name = ORACLE_CORE_SEQ_NAME) + \// @SeqID(name = ORACLE_CORE_SEQ_NAME) \@AssignID(value = "maskAutoID",param = "${package}.${className}") @} @if(isNotEmpty(attr.dictType)) { diff --git a/web/src/main/java/cn/jlw/web/WebApplication.java b/web/src/main/java/cn/jlw/web/WebApplication.java index 27f08dab..cba52cbb 100644 --- a/web/src/main/java/cn/jlw/web/WebApplication.java +++ b/web/src/main/java/cn/jlw/web/WebApplication.java @@ -16,7 +16,7 @@ import org.springframework.web.WebApplicationInitializer; @SpringBootApplication @EnableCaching @EnableAsync -@ComponentScan(basePackages= {"cn.jlw","com.ibeetl.admin","com.ibeetl.jlw","com.ibeetl.admin.core.dao"}) +@ComponentScan(basePackages= {"cn.jlw","com.ibeetl.admin","com.ibeetl.jlw"}) @ServletComponentScan(basePackages = "cn.jlw.cors") public class WebApplication extends SpringBootServletInitializer implements WebApplicationInitializer { diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java index d8b1f7bf..025df304 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * ApplicationMergeTeacherOpenCourse Dao */ @SqlResource("jlw.applicationMergeTeacherOpenCourse") -@Repository public interface ApplicationMergeTeacherOpenCourseDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteApplicationMergeTeacherOpenCourseByIds(String ids); + @Update public int updateGivenByIds(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery); public List getByIds(String ids); public List getValuesByQuery(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java index b19a40a4..7f9ad37c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.Attribute; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * Attribute Dao */ @SqlResource("jlw.attribute") -@Repository public interface AttributeDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteAttributeByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java index fbec13fc..3b45dbf5 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.AttributeGrouping; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * AttributeGrouping Dao */ @SqlResource("jlw.attributeGrouping") -@Repository public interface AttributeGroupingDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteAttributeGroupingByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java index 343e5651..9012a00b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java @@ -4,16 +4,17 @@ import com.ibeetl.jlw.entity.AttributeRelation; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * AttributeRelation Dao */ @SqlResource("jlw.attributeRelation") -@Repository public interface AttributeRelationDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteAttributeRelationByIds(String ids); + @Update public void deleteByObject(AttributeRelation attributeRelation); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java index ca5a28ae..7a6011e5 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CompetitionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * Competition Dao */ @SqlResource("jlw.competition") -@Repository public interface CompetitionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteCompetitionByIds(String ids); + @Update public int updateClassIdsNullById(Long competitionId); public List getValuesByQuery(CompetitionQuery competitionQuery); public Competition getById(Long competitionId); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java index 549c9ee3..b47ea801 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java @@ -4,16 +4,17 @@ import com.ibeetl.jlw.entity.CompetitionNews; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * CompetitionNews Dao */ @SqlResource("jlw.competitionNews") -@Repository public interface CompetitionNewsDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCompetitionNewsByIds(String ids); + @Update void deleteByCompetitionId(Long competitionId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java index b4cd322d..971768e1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CompetitionStudentsQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,7 +14,6 @@ import java.util.List; * CompetitionStudents Dao */ @SqlResource("jlw.competitionStudents") -@Repository public interface CompetitionStudentsDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); @@ -24,14 +23,17 @@ public interface CompetitionStudentsDao extends BaseMapper{ public PageQuery queryTeamByCondition(PageQuery query); public PageQuery queryTeamPersonalByCondition(PageQuery query); public PageQuery queryTeamDefenceByCondition(PageQuery query); + @Update public void deleteCompetitionStudentsByIds(String ids); + @Update public void deleteByCompetitionId(Long competitionId); public List getCompetitionPersonalInfo(CompetitionStudentsQuery competitionStudentsQuery); public List getCompetitionTeamInfo(CompetitionStudentsQuery competitionStudentsQuery); public List getCompetitionTeamPersonalInfo(CompetitionStudentsQuery competitionStudentsQuery); public List getCompetitionTeamDefenceInfo(CompetitionStudentsQuery competitionStudentsQuery); + @Update public int updateTotalScore(CompetitionStudents competitionStudents); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java index 4eaea1bb..035a9f22 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.math.BigDecimal; import java.util.List; @@ -15,10 +15,11 @@ import java.util.List; * CompetitionTaskOneQuestion Dao */ @SqlResource("jlw.competitionTaskOneQuestion") -@Repository public interface CompetitionTaskOneQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCompetitionTaskOneQuestionByIds(String ids); + @Update public void deleteByCompetitionId(Long competitionId); public List getValuesByQuery (CompetitionTaskOneQuestionQuery competitionTaskOneQuestionQuery); public List getValuesWithOutAnswer(CompetitionTaskOneQuestionQuery competitionTaskOneQuestionQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java index 724beb70..c2f09ead 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * CompetitionTaskSecondQuestion Dao */ @SqlResource("jlw.competitionTaskSecondQuestion") -@Repository public interface CompetitionTaskSecondQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQueryqueryByConditionWithOutAnswer(PageQuery query); + @Update public void deleteCompetitionTaskSecondQuestionByIds(String ids); + @Update public void deleteByCompetitionId(Long competitionId); ListgetByCompetitionStudentsIds(String competitionStudentsIds); ListgetValuesByQuery(CompetitionTaskSecondQuestionQuery competitionTaskSecondQuestionQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java index 4ced9c1a..02a2547f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionStepQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,11 @@ import java.util.List; * CompetitionTaskSecondQuestionStep Dao */ @SqlResource("jlw.competitionTaskSecondQuestionStep") -@Repository public interface CompetitionTaskSecondQuestionStepDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCompetitionTaskSecondQuestionStepByIds(String ids); + @Update public void deleteByCompetitionId(Long competitionId); public List getValuesWithOutAnswer(CompetitionTaskSecondQuestionStepQuery competitionTaskSecondQuestionStepQuery); public List getByCompetitionId(Long competitionId); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java index c178b56b..375a6fc9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.CompetitionTeacherEvaluation; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * CompetitionTeacherEvaluation Dao */ @SqlResource("jlw.competitionTeacherEvaluation") -@Repository public interface CompetitionTeacherEvaluationDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCompetitionTeacherEvaluationByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java index 70b3b455..388bf56f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.CourseInfoQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * CourseInfo Dao */ @SqlResource("jlw.courseInfo") -@Repository public interface CourseInfoDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCourseInfoByIds(String ids); public CourseInfo getById(Long courseInfoId); public List getCourseInfoValues(CourseInfoQuery courseInfoQuery); @@ -26,15 +26,24 @@ public interface CourseInfoDao extends BaseMapper{ public List getByParams(String courseLabelTypes,String cQuestionIds,String eQuestionIds,Long resourcesApplicationId,Long competitionId,Long examId,Integer type); + @Update public int updateResourcesCompetitionIdsByIds(String courseInfoIds); + @Update public int updateResourcesQuestionIdsByIds(String courseInfoIds); + @Update public int updateResourcesTrainingIdsByIds(String courseInfoIds); + @Update public int updateResourcesCompetitionIdsById(CourseInfo courseInfo); + @Update public int updateResourcesQuestionIdsById(CourseInfo courseInfo); + @Update public int updateResourcesTrainingIdsById(CourseInfo courseInfo); + @Update public int updateVideoIdById(CourseInfo courseInfo); + @Update public int updateCoursewareIdById(CourseInfo courseInfo); + @Update public int updateEnclosureIdsById(CourseInfo courseInfo); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java index afae9cb1..ca4b8b26 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.CourseLabel; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * CourseLabel Dao */ @SqlResource("jlw.courseLabel") -@Repository public interface CourseLabelDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteCourseLabelByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java index b2b4d63a..8b91acaf 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,10 @@ import java.util.List; * Exam Dao */ @SqlResource("jlw.exam") -@Repository public interface ExamDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteExamByIds(String ids); public List getValuesByQuery(ExamQuery examQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java index 70c9815f..20e414d1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamStudentsQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,12 +14,14 @@ import java.util.List; * ExamStudents Dao */ @SqlResource("jlw.examStudents") -@Repository public interface ExamStudentsDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryExamByCondition(PageQuery query); + @Update public void deleteExamStudentsByIds(String ids); + @Update public void deleteByExamId(Long examId); List getExamInfo (ExamStudentsQuery examStudentsQuery); + @Update public int updateTotalScore (ExamStudents examStudents); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java index 001db133..f0e1d9ed 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamTaskOneQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.math.BigDecimal; import java.util.List; @@ -15,10 +15,11 @@ import java.util.List; * ExamTaskOneQuestion Dao */ @SqlResource("jlw.examTaskOneQuestion") -@Repository public interface ExamTaskOneQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteExamTaskOneQuestionByIds(String ids); + @Update public void deleteByExamId(Long examId); public List getByExamStudentsIds(String examStudentsIds); public List getValuesByQuery(ExamTaskOneQuestionQuery examTaskOneQuestionQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java index d8336229..829eac9b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * ExamTaskSecondQuestion Dao */ @SqlResource("jlw.examTaskSecondQuestion") -@Repository public interface ExamTaskSecondQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionWithOutAnswer(PageQuery query); + @Update public void deleteExamTaskSecondQuestionByIds(String ids); + @Update public void deleteByExamId(Long examId); public List getByExamId(Long examId); public List getByExamStudentsIds(String examStudentsIds); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java index 6c45f46b..cf69cebf 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,11 @@ import java.util.List; * ExamTaskSecondQuestionStep Dao */ @SqlResource("jlw.examTaskSecondQuestionStep") -@Repository public interface ExamTaskSecondQuestionStepDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteExamTaskSecondQuestionStepByIds(String ids); + @Update public void deleteByExamId(Long examId); public List getByExamId(Long examId); public List getValuesWithOutAnswer (ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java index ccbe0321..f8072dfd 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * ExamTaskThreeQuestion Dao */ @SqlResource("jlw.examTaskThreeQuestion") -@Repository public interface ExamTaskThreeQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionWithOutAnswer(PageQuery query); + @Update public void deleteExamTaskThreeQuestionByIds(String ids); + @Update public void deleteByExamId(Long examId); public List getByExamId(Long examId); public List getByExamStudentsIds(String examStudentsIds); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java index 366445ef..1e4d5513 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionStepQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,11 @@ import java.util.List; * ExamTaskThreeQuestionStep Dao */ @SqlResource("jlw.examTaskThreeQuestionStep") -@Repository public interface ExamTaskThreeQuestionStepDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteExamTaskThreeQuestionStepByIds(String ids); + @Update public void deleteByExamId(Long examId); public List getByExamId(Long examId); public List getValuesWithOutAnswer(ExamTaskThreeQuestionStepQuery examTaskThreeQuestionStepQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java b/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java index c3914458..d59b11f4 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.IpAddress; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * IpAddress Dao */ @SqlResource("jlw.ipAddress") -@Repository public interface IpAddressDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteIpAddressByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java index 98ec4c39..5a330f61 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java @@ -4,17 +4,19 @@ import com.ibeetl.jlw.entity.ResourcesApplicationCourse; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * ResourcesApplicationCourse Dao */ @SqlResource("jlw.resourcesApplicationCourse") -@Repository public interface ResourcesApplicationCourseDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesApplicationCourseByIds(String ids); + @Update public void deleteByResourcesApplicationId(Long resourcesApplicationId); + @Update public void deleteByCourseInfoId(Long courseInfoId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java index 987c85f8..d206615c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.ResourcesApplication; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * ResourcesApplication Dao */ @SqlResource("jlw.resourcesApplication") -@Repository public interface ResourcesApplicationDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesApplicationByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java index 097e7594..807a8574 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java @@ -9,7 +9,7 @@ import com.ibeetl.jlw.web.query.ResourcesCompetitionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -18,10 +18,10 @@ import java.util.List; * ResourcesCompetition Dao */ @SqlResource("jlw.resourcesCompetition") -@Repository public interface ResourcesCompetitionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteResourcesCompetitionByIds(String ids); public List getByIds (String resourcesCompetitionIds); public List getByIdsToCompetitionTaskSecondQuestion (String resourcesCompetitionIds); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java index bc975171..37c7cd59 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java @@ -4,7 +4,7 @@ import com.ibeetl.jlw.entity.ResourcesCompetitionStep; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -13,9 +13,9 @@ import java.util.List; * ResourcesCompetitionStep Dao */ @SqlResource("jlw.resourcesCompetitionStep") -@Repository public interface ResourcesCompetitionStepDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesCompetitionStepByIds(String ids); public List getByResourcesCompetitionIds(String resourcesCompetitionIds); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java index 57f9a79f..0133c3c9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java @@ -2,10 +2,10 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.web.query.ResourcesInfoQuery; -import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * ResourcesInfo Dao */ @SqlResource("jlw.resourcesInfo") -@Repository public interface ResourcesInfoDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesInfoByIds(String ids); public List getValuesByQuery (ResourcesInfoQuery resourcesInfoQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java index d1b4bd87..4416dbd3 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java @@ -4,10 +4,10 @@ import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; -import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -16,9 +16,9 @@ import java.util.List; * ResourcesQuestion Dao */ @SqlResource("jlw.resourcesQuestion") -@Repository public interface ResourcesQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesQuestionByIds(String ids); public List getByIds (String resourcesQuestionIds); public List getValuesByQuery (ResourcesQuestionQuery resourcesQuestionQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java index 058c478f..ccfad007 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java @@ -1,23 +1,26 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.CourseInfo; +import com.ibeetl.jlw.entity.ExamTaskThreeQuestion; +import com.ibeetl.jlw.entity.ResourcesTraining; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesTrainingQuery; -import org.beetl.sql.mapper.annotation.SqlResource; -import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; + +import java.util.List; /** * ResourcesTraining Dao */ @SqlResource("jlw.resourcesTraining") -@Repository public interface ResourcesTrainingDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteResourcesTrainingByIds(String ids); public List getByIds(String resourcesTrainingIds); public List getByIdsToExamTaskThreeQuestion(String resourcesTrainingIds); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java index 990d40a7..c3b0c672 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.ResourcesTrainingStepQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * ResourcesTrainingStep Dao */ @SqlResource("jlw.resourcesTrainingStep") -@Repository public interface ResourcesTrainingStepDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteResourcesTrainingStepByIds(String ids); public List getByResourcesTrainingIds(String resourcesTrainingIds); public List getValuesByQuery(ResourcesTrainingStepQuery resourcesTrainingStepQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java index 907f4f42..3f695b67 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.SchoolClassQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * SchoolClass Dao */ @SqlResource("jlw.schoolClass") -@Repository public interface SchoolClassDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteSchoolClassByIds(String ids); public List getValuesByQuery (SchoolClassQuery schoolClassQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java index f9609ca2..dcf539d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.StudentClientLinkQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * StudentClientLink Dao */ @SqlResource("jlw.studentClientLink") -@Repository public interface StudentClientLinkDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteStudentClientLinkByIds(String ids); + @Update public void deleteByIds(String ids); public int updateGivenByIds(StudentClientLinkQuery studentClientLinkQuery); public List getByIds(String ids); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java index a496866d..f9efff41 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -6,7 +6,7 @@ import com.ibeetl.jlw.web.query.StudentQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; import java.util.Map; @@ -16,11 +16,12 @@ import java.util.Map; * Student Dao */ @SqlResource("jlw.student") -@Repository public interface StudentDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteStudentByIds(String ids); + @Update public void deleteByIds(String ids); public List> getExcelValues (StudentQuery studentQuery); public List> getExcelValues2Competition (StudentQuery studentQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java index b7b3acf6..7a9e9817 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.StudentDefenceLog; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * StudentDefenceLog Dao */ @SqlResource("jlw.studentDefenceLog") -@Repository public interface StudentDefenceLogDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentDefenceLogByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java index ec7c3d2a..41b0a5d9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java @@ -4,16 +4,16 @@ import com.ibeetl.jlw.entity.StudentDefenceLogInfo; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * StudentDefenceLogInfo Dao */ @SqlResource("jlw.studentDefenceLogInfo") -@Repository public interface StudentDefenceLogInfoDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentDefenceLogInfoByIds(String ids); public StudentDefenceLogInfo getById(Long studentDefenceLogInfoId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java index e78c5a32..2d19b90b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.StudentDefenceLogNoteQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * StudentDefenceLogNote Dao */ @SqlResource("jlw.studentDefenceLogNote") -@Repository public interface StudentDefenceLogNoteDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentDefenceLogNoteByIds(String ids); public List getValuesByQuery(StudentDefenceLogNoteQuery studentDefenceLogNoteQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java index 3999ed2a..794a8461 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java @@ -4,17 +4,17 @@ import com.ibeetl.jlw.entity.StudentDirectMessages; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * StudentDirectMessages Dao */ @SqlResource("jlw.studentDirectMessages") -@Repository public interface StudentDirectMessagesDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteStudentDirectMessagesByIds(String ids); public StudentDirectMessages getById(Long studentDirectMessagesId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java index 3a0c57ad..8380106f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.StudentQuestionLogAnswerQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,9 +14,9 @@ import java.util.List; * StudentQuestionLogAnswer Dao */ @SqlResource("jlw.studentQuestionLogAnswer") -@Repository public interface StudentQuestionLogAnswerDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentQuestionLogAnswerByIds(String ids); public List getValuesByQuery(StudentQuestionLogAnswerQuery studentQuestionLogAnswerQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java index 5e2096f0..c2b93fc0 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.StudentQuestionLog; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * StudentQuestionLog Dao */ @SqlResource("jlw.studentQuestionLog") -@Repository public interface StudentQuestionLogDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentQuestionLogByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java index 48426093..bbe3df3a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java @@ -4,15 +4,15 @@ import com.ibeetl.jlw.entity.StudentQuestionLogInfo; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; /** * StudentQuestionLogInfo Dao */ @SqlResource("jlw.studentQuestionLogInfo") -@Repository public interface StudentQuestionLogInfoDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteStudentQuestionLogInfoByIds(String ids); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java index df7f2030..f42457f1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java @@ -5,7 +5,6 @@ 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 org.springframework.stereotype.Repository; import java.util.Date; import java.util.List; @@ -16,7 +15,6 @@ import java.util.Map; * SysLog Dao */ @SqlResource("jlw.sysLog") -@Repository public interface SysLogDao extends BaseMapper { PageQuery queryByCondition(PageQuery query); @Update diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index 6548e3a6..190c6323 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherQuery; 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 org.springframework.stereotype.Repository; import java.util.List; @@ -15,10 +16,11 @@ import java.util.Map; * Teacher Dao */ @SqlResource("jlw.teacher") -@Repository public interface TeacherDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteTeacherByIds(String ids); + @Update public void deleteByIds(String ids); public Teacher getByUserId(Long userId); public List getByIds (String teacherIds); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java index 7f498665..3f845e6f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery; 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 org.springframework.stereotype.Repository; import java.util.List; @@ -14,11 +15,12 @@ import java.util.List; * TeacherMergeApplication Dao */ @SqlResource("jlw.teacherMergeApplication") -@Repository public interface TeacherMergeApplicationDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherMergeApplicationByIds(String ids); + @Update public int updateGivenByIds(TeacherMergeApplicationQuery teacherMergeApplicationQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherMergeApplicationQuery teacherMergeApplicationQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java index fadbba52..878acc8f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * 授课 Dao */ @SqlResource("jlw.teacherMergeSchoolClass") -@Repository public interface TeacherMergeSchoolClassDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherMergeSchoolClassByIds(String ids); + @Update public int updateGivenByIds(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java index ae1df12e..6ef4f5ea 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * TeacherOpenCourse Dao */ @SqlResource("jlw.teacherOpenCourse") -@Repository public interface TeacherOpenCourseDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherOpenCourseByIds(String ids); + @Update public int updateGivenByIds(TeacherOpenCourseQuery teacherOpenCourseQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherOpenCourseQuery teacherOpenCourseQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java index 6070af40..bfb92030 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * 课程开课关联教师 Dao */ @SqlResource("jlw.teacherOpenCourseMergeTeacher") -@Repository public interface TeacherOpenCourseMergeTeacherDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherOpenCourseMergeTeacherByIds(String ids); + @Update public int updateGivenByIds(TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java index 6777e0f1..322b22d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * 排课教室 Dao */ @SqlResource("jlw.teacherOpenCourseScheduleSessionClass") -@Repository public interface TeacherOpenCourseScheduleSessionClassDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherOpenCourseScheduleSessionClassByIds(String ids); + @Update public int updateGivenByIds(TeacherOpenCourseScheduleSessionClassQuery teacherOpenCourseScheduleSessionClassQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherOpenCourseScheduleSessionClassQuery teacherOpenCourseScheduleSessionClassQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java index 89933dbe..85157f5f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,12 +14,14 @@ import java.util.List; * 新增排课 Dao */ @SqlResource("jlw.teacherOpenCourseScheduleSession") -@Repository public interface TeacherOpenCourseScheduleSessionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherOpenCourseScheduleSessionByIds(String ids); + @Update public void deleteByIds(String ids); + @Update public int updateGivenByIds(TeacherOpenCourseScheduleSessionQuery teacherOpenCourseScheduleSessionQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherOpenCourseScheduleSessionQuery teacherOpenCourseScheduleSessionQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java index 001d2e3e..7c34ec4a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,11 +14,12 @@ import java.util.List; * 课次 Dao */ @SqlResource("jlw.teacherOpenCourseScheduleSessionTag") -@Repository public interface TeacherOpenCourseScheduleSessionTagDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteTeacherOpenCourseScheduleSessionTagByIds(String ids); + @Update public int updateGivenByIds(TeacherOpenCourseScheduleSessionTagQuery teacherOpenCourseScheduleSessionTagQuery); public List getByIds(String ids); public List getValuesByQuery(TeacherOpenCourseScheduleSessionTagQuery teacherOpenCourseScheduleSessionTagQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java index 550013fd..9321ed38 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java @@ -6,7 +6,6 @@ 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 org.springframework.stereotype.Repository; import java.util.List; @@ -15,9 +14,9 @@ import java.util.List; * UniversitiesColleges Dao */ @SqlResource("jlw.universitiesColleges") -@Repository public interface UniversitiesCollegesDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteUniversitiesCollegesByIds(String ids); public UniversitiesColleges getByOrgId (Long orgId); public List getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index 84129253..be271897 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResour import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,11 @@ import java.util.List; * UniversitiesCollegesJurisdictionCurriculumResources Dao */ @SqlResource("jlw.universitiesCollegesJurisdictionCurriculumResources") -@Repository public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteUniversitiesCollegesJurisdictionCurriculumResourcesByIds(String ids); + @Update public void deleteByUniversitiesCollegesId(Long universitiesCollegesId); public List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery universitiesCollegesJurisdictionCurriculumResourcesQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java index 51ec283e..c09173a9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSyst import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,11 @@ import java.util.List; * UniversitiesCollegesJurisdictionExperimentalSystem Dao */ @SqlResource("jlw.universitiesCollegesJurisdictionExperimentalSystem") -@Repository public interface UniversitiesCollegesJurisdictionExperimentalSystemDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); + @Update public void deleteUniversitiesCollegesJurisdictionExperimentalSystemByIds(String ids); + @Update public void deleteByUniversitiesCollegesId(Long universitiesCollegesId); public ListgetAllByQuery(UniversitiesCollegesJurisdictionExperimentalSystemQuery UniversitiesCollegesJurisdictionExperimentalSystemQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java index ab10698d..46af83ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.UniversityFacultyQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,12 +14,14 @@ import java.util.List; * 院系管理 Dao */ @SqlResource("jlw.universityFaculty") -@Repository public interface UniversityFacultyDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteUniversityFacultyByIds(String ids); + @Update public void deleteByIds(String ids); + @Update public int updateGivenByIds(UniversityFacultyQuery universityFacultyQuery); public List getByIds(String ids); public List getValuesByQuery(UniversityFacultyQuery universityFacultyQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java index 46996d38..1cd3e5a4 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitySystemQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,12 +14,14 @@ import java.util.List; * 专业管理 Dao */ @SqlResource("jlw.universitySystem") -@Repository public interface UniversitySystemDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByConditionQuery(PageQuery query); + @Update public void deleteUniversitySystemByIds(String ids); + @Update public void deleteByIds(String ids); + @Update public int updateGivenByIds(UniversitySystemQuery universitySystemQuery); public List getByIds(String ids); public List getValuesByQuery(UniversitySystemQuery universitySystemQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java index 9444c235..577eeb8e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java @@ -5,7 +5,7 @@ import com.ibeetl.jlw.web.query.WrongQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Repository; +import org.beetl.sql.mapper.annotation.Update; import java.util.List; @@ -14,10 +14,10 @@ import java.util.List; * WrongQuestion Dao */ @SqlResource("jlw.wrongQuestion") -@Repository public interface WrongQuestionDao extends BaseMapper{ public PageQuery queryByCondition(PageQuery query); public PageQuery queryByCondition2Student(PageQuery query); + @Update public void deleteWrongQuestionByIds(String ids); public List getValuesByQuery (WrongQuestionQuery wrongQuestionQuery); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java index 7b5777d4..9f9b7756 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AssignID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class ApplicationMergeTeacherOpenCourse extends BaseEntity{ //应用-开课关联ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse") private Long applicationMergeTeacherOpenCourseId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java b/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java index 21d35c02..853c5962 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class Attribute extends BaseEntity{ //属性ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long attributeId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java b/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java index 28acea3d..48d522d9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class AttributeGrouping extends BaseEntity{ //属性ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long attributeGroupingId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java b/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java index 0832831e..05b1dead 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class AttributeRelation extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long id ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java index fb43f3d2..4dbd72ec 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class Competition extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java index 6c67efe3..dc4eb6da 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class CompetitionNews extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionNewsId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java index f8509ad1..7d9d9f78 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -17,7 +16,7 @@ public class CompetitionStudents extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionStudentsId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java index 0af7a454..e4d94135 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -16,7 +15,7 @@ public class CompetitionTaskOneQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionTaskOneQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java index 794154a3..f05986b6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class CompetitionTaskSecondQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionTaskSecondQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java index 230f22dd..10bc6330 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -16,7 +15,7 @@ public class CompetitionTaskSecondQuestionStep extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionTaskSecondQuestionStepId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java index 2ad0fdf1..98dcb5cc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class CompetitionTeacherEvaluation extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long competitionTeacherEvaluationId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java index dcc4ace7..3bd896d9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class CourseInfo extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long courseInfoId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java b/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java index 1e154afc..6140edc9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class CourseLabel extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long courseLabelId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Exam.java b/web/src/main/java/com/ibeetl/jlw/entity/Exam.java index 71f8e551..c786bf61 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Exam.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Exam.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class Exam extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java index ee60febb..833e2237 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -17,7 +16,7 @@ public class ExamStudents extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examStudentsId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java index a0a716ef..09ad8d72 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -16,7 +15,7 @@ public class ExamTaskOneQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examTaskOneQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java index 8798cebc..a57ef1ed 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class ExamTaskSecondQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examTaskSecondQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java index 892b29f0..84cd5945 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -16,7 +15,7 @@ public class ExamTaskSecondQuestionStep extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examTaskSecondQuestionStepId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java index e47a54ea..0e572bef 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class ExamTaskThreeQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examTaskThreeQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java index ef47ef97..b4b7bd95 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -16,7 +15,7 @@ public class ExamTaskThreeQuestionStep extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long examTaskThreeQuestionStepId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java b/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java index 44a11650..54ed24af 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class IpAddress extends BaseEntity{ //id @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Integer id ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java index e33b979d..e2d45558 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class ResourcesApplication extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesApplicationId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java index 9b45a973..3aa1091f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class ResourcesApplicationCourse extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesApplicationCourseId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java index f86aa18d..a2f79913 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,7 +15,7 @@ public class ResourcesCompetition extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesCompetitionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java index d0d106df..a900b5bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -17,7 +16,7 @@ public class ResourcesCompetitionStep extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesCompetitionStepId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java index c90d826e..5bb0aada 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,7 +15,7 @@ public class ResourcesInfo extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesInfoId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java index 9347c513..4af14faf 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - +import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; - -import cn.jlw.validate.ValidateConfig; - -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.annotation.entity.InsertIgnore; -import org.beetl.sql.annotation.entity.Version; -import org.beetl.sql.annotation.entity.LogicDelete; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 资源管理 - 题库管理 @@ -25,7 +15,7 @@ public class ResourcesQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesQuestionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java index 6e7940ba..0814fd26 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java @@ -1,22 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - +import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; - -import cn.jlw.validate.ValidateConfig; - -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.annotation.entity.InsertIgnore; -import org.beetl.sql.annotation.entity.Version; -import org.beetl.sql.annotation.entity.LogicDelete; -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /* * 资源管理 - 实训案例管理 @@ -26,7 +15,7 @@ public class ResourcesTraining extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesTrainingId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java index 95c81dc8..9c14d0b8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -17,7 +16,7 @@ public class ResourcesTrainingStep extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long resourcesTrainingStepId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java index 47620bfc..057fe362 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java @@ -4,7 +4,6 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class SchoolClass extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long classId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Student.java b/web/src/main/java/com/ibeetl/jlw/entity/Student.java index f5407047..921723ff 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Student.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Student.java @@ -4,7 +4,6 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -18,7 +17,7 @@ public class Student extends BaseEntity{ //ID @NotNull(message = "请选择需要修改的学生", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java index fd832e12..56679a34 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class StudentClientLink extends BaseEntity{ //导航栏ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.StudentClientLink") private Long studentClientLinkId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java index 59f6f2a4..94f6d967 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class StudentDefenceLog extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentDefenceLogId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java index 7011e1e7..63657f63 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -17,7 +16,7 @@ public class StudentDefenceLogInfo extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentDefenceLogInfoId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java index c4b260e5..a0ff68b0 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class StudentDefenceLogNote extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentDefenceLogNoteId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java index 403dee4e..a9b13ac3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class StudentDirectMessages extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentDirectMessagesId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java index e4f551fa..8da1dd05 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -15,7 +14,7 @@ public class StudentQuestionLog extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentQuestionLogId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java index 0f4ad336..a55d620a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class StudentQuestionLogAnswer extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentQuestionLogAnswerId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java index 3a4d7685..6c0b6ba2 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -17,7 +16,7 @@ public class StudentQuestionLogInfo extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentQuestionLogInfoId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java b/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java index e226f973..220d9341 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class SysLog extends BaseEntity{ //主键 @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Integer id ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 03e48dfc..b388718a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -18,7 +18,7 @@ public class Teacher extends BaseEntity{ //ID @NotNull(message = "请选择需要修改的教师", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long teacherId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java index 1af7a615..76d6332f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java @@ -16,7 +16,7 @@ public class TeacherMergeApplication extends BaseEntity{ //教师-应用关联ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherMergeApplication") private Long teacherMergeApplicationId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java index 607ae3b1..c03fdb3d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,9 +16,8 @@ public class TeacherMergeSchoolClass extends BaseEntity{ //教师-班级关联ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherMergeSchoolClass") - private Long teacherMergeSchoolClassId ; //教师ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java index a71d8965..fa25c523 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class TeacherOpenCourse extends BaseEntity{ //课程开课ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourse") private Long teacherOpenCourseId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java index 4a8f9f1c..adf3c1ea 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class TeacherOpenCourseMergeTeacher extends BaseEntity{ //课程开课教师关联ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher") private Long teacherOpenCourseMergeTeacherId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index d8de7212..27f35a73 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ //课程开课-排课位置ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession") private Long teacherOpenCourseScheduleSessionId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java index 47cfc2c6..10e39956 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AssignID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class TeacherOpenCourseScheduleSessionClass extends BaseEntity{ //课程开课-排课位置ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass") private Long teacherOpenCourseScheduleSessionClassId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java index d71f0329..3e72efd1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AssignID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ //课程开课-课次标签ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag") private Long teacherOpenCourseScheduleSessionTagId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java index 5b2b4502..2df0712d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -17,7 +16,7 @@ public class UniversitiesColleges extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long universitiesCollegesId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java index ff041469..aa4ed8e5 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResources extends BaseEnt //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long universitiesCollegesJurisdictionCurriculumResourcesId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java index 19708b00..0bc47cb3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java @@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -16,7 +15,7 @@ public class UniversitiesCollegesJurisdictionExperimentalSystem extends BaseEnti //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long universitiesCollegesJurisdictionExperimentalSystemId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java index 32bf1e4a..91fa8407 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class UniversityFaculty extends BaseEntity{ //院系ID（学院ID） @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.UniversityFaculty") private Long universityFacultyId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java index 2c6868c7..f4e92025 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java @@ -4,7 +4,6 @@ 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 org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; @@ -17,7 +16,7 @@ public class UniversitySystem extends BaseEntity{ //专业ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.UniversitySystem") private Long universitySystemId ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java index f769204b..64b6b496 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java @@ -4,7 +4,6 @@ import cn.jlw.aliPay.utils.StringUtils; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; @@ -16,7 +15,7 @@ public class WrongQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long studentQuestionLogId ;