diff --git a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java index 3c914cb..3231621 100644 --- a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java +++ b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java @@ -1,19 +1,16 @@ package cn.com.tenlion.controller.api.apply; -import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; -import cn.com.tenlion.service.classplan.IClassPlanService; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyAuditVO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; -import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyVO; import cn.com.tenlion.service.apply.IApplyService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java b/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java index 4869054..f0bb51c 100644 --- a/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java +++ b/src/main/java/cn/com/tenlion/controller/api/applyauditlog/ApplyAuditLogController.java @@ -8,8 +8,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; -import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.materialstore.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.materialstore.pojo.vos.applyauditlog.ApplyAuditLogVO; import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java b/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java index 3e18b31..88ff4c2 100644 --- a/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java +++ b/src/main/java/cn/com/tenlion/controller/api/applyconfig/ApplyConfigController.java @@ -1,11 +1,8 @@ package cn.com.tenlion.controller.api.applyconfig; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.interfaces.manager.ISystemConfigManager; import ink.wgink.login.base.manager.ConfigManager; import ink.wgink.login.base.service.config.IConfigService; import ink.wgink.pojo.result.ErrorResult; diff --git a/src/main/java/cn/com/tenlion/controller/api/applystudents/ApplyStudentsController.java b/src/main/java/cn/com/tenlion/controller/api/applystudents/ApplyStudentsController.java index 3e0a251..324d374 100644 --- a/src/main/java/cn/com/tenlion/controller/api/applystudents/ApplyStudentsController.java +++ b/src/main/java/cn/com/tenlion/controller/api/applystudents/ApplyStudentsController.java @@ -1,8 +1,8 @@ package cn.com.tenlion.controller.api.applystudents; import cn.com.tenlion.listener.ImportExcelListener; -import cn.com.tenlion.pojo.dtos.excel.ImportFailDto; -import cn.com.tenlion.pojo.model.ApplyStudentsModel; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportFailDto; +import cn.com.tenlion.materialstore.pojo.model.ApplyStudentsModel; import cn.com.tenlion.service.handleimportexcel.IHandleImportExcelService; import cn.com.tenlion.util.ExcelUtil; import com.alibaba.excel.EasyExcel; @@ -15,8 +15,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.vos.applystudents.ApplyStudentsVO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.vos.applystudents.ApplyStudentsVO; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import io.swagger.annotations.*; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java b/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java index 6e2931c..69d6139 100644 --- a/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java +++ b/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java @@ -1,9 +1,9 @@ package cn.com.tenlion.controller.api.classplan; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanReportExamDTO; -import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanReportExamDTO; +import cn.com.tenlion.materialstore.pojo.vos.classplan.ClassPlanVO; import cn.com.tenlion.service.classplan.IClassPlanService; import com.alibaba.fastjson.JSONObject; import ink.wgink.annotation.CheckRequestBodyAnnotation; diff --git a/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java b/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java index 01408f0..1f3901e 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java @@ -1,8 +1,8 @@ package cn.com.tenlion.controller.api.examapply; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherLessonsTimeDTO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.teacher.ITeacherService; import ink.wgink.annotation.CheckRequestBodyAnnotation; diff --git a/src/main/java/cn/com/tenlion/controller/api/examcheck/ExamCheckController.java b/src/main/java/cn/com/tenlion/controller/api/examcheck/ExamCheckController.java index 70ada56..8a2357c 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examcheck/ExamCheckController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examcheck/ExamCheckController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.api.examcheck; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.service.examcheck.IExamCheckService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/distribution/DistributionController.java b/src/main/java/cn/com/tenlion/controller/api/examination/distribution/DistributionController.java index 8a04c7f..f2b5962 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examination/distribution/DistributionController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examination/distribution/DistributionController.java @@ -1,10 +1,10 @@ package cn.com.tenlion.controller.api.examination.distribution; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldCountDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldProportionDTO; -import cn.com.tenlion.pojo.vos.distribution.DistributionSaveVO; -import cn.com.tenlion.pojo.vos.distribution.DistributionVO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldCountDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldProportionDTO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionSaveVO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionVO; import cn.com.tenlion.service.examination.distribution.IDistributionService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java b/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java index 3d05d76..ca1a8ed 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java @@ -9,8 +9,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.vos.distributioncard.DistributionCardVO; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java b/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java index 534e80f..2985b54 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java @@ -1,6 +1,6 @@ package cn.com.tenlion.controller.api.examination.field; -import cn.com.tenlion.pojo.dtos.field.FieldDTO; +import cn.com.tenlion.materialstore.pojo.dtos.field.FieldDTO; import cn.com.tenlion.service.examination.field.IFieldService; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/stationuser/StationUserController.java b/src/main/java/cn/com/tenlion/controller/api/examination/stationuser/StationUserController.java index 01636d4..357eba2 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examination/stationuser/StationUserController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examination/stationuser/StationUserController.java @@ -12,8 +12,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; -import cn.com.tenlion.pojo.vos.stationuser.StationUserVO; +import cn.com.tenlion.materialstore.pojo.dtos.stationuser.StationUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.stationuser.StationUserVO; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/cn/com/tenlion/controller/api/examinationuser/ExaminationController.java b/src/main/java/cn/com/tenlion/controller/api/examinationuser/ExaminationController.java index 7f28999..8f64af1 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examinationuser/ExaminationController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examinationuser/ExaminationController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.api.examinationuser; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.vos.examinationuser.ExaminationVO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.vos.examinationuser.ExaminationVO; import cn.com.tenlion.service.examinationuser.IExaminationService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java b/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java index 68f3d77..6428fce 100644 --- a/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java +++ b/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java @@ -3,9 +3,9 @@ package cn.com.tenlion.controller.api.indexcount; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; @@ -15,7 +15,6 @@ import cn.com.tenlion.service.lessons.ILessonsService; import cn.com.tenlion.service.teacher.ITeacherService; import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import cn.com.tenlion.service.traininginstitutionworktype.ITrainingInstitutionWorkTypeService; -import cn.com.tenlion.service.worktype.IWorkTypeService; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; diff --git a/src/main/java/cn/com/tenlion/controller/api/lessons/LessonsController.java b/src/main/java/cn/com/tenlion/controller/api/lessons/LessonsController.java index 70bafd7..22d7300 100644 --- a/src/main/java/cn/com/tenlion/controller/api/lessons/LessonsController.java +++ b/src/main/java/cn/com/tenlion/controller/api/lessons/LessonsController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.api.lessons; -import cn.com.tenlion.pojo.dtos.lessons.LessonsDTO; -import cn.com.tenlion.pojo.vos.lessons.LessonsVO; +import cn.com.tenlion.materialstore.pojo.dtos.lessons.LessonsDTO; +import cn.com.tenlion.materialstore.pojo.vos.lessons.LessonsVO; import cn.com.tenlion.service.lessons.ILessonsService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/api/teacher/TeacherController.java b/src/main/java/cn/com/tenlion/controller/api/teacher/TeacherController.java index aaa625d..da0ac78 100644 --- a/src/main/java/cn/com/tenlion/controller/api/teacher/TeacherController.java +++ b/src/main/java/cn/com/tenlion/controller/api/teacher/TeacherController.java @@ -1,8 +1,8 @@ package cn.com.tenlion.controller.api.teacher; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.vos.teacher.TeacherVO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherDTO; +import cn.com.tenlion.materialstore.pojo.vos.teacher.TeacherVO; import cn.com.tenlion.service.teacher.ITeacherService; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.RemoveException; diff --git a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java index 3b00b2e..59c011d 100644 --- a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java +++ b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionserviceuser/TrainingInstitutionServiceUserController.java @@ -8,8 +8,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; import cn.com.tenlion.service.traininginstitutionserviceuser.ITrainingInstitutionServiceUserService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionuser/TrainingInstitutionUserController.java b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionuser/TrainingInstitutionUserController.java index d4f325f..165cf25 100644 --- a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionuser/TrainingInstitutionUserController.java +++ b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionuser/TrainingInstitutionUserController.java @@ -9,8 +9,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionworktype/TrainingInstitutionWorkTypeController.java b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionworktype/TrainingInstitutionWorkTypeController.java index 1bb6f42..146b9dc 100644 --- a/src/main/java/cn/com/tenlion/controller/api/traininginstitutionworktype/TrainingInstitutionWorkTypeController.java +++ b/src/main/java/cn/com/tenlion/controller/api/traininginstitutionworktype/TrainingInstitutionWorkTypeController.java @@ -1,6 +1,6 @@ package cn.com.tenlion.controller.api.traininginstitutionworktype; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.WorkTypeListVO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.WorkTypeListVO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -9,8 +9,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; import cn.com.tenlion.service.traininginstitutionworktype.ITrainingInstitutionWorkTypeService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java b/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java index dc3dcfb..59023fc 100644 --- a/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java +++ b/src/main/java/cn/com/tenlion/controller/api/worktype/WorkTypeController.java @@ -1,6 +1,6 @@ package cn.com.tenlion.controller.api.worktype; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeZTreeDTO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -9,8 +9,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.worktype.WorkTypeVO; import cn.com.tenlion.service.worktype.IWorkTypeService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java index 081b5e3..d95bb14 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java @@ -1,8 +1,8 @@ package cn.com.tenlion.controller.app.api.apply; -import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; -import cn.com.tenlion.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyAuditVO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.SearchException; @@ -13,8 +13,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyVO; import cn.com.tenlion.service.apply.IApplyService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java index e66bfa6..5f5ea8a 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/applyauditlog/ApplyAuditLogAppController.java @@ -8,8 +8,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; -import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.materialstore.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.materialstore.pojo.vos.applyauditlog.ApplyAuditLogVO; import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/applystudents/ApplyStudentsAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/applystudents/ApplyStudentsAppController.java index 13cc0da..bbabca3 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/applystudents/ApplyStudentsAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/applystudents/ApplyStudentsAppController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.app.api.applystudents; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.vos.applystudents.ApplyStudentsVO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.vos.applystudents.ApplyStudentsVO; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/basicstaffinfo/BasicStaffInfoAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/basicstaffinfo/BasicStaffInfoAppController.java index e5924e9..9cb7189 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/basicstaffinfo/BasicStaffInfoAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/basicstaffinfo/BasicStaffInfoAppController.java @@ -1,6 +1,6 @@ package cn.com.tenlion.controller.app.api.basicstaffinfo; -import cn.com.tenlion.pojo.dtos.myexam.MyExamDTO; +import cn.com.tenlion.materialstore.pojo.dtos.myexam.MyExamDTO; import cn.com.tenlion.service.myexamforapp.IMyExamForAppService; import cn.com.tenlion.staff.pojo.dtos.basicstaffinfo.BasicStaffInfoDTO; import cn.com.tenlion.staff.pojo.vos.basicstaffinfo.BasicStaffInfoVO; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examapply/ExamApplyAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examapply/ExamApplyAppController.java index fad2d7b..66c8ee9 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/examapply/ExamApplyAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/examapply/ExamApplyAppController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.app.api.examapply; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.examapply.IExamApplyService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examcheck/ExamCheckAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examcheck/ExamCheckAppController.java index 1e89187..6f95601 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/examcheck/ExamCheckAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/examcheck/ExamCheckAppController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.app.api.examcheck; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.service.examcheck.IExamCheckService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java index aa8c2e6..1e32c89 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java @@ -1,18 +1,13 @@ package cn.com.tenlion.controller.app.api.examination.distribution; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; import cn.com.tenlion.service.examination.distribution.IDistributionService; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; -import ink.wgink.pojo.result.SuccessResultData; -import ink.wgink.pojo.result.SuccessResultList; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Map; /** * @ClassName: DistributionAppController diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java index 2082bd0..986f518 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java @@ -1,25 +1,19 @@ package cn.com.tenlion.controller.app.api.examination.distributioncard; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; -import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.result.ErrorResult; -import ink.wgink.pojo.result.SuccessResult; -import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; import ink.wgink.util.ReflectUtil; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.HashMap; + import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examinationuser/ExaminationAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examinationuser/ExaminationAppController.java index 6834df8..abcdbe4 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/examinationuser/ExaminationAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/examinationuser/ExaminationAppController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.app.api.examinationuser; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.vos.examinationuser.ExaminationVO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.vos.examinationuser.ExaminationVO; import cn.com.tenlion.service.examinationuser.IExaminationService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/traininginstitutionuser/TrainingInstitutionUserAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/traininginstitutionuser/TrainingInstitutionUserAppController.java index e49cec2..0396a6a 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/traininginstitutionuser/TrainingInstitutionUserAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/traininginstitutionuser/TrainingInstitutionUserAppController.java @@ -8,8 +8,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/app/api/worktype/WorkTypeAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/worktype/WorkTypeAppController.java index 3ddc75b..92b58fb 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/worktype/WorkTypeAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/worktype/WorkTypeAppController.java @@ -8,8 +8,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.worktype.WorkTypeVO; import cn.com.tenlion.service.worktype.IWorkTypeService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/controller/resource/examapply/ExamApplyResourceController.java b/src/main/java/cn/com/tenlion/controller/resource/examapply/ExamApplyResourceController.java index c7f2346..5d439d4 100644 --- a/src/main/java/cn/com/tenlion/controller/resource/examapply/ExamApplyResourceController.java +++ b/src/main/java/cn/com/tenlion/controller/resource/examapply/ExamApplyResourceController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.resource.examapply; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.examapply.IExamApplyService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/resource/examcheck/ExamCheckResourceController.java b/src/main/java/cn/com/tenlion/controller/resource/examcheck/ExamCheckResourceController.java index 4f0f62d..98d74b0 100644 --- a/src/main/java/cn/com/tenlion/controller/resource/examcheck/ExamCheckResourceController.java +++ b/src/main/java/cn/com/tenlion/controller/resource/examcheck/ExamCheckResourceController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.resource.examcheck; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.service.examcheck.IExamCheckService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/controller/resource/examinationuser/ExaminationResourceController.java b/src/main/java/cn/com/tenlion/controller/resource/examinationuser/ExaminationResourceController.java index d5f6f18..3c59cd3 100644 --- a/src/main/java/cn/com/tenlion/controller/resource/examinationuser/ExaminationResourceController.java +++ b/src/main/java/cn/com/tenlion/controller/resource/examinationuser/ExaminationResourceController.java @@ -1,7 +1,7 @@ package cn.com.tenlion.controller.resource.examinationuser; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.vos.examinationuser.ExaminationVO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.vos.examinationuser.ExaminationVO; import cn.com.tenlion.service.examinationuser.IExaminationService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; diff --git a/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java b/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java index 15fbba2..7142c7d 100644 --- a/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java +++ b/src/main/java/cn/com/tenlion/dao/apply/IApplyDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.apply.ApplyBO; -import cn.com.tenlion.pojo.pos.apply.ApplyPO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.materialstore.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java b/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java index 921c70c..11967ed 100644 --- a/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java +++ b/src/main/java/cn/com/tenlion/dao/applyauditlog/IApplyAuditLogDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; -import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; -import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.materialstore.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.materialstore.pojo.pos.applyauditlog.ApplyAuditLogPO; +import cn.com.tenlion.materialstore.pojo.dtos.applyauditlog.ApplyAuditLogDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/applystudents/IApplyStudentsDao.java b/src/main/java/cn/com/tenlion/dao/applystudents/IApplyStudentsDao.java index ac5e04e..97f232f 100644 --- a/src/main/java/cn/com/tenlion/dao/applystudents/IApplyStudentsDao.java +++ b/src/main/java/cn/com/tenlion/dao/applystudents/IApplyStudentsDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.applystudents.ApplyStudentsBO; -import cn.com.tenlion.pojo.pos.applystudents.ApplyStudentsPO; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.bos.applystudents.ApplyStudentsBO; +import cn.com.tenlion.materialstore.pojo.pos.applystudents.ApplyStudentsPO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/classplan/IClassPlanDao.java b/src/main/java/cn/com/tenlion/dao/classplan/IClassPlanDao.java index 2d6e2e9..d232491 100644 --- a/src/main/java/cn/com/tenlion/dao/classplan/IClassPlanDao.java +++ b/src/main/java/cn/com/tenlion/dao/classplan/IClassPlanDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.classplan.ClassPlanBO; -import cn.com.tenlion.pojo.pos.classplan.ClassPlanPO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.bos.classplan.ClassPlanBO; +import cn.com.tenlion.materialstore.pojo.pos.classplan.ClassPlanPO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/examapply/IExamApplyDao.java b/src/main/java/cn/com/tenlion/dao/examapply/IExamApplyDao.java index 6c2959c..fa7ae36 100644 --- a/src/main/java/cn/com/tenlion/dao/examapply/IExamApplyDao.java +++ b/src/main/java/cn/com/tenlion/dao/examapply/IExamApplyDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.examapply; -import cn.com.tenlion.pojo.bos.examapply.ExamApplyBO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.pos.examapply.ExamApplyPO; +import cn.com.tenlion.materialstore.pojo.bos.examapply.ExamApplyBO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.pos.examapply.ExamApplyPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/examcheck/IExamCheckDao.java b/src/main/java/cn/com/tenlion/dao/examcheck/IExamCheckDao.java index 627088b..14f1991 100644 --- a/src/main/java/cn/com/tenlion/dao/examcheck/IExamCheckDao.java +++ b/src/main/java/cn/com/tenlion/dao/examcheck/IExamCheckDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.examcheck; -import cn.com.tenlion.pojo.bos.examcheck.ExamCheckBO; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.pos.examcheck.ExamCheckPO; +import cn.com.tenlion.materialstore.pojo.bos.examcheck.ExamCheckBO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.pos.examcheck.ExamCheckPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/examination/distribution/IDistributionDao.java b/src/main/java/cn/com/tenlion/dao/examination/distribution/IDistributionDao.java index a25e6ee..e29bb00 100644 --- a/src/main/java/cn/com/tenlion/dao/examination/distribution/IDistributionDao.java +++ b/src/main/java/cn/com/tenlion/dao/examination/distribution/IDistributionDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.examination.distribution; -import cn.com.tenlion.pojo.bos.distribution.DistributionBO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.pos.distribution.DistributionPO; +import cn.com.tenlion.materialstore.pojo.bos.distribution.DistributionBO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.pos.distribution.DistributionPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/examination/distributioncard/IDistributionCardDao.java b/src/main/java/cn/com/tenlion/dao/examination/distributioncard/IDistributionCardDao.java index e909b2c..1fe72d5 100644 --- a/src/main/java/cn/com/tenlion/dao/examination/distributioncard/IDistributionCardDao.java +++ b/src/main/java/cn/com/tenlion/dao/examination/distributioncard/IDistributionCardDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.examination.distributioncard; -import cn.com.tenlion.pojo.bos.distributioncard.DistributionCardBO; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.pos.distributioncard.DistributionCardPO; +import cn.com.tenlion.materialstore.pojo.bos.distributioncard.DistributionCardBO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.pos.distributioncard.DistributionCardPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/examination/distributionfield/IDistributionFieldDao.java b/src/main/java/cn/com/tenlion/dao/examination/distributionfield/IDistributionFieldDao.java index 80d14a5..720aee5 100644 --- a/src/main/java/cn/com/tenlion/dao/examination/distributionfield/IDistributionFieldDao.java +++ b/src/main/java/cn/com/tenlion/dao/examination/distributionfield/IDistributionFieldDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.examination.distributionfield; -import cn.com.tenlion.pojo.bos.distributionfield.DistributionFieldBO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.pos.distributionfield.DistributionFieldPO; +import cn.com.tenlion.materialstore.pojo.bos.distributionfield.DistributionFieldBO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.pos.distributionfield.DistributionFieldPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/examination/stationuser/IStationUserDao.java b/src/main/java/cn/com/tenlion/dao/examination/stationuser/IStationUserDao.java index 096fc69..854a295 100644 --- a/src/main/java/cn/com/tenlion/dao/examination/stationuser/IStationUserDao.java +++ b/src/main/java/cn/com/tenlion/dao/examination/stationuser/IStationUserDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.stationuser.StationUserBO; -import cn.com.tenlion.pojo.pos.stationuser.StationUserPO; -import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; +import cn.com.tenlion.materialstore.pojo.bos.stationuser.StationUserBO; +import cn.com.tenlion.materialstore.pojo.pos.stationuser.StationUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.stationuser.StationUserDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/examinationuser/IExaminationDao.java b/src/main/java/cn/com/tenlion/dao/examinationuser/IExaminationDao.java index de2b12c..9be57d7 100644 --- a/src/main/java/cn/com/tenlion/dao/examinationuser/IExaminationDao.java +++ b/src/main/java/cn/com/tenlion/dao/examinationuser/IExaminationDao.java @@ -1,9 +1,9 @@ package cn.com.tenlion.dao.examinationuser; -import cn.com.tenlion.pojo.bos.examinationuser.ExaminationBO; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.dtos.examinationhis.ExaminationHisDTO; -import cn.com.tenlion.pojo.pos.examinationuser.ExaminationPO; +import cn.com.tenlion.materialstore.pojo.bos.examinationuser.ExaminationBO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationhis.ExaminationHisDTO; +import cn.com.tenlion.materialstore.pojo.pos.examinationuser.ExaminationPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/excel/IExcelDao.java b/src/main/java/cn/com/tenlion/dao/excel/IExcelDao.java index 7a31fcd..635686c 100644 --- a/src/main/java/cn/com/tenlion/dao/excel/IExcelDao.java +++ b/src/main/java/cn/com/tenlion/dao/excel/IExcelDao.java @@ -1,6 +1,6 @@ package cn.com.tenlion.dao.excel; -import cn.com.tenlion.pojo.dtos.excel.ExcelDTO; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ExcelDTO; import ink.wgink.exceptions.SearchException; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cn/com/tenlion/dao/lessons/ILessonsDao.java b/src/main/java/cn/com/tenlion/dao/lessons/ILessonsDao.java index 9d03eed..003d61f 100644 --- a/src/main/java/cn/com/tenlion/dao/lessons/ILessonsDao.java +++ b/src/main/java/cn/com/tenlion/dao/lessons/ILessonsDao.java @@ -1,8 +1,8 @@ package cn.com.tenlion.dao.lessons; -import cn.com.tenlion.pojo.bos.lessons.LessonsBO; -import cn.com.tenlion.pojo.dtos.lessons.LessonsDTO; -import cn.com.tenlion.pojo.pos.lessons.LessonsPO; +import cn.com.tenlion.materialstore.pojo.bos.lessons.LessonsBO; +import cn.com.tenlion.materialstore.pojo.dtos.lessons.LessonsDTO; +import cn.com.tenlion.materialstore.pojo.pos.lessons.LessonsPO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; diff --git a/src/main/java/cn/com/tenlion/dao/teacher/ITeacherDao.java b/src/main/java/cn/com/tenlion/dao/teacher/ITeacherDao.java index 1b7e24d..70df58d 100644 --- a/src/main/java/cn/com/tenlion/dao/teacher/ITeacherDao.java +++ b/src/main/java/cn/com/tenlion/dao/teacher/ITeacherDao.java @@ -1,7 +1,7 @@ package cn.com.tenlion.dao.teacher; -import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherLessonsTimeDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java b/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java index 7dd77ed..c4fc432 100644 --- a/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java +++ b/src/main/java/cn/com/tenlion/dao/traininginstitutionserviceuser/ITrainingInstitutionServiceUserDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; -import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/traininginstitutionuser/ITrainingInstitutionUserDao.java b/src/main/java/cn/com/tenlion/dao/traininginstitutionuser/ITrainingInstitutionUserDao.java index 1e3994b..1fa5409 100644 --- a/src/main/java/cn/com/tenlion/dao/traininginstitutionuser/ITrainingInstitutionUserDao.java +++ b/src/main/java/cn/com/tenlion/dao/traininginstitutionuser/ITrainingInstitutionUserDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; -import cn.com.tenlion.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/traininginstitutionworktype/ITrainingInstitutionWorkTypeDao.java b/src/main/java/cn/com/tenlion/dao/traininginstitutionworktype/ITrainingInstitutionWorkTypeDao.java index 4fd4bb6..3690796 100644 --- a/src/main/java/cn/com/tenlion/dao/traininginstitutionworktype/ITrainingInstitutionWorkTypeDao.java +++ b/src/main/java/cn/com/tenlion/dao/traininginstitutionworktype/ITrainingInstitutionWorkTypeDao.java @@ -4,9 +4,9 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; -import cn.com.tenlion.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/dao/worktype/IWorkTypeDao.java b/src/main/java/cn/com/tenlion/dao/worktype/IWorkTypeDao.java index d086f63..4cf8237 100644 --- a/src/main/java/cn/com/tenlion/dao/worktype/IWorkTypeDao.java +++ b/src/main/java/cn/com/tenlion/dao/worktype/IWorkTypeDao.java @@ -1,13 +1,13 @@ package cn.com.tenlion.dao.worktype; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeZTreeDTO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import cn.com.tenlion.pojo.bos.worktype.WorkTypeBO; -import cn.com.tenlion.pojo.pos.worktype.WorkTypePO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.bos.worktype.WorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.worktype.WorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/listener/ImportExcelListener.java b/src/main/java/cn/com/tenlion/listener/ImportExcelListener.java index 7a8c5da..35d987c 100644 --- a/src/main/java/cn/com/tenlion/listener/ImportExcelListener.java +++ b/src/main/java/cn/com/tenlion/listener/ImportExcelListener.java @@ -1,8 +1,8 @@ package cn.com.tenlion.listener; -import cn.com.tenlion.pojo.dtos.excel.ImportFailDto; -import cn.com.tenlion.pojo.dtos.excel.ImportSuccessDto; -import cn.com.tenlion.pojo.model.ApplyStudentsModel; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportFailDto; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportSuccessDto; +import cn.com.tenlion.materialstore.pojo.model.ApplyStudentsModel; import cn.com.tenlion.service.handleimportexcel.IHandleImportExcelService; import cn.com.tenlion.util.ImportExcelHelper; import com.alibaba.excel.annotation.ExcelProperty; @@ -12,7 +12,6 @@ import com.alibaba.excel.exception.ExcelAnalysisException; import java.lang.reflect.Field; import java.util.*; -import java.util.stream.Collectors; /** * 导入excel的监听处理类 diff --git a/src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/apply/ApplyBO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/apply/ApplyBO.java index d68d26a..5fbc899 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/apply/ApplyBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/apply/ApplyBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.apply; +package cn.com.tenlion.materialstore.pojo.bos.apply; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/applyauditlog/ApplyAuditLogBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/applyauditlog/ApplyAuditLogBO.java index 975bef9..6a0d9a4 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/applyauditlog/ApplyAuditLogBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/applyauditlog/ApplyAuditLogBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.applyauditlog; +package cn.com.tenlion.materialstore.pojo.bos.applyauditlog; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/applystudents/ApplyStudentsBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/applystudents/ApplyStudentsBO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/bos/applystudents/ApplyStudentsBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/applystudents/ApplyStudentsBO.java index 379c576..f80189d 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/applystudents/ApplyStudentsBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/applystudents/ApplyStudentsBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.applystudents; +package cn.com.tenlion.materialstore.pojo.bos.applystudents; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/classplan/ClassPlanBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/classplan/ClassPlanBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/classplan/ClassPlanBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/classplan/ClassPlanBO.java index 74bb383..015728c 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/classplan/ClassPlanBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/classplan/ClassPlanBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.classplan; +package cn.com.tenlion.materialstore.pojo.bos.classplan; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/distribution/DistributionBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distribution/DistributionBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/distribution/DistributionBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/distribution/DistributionBO.java index 5a47639..72e48f2 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/distribution/DistributionBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distribution/DistributionBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.distribution; +package cn.com.tenlion.materialstore.pojo.bos.distribution; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/bos/distributioncard/DistributionCardBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributioncard/DistributionCardBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/distributioncard/DistributionCardBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributioncard/DistributionCardBO.java index e64ec95..d247460 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/distributioncard/DistributionCardBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributioncard/DistributionCardBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.distributioncard; +package cn.com.tenlion.materialstore.pojo.bos.distributioncard; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/bos/distributionfield/DistributionFieldBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributionfield/DistributionFieldBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/distributionfield/DistributionFieldBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributionfield/DistributionFieldBO.java index ec97b0a..cc8e69b 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/distributionfield/DistributionFieldBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/distributionfield/DistributionFieldBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.distributionfield; +package cn.com.tenlion.materialstore.pojo.bos.distributionfield; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examapply/ExamApplyBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/examapply/ExamApplyBO.java index 06c0bc4..e9586b6 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examapply/ExamApplyBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.examapply; +package cn.com.tenlion.materialstore.pojo.bos.examapply; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examcheck/ExamCheckBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/examcheck/ExamCheckBO.java index 72c64ac..3774277 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examcheck/ExamCheckBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.examcheck; +package cn.com.tenlion.materialstore.pojo.bos.examcheck; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examinationuser/ExaminationBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examinationuser/ExaminationBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/examinationuser/ExaminationBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/examinationuser/ExaminationBO.java index dc6d78f..12cc7d6 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examinationuser/ExaminationBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/examinationuser/ExaminationBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.examinationuser; +package cn.com.tenlion.materialstore.pojo.bos.examinationuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/lessons/LessonsBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/lessons/LessonsBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/lessons/LessonsBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/lessons/LessonsBO.java index 8b364b9..051aef0 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/lessons/LessonsBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/lessons/LessonsBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.lessons; +package cn.com.tenlion.materialstore.pojo.bos.lessons; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/stationuser/StationUserBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/stationuser/StationUserBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/stationuser/StationUserBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/stationuser/StationUserBO.java index 0ec3e8b..3ab3702 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/stationuser/StationUserBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/stationuser/StationUserBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.stationuser; +package cn.com.tenlion.materialstore.pojo.bos.stationuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java index 4d05c7e..75569ca 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionserviceuser/TrainingInstitutionServiceUserBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.traininginstitutionserviceuser; +package cn.com.tenlion.materialstore.pojo.bos.traininginstitutionserviceuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java similarity index 94% rename from src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java index cc9bf95..073a36c 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionuser/TrainingInstitutionUserBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.traininginstitutionuser; +package cn.com.tenlion.materialstore.pojo.bos.traininginstitutionuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java similarity index 94% rename from src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java index 4464bea..fce0c76 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/traininginstitutionworktype/TrainingInstitutionWorkTypeBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.traininginstitutionworktype; +package cn.com.tenlion.materialstore.pojo.bos.traininginstitutionworktype; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/worktype/WorkTypeBO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/bos/worktype/WorkTypeBO.java index 56fb2a1..b57b718 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/worktype/WorkTypeBO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/bos/worktype/WorkTypeBO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.bos.worktype; +package cn.com.tenlion.materialstore.pojo.bos.worktype; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyClassPlanDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyClassPlanDTO.java similarity index 88% rename from src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyClassPlanDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyClassPlanDTO.java index 4cd30c5..c045b9f 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyClassPlanDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyClassPlanDTO.java @@ -1,7 +1,7 @@ -package cn.com.tenlion.pojo.dtos.apply; +package cn.com.tenlion.materialstore.pojo.dtos.apply; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyDTO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyDTO.java index 881d593..3a7e475 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.apply; +package cn.com.tenlion.materialstore.pojo.dtos.apply; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java index 7d33141..771c5b8 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/apply/ApplyWorkTypeInstitutionDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.apply; +package cn.com.tenlion.materialstore.pojo.dtos.apply; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java index 4a4381c..33a1c50 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applyauditlog/ApplyAuditLogDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.applyauditlog; +package cn.com.tenlion.materialstore.pojo.dtos.applyauditlog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/applystudents/ApplyStudentsDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applystudents/ApplyStudentsDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/applystudents/ApplyStudentsDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applystudents/ApplyStudentsDTO.java index b653afc..9554085 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/applystudents/ApplyStudentsDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/applystudents/ApplyStudentsDTO.java @@ -1,6 +1,6 @@ -package cn.com.tenlion.pojo.dtos.applystudents; +package cn.com.tenlion.materialstore.pojo.dtos.applystudents; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java index 1f21915..885cb9f 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.classplan; +package cn.com.tenlion.materialstore.pojo.dtos.classplan; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanReportExamDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanReportExamDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanReportExamDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanReportExamDTO.java index 322e410..be3d9f9 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanReportExamDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/classplan/ClassPlanReportExamDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.classplan; +package cn.com.tenlion.materialstore.pojo.dtos.classplan; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distribution/DistributionDTO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distribution/DistributionDTO.java index 3f16ae3..78ffce0 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distribution/DistributionDTO.java @@ -1,7 +1,6 @@ -package cn.com.tenlion.pojo.dtos.distribution; +package cn.com.tenlion.materialstore.pojo.dtos.distribution; -import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributioncard/DistributionCardDTO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributioncard/DistributionCardDTO.java index 98614d0..f75478d 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributioncard/DistributionCardDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.distributioncard; +package cn.com.tenlion.materialstore.pojo.dtos.distributioncard; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldCountDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldCountDTO.java similarity index 90% rename from src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldCountDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldCountDTO.java index 1ca7887..8afe3a1 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldCountDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldCountDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.distributionfield; +package cn.com.tenlion.materialstore.pojo.dtos.distributionfield; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldDTO.java index 96ecbef..81959a0 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.distributionfield; +package cn.com.tenlion.materialstore.pojo.dtos.distributionfield; import ink.wgink.annotation.CheckNullAnnotation; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java similarity index 86% rename from src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java index 06e8713..c00e795 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/distributionfield/DistributionFieldProportionDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.distributionfield; +package cn.com.tenlion.materialstore.pojo.dtos.distributionfield; public class DistributionFieldProportionDTO { diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examapply/ExamApplyDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examapply/ExamApplyDTO.java index fbacbdc..77b5dbb 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examapply/ExamApplyDTO.java @@ -1,6 +1,6 @@ -package cn.com.tenlion.pojo.dtos.examapply; +package cn.com.tenlion.materialstore.pojo.dtos.examapply; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examcheck/ExamCheckDTO.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examcheck/ExamCheckDTO.java index dd430aa..7fe71fc 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examcheck/ExamCheckDTO.java @@ -1,6 +1,6 @@ -package cn.com.tenlion.pojo.dtos.examcheck; +package cn.com.tenlion.materialstore.pojo.dtos.examcheck; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examinationhis/ExaminationHisDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationhis/ExaminationHisDTO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/dtos/examinationhis/ExaminationHisDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationhis/ExaminationHisDTO.java index b819632..ad32643 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examinationhis/ExaminationHisDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationhis/ExaminationHisDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.examinationhis; +package cn.com.tenlion.materialstore.pojo.dtos.examinationhis; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examinationuser/ExaminationDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationuser/ExaminationDTO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/dtos/examinationuser/ExaminationDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationuser/ExaminationDTO.java index 8c7707f..2c946d8 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examinationuser/ExaminationDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/examinationuser/ExaminationDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.examinationuser; +package cn.com.tenlion.materialstore.pojo.dtos.examinationuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ExcelDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ExcelDTO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/dtos/excel/ExcelDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ExcelDTO.java index fb2d0f9..7cafb03 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ExcelDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ExcelDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.excel; +package cn.com.tenlion.materialstore.pojo.dtos.excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportFailDto.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportFailDto.java similarity index 92% rename from src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportFailDto.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportFailDto.java index eb2309b..b268f02 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportFailDto.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportFailDto.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.excel; +package cn.com.tenlion.materialstore.pojo.dtos.excel; import java.io.Serializable; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportResultDto.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportResultDto.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportResultDto.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportResultDto.java index 9adfac1..d151572 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportResultDto.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportResultDto.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.excel; +package cn.com.tenlion.materialstore.pojo.dtos.excel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportSuccessDto.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportSuccessDto.java similarity index 82% rename from src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportSuccessDto.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportSuccessDto.java index 4b6862d..00f48fa 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/excel/ImportSuccessDto.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/excel/ImportSuccessDto.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.excel; +package cn.com.tenlion.materialstore.pojo.dtos.excel; import java.io.Serializable; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/field/FieldDTO.java similarity index 92% rename from src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/field/FieldDTO.java index b726d9d..b19e9ba 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/field/FieldDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.field; +package cn.com.tenlion.materialstore.pojo.dtos.field; import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/lessons/LessonsDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/lessons/LessonsDTO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/dtos/lessons/LessonsDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/lessons/LessonsDTO.java index a3b73b9..f89f86b 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/lessons/LessonsDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/lessons/LessonsDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.lessons; +package cn.com.tenlion.materialstore.pojo.dtos.lessons; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/myexam/MyExamDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/myexam/MyExamDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/myexam/MyExamDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/myexam/MyExamDTO.java index 111df90..089418e 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/myexam/MyExamDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/myexam/MyExamDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.myexam; +package cn.com.tenlion.materialstore.pojo.dtos.myexam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/stationuser/StationUserDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/stationuser/StationUserDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/stationuser/StationUserDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/stationuser/StationUserDTO.java index f55a525..d8bee68 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/stationuser/StationUserDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/stationuser/StationUserDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.stationuser; +package cn.com.tenlion.materialstore.pojo.dtos.stationuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherDTO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherDTO.java index 805e978..f9ef397 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.teacher; +package cn.com.tenlion.materialstore.pojo.dtos.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherLessonsTimeDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherLessonsTimeDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherLessonsTimeDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherLessonsTimeDTO.java index f3d72b3..815d331 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/teacher/TeacherLessonsTimeDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/teacher/TeacherLessonsTimeDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.teacher; +package cn.com.tenlion.materialstore.pojo.dtos.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java index 07e0607..6807112 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionserviceuser/TrainingInstitutionServiceUserDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser; +package cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java index 387d5c9..e434a4a 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionuser/TrainingInstitutionUserDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.traininginstitutionuser; +package cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java index 2f69be3..08ad33c 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/traininginstitutionworktype/TrainingInstitutionWorkTypeDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.traininginstitutionworktype; +package cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeDTO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeDTO.java index 260bf87..1a75961 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.worktype; +package cn.com.tenlion.materialstore.pojo.dtos.worktype; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeZTreeDTO.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeZTreeDTO.java index 25e1154..c1071ea 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/worktype/WorkTypeZTreeDTO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/worktype/WorkTypeZTreeDTO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.dtos.worktype; +package cn.com.tenlion.materialstore.pojo.dtos.worktype; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/model/ApplyStudentsModel.java b/src/main/java/cn/com/tenlion/materialstore/pojo/model/ApplyStudentsModel.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/model/ApplyStudentsModel.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/model/ApplyStudentsModel.java index 2db5c09..7e528a6 100644 --- a/src/main/java/cn/com/tenlion/pojo/model/ApplyStudentsModel.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/model/ApplyStudentsModel.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.model; +package cn.com.tenlion.materialstore.pojo.model; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/apply/ApplyPO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/apply/ApplyPO.java index 05dc993..4d44b77 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/apply/ApplyPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.apply; +package cn.com.tenlion.materialstore.pojo.pos.apply; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/applyauditlog/ApplyAuditLogPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/applyauditlog/ApplyAuditLogPO.java index 7391de8..242074d 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/applyauditlog/ApplyAuditLogPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/applyauditlog/ApplyAuditLogPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.applyauditlog; +package cn.com.tenlion.materialstore.pojo.pos.applyauditlog; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/applystudents/ApplyStudentsPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/applystudents/ApplyStudentsPO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/pos/applystudents/ApplyStudentsPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/applystudents/ApplyStudentsPO.java index 702efe7..f636ccf 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/applystudents/ApplyStudentsPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/applystudents/ApplyStudentsPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.applystudents; +package cn.com.tenlion.materialstore.pojo.pos.applystudents; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/classplan/ClassPlanPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/classplan/ClassPlanPO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/classplan/ClassPlanPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/classplan/ClassPlanPO.java index ea942e1..787cc7c 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/classplan/ClassPlanPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/classplan/ClassPlanPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.classplan; +package cn.com.tenlion.materialstore.pojo.pos.classplan; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/distribution/DistributionPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distribution/DistributionPO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/distribution/DistributionPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/distribution/DistributionPO.java index 399c2c6..e92ee52 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/distribution/DistributionPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distribution/DistributionPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.distribution; +package cn.com.tenlion.materialstore.pojo.pos.distribution; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/pos/distributioncard/DistributionCardPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributioncard/DistributionCardPO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/distributioncard/DistributionCardPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributioncard/DistributionCardPO.java index ec46158..564f7f0 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/distributioncard/DistributionCardPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributioncard/DistributionCardPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.distributioncard; +package cn.com.tenlion.materialstore.pojo.pos.distributioncard; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/pos/distributionfield/DistributionFieldPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributionfield/DistributionFieldPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/distributionfield/DistributionFieldPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributionfield/DistributionFieldPO.java index 90f46a4..ac1f522 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/distributionfield/DistributionFieldPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/distributionfield/DistributionFieldPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.distributionfield; +package cn.com.tenlion.materialstore.pojo.pos.distributionfield; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examapply/ExamApplyPO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/examapply/ExamApplyPO.java index 4a49998..aa081ef 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examapply/ExamApplyPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.examapply; +package cn.com.tenlion.materialstore.pojo.pos.examapply; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examcheck/ExamCheckPO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/examcheck/ExamCheckPO.java index 1713a96..f769ca0 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examcheck/ExamCheckPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.examcheck; +package cn.com.tenlion.materialstore.pojo.pos.examcheck; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examinationuser/ExaminationPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examinationuser/ExaminationPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/examinationuser/ExaminationPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/examinationuser/ExaminationPO.java index 5af1eb7..7ee5f98 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examinationuser/ExaminationPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/examinationuser/ExaminationPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.examinationuser; +package cn.com.tenlion.materialstore.pojo.pos.examinationuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/lessons/LessonsPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/lessons/LessonsPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/lessons/LessonsPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/lessons/LessonsPO.java index aaf311a..a5e3d91 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/lessons/LessonsPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/lessons/LessonsPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.lessons; +package cn.com.tenlion.materialstore.pojo.pos.lessons; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/stationuser/StationUserPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/stationuser/StationUserPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/stationuser/StationUserPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/stationuser/StationUserPO.java index 1f058e9..591146d 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/stationuser/StationUserPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/stationuser/StationUserPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.stationuser; +package cn.com.tenlion.materialstore.pojo.pos.stationuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java index 84c20c8..84b441f 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionserviceuser/TrainingInstitutionServiceUserPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.traininginstitutionserviceuser; +package cn.com.tenlion.materialstore.pojo.pos.traininginstitutionserviceuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java similarity index 94% rename from src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java index 652821a..507ab08 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionuser/TrainingInstitutionUserPO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.traininginstitutionuser; +package cn.com.tenlion.materialstore.pojo.pos.traininginstitutionuser; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java similarity index 94% rename from src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java index 7f57fe4..f93fd38 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/traininginstitutionworktype/TrainingInstitutionWorkTypePO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.traininginstitutionworktype; +package cn.com.tenlion.materialstore.pojo.pos.traininginstitutionworktype; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/worktype/WorkTypePO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/pos/worktype/WorkTypePO.java index 95f02b8..805ecb3 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/worktype/WorkTypePO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/pos/worktype/WorkTypePO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.pos.worktype; +package cn.com.tenlion.materialstore.pojo.pos.worktype; /** * diff --git a/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyAuditVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyAuditVO.java similarity index 94% rename from src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyAuditVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyAuditVO.java index ddad1ce..a1b3d2f 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyAuditVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyAuditVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.apply; +package cn.com.tenlion.materialstore.pojo.vos.apply; public class ApplyAuditVO { diff --git a/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyVO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyVO.java index a5373eb..4396686 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/apply/ApplyVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/apply/ApplyVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.apply; +package cn.com.tenlion.materialstore.pojo.vos.apply; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/applyauditlog/ApplyAuditLogVO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/applyauditlog/ApplyAuditLogVO.java index d2cd619..2089f08 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/applyauditlog/ApplyAuditLogVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/applyauditlog/ApplyAuditLogVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.applyauditlog; +package cn.com.tenlion.materialstore.pojo.vos.applyauditlog; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/applystudents/ApplyStudentsVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/applystudents/ApplyStudentsVO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/vos/applystudents/ApplyStudentsVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/applystudents/ApplyStudentsVO.java index 12d4c33..67cfc44 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/applystudents/ApplyStudentsVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/applystudents/ApplyStudentsVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.applystudents; +package cn.com.tenlion.materialstore.pojo.vos.applystudents; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/classplan/ClassPlanVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/vos/classplan/ClassPlanVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java index 740a683..f118000 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/classplan/ClassPlanVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/classplan/ClassPlanVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.classplan; +package cn.com.tenlion.materialstore.pojo.vos.classplan; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionSaveVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionSaveVO.java index b9132bd..23cc4c2 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionSaveVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distribution; +package cn.com.tenlion.materialstore.pojo.vos.distribution; import ink.wgink.annotation.CheckNullAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionVO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionVO.java index a4616d1..1e5faff 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distribution/DistributionVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distribution; +package cn.com.tenlion.materialstore.pojo.vos.distribution; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNullAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardUserVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardUserVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardUserVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardUserVO.java index 0fca7e2..77e2643 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardUserVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardUserVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distributioncard; +package cn.com.tenlion.materialstore.pojo.vos.distributioncard; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardVO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardVO.java index 3944655..21bed60 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributioncard/DistributionCardVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distributioncard; +package cn.com.tenlion.materialstore.pojo.vos.distributioncard; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldSaveVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldSaveVO.java similarity index 92% rename from src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldSaveVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldSaveVO.java index 3cfce6a..d98e9cb 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldSaveVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldSaveVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distributionfield; +package cn.com.tenlion.materialstore.pojo.vos.distributionfield; import ink.wgink.annotation.CheckNullAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldVO.java similarity index 96% rename from src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldVO.java index d00211d..5f0af90 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distributionfield/DistributionFieldVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/distributionfield/DistributionFieldVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.distributionfield; +package cn.com.tenlion.materialstore.pojo.vos.distributionfield; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examapply/ExamApplyVO.java similarity index 99% rename from src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/examapply/ExamApplyVO.java index 4e84bc8..fd051de 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examapply/ExamApplyVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.examapply; +package cn.com.tenlion.materialstore.pojo.vos.examapply; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examcheck/ExamCheckVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/examcheck/ExamCheckVO.java index 08624fb..ca8aa98 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examcheck/ExamCheckVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.examcheck; +package cn.com.tenlion.materialstore.pojo.vos.examcheck; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examinationuser/ExaminationVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examinationuser/ExaminationVO.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/vos/examinationuser/ExaminationVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/examinationuser/ExaminationVO.java index 57b7479..03000e5 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examinationuser/ExaminationVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/examinationuser/ExaminationVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.examinationuser; +package cn.com.tenlion.materialstore.pojo.vos.examinationuser; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/lessons/LessonsVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/lessons/LessonsVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/lessons/LessonsVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/lessons/LessonsVO.java index 04a7d69..414796d 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/lessons/LessonsVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/lessons/LessonsVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.lessons; +package cn.com.tenlion.materialstore.pojo.vos.lessons; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/stationuser/StationUserVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/stationuser/StationUserVO.java similarity index 95% rename from src/main/java/cn/com/tenlion/pojo/vos/stationuser/StationUserVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/stationuser/StationUserVO.java index c61c159..d330d9e 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/stationuser/StationUserVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/stationuser/StationUserVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.stationuser; +package cn.com.tenlion.materialstore.pojo.vos.stationuser; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/teacher/TeacherVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/teacher/TeacherVO.java similarity index 98% rename from src/main/java/cn/com/tenlion/pojo/vos/teacher/TeacherVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/teacher/TeacherVO.java index 5c517da..e090d57 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/teacher/TeacherVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/teacher/TeacherVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.teacher; +package cn.com.tenlion.materialstore.pojo.vos.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java index 09115d0..ab97d39 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionserviceuser/TrainingInstitutionServiceUserVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.traininginstitutionserviceuser; +package cn.com.tenlion.materialstore.pojo.vos.traininginstitutionserviceuser; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/InstitutionUserVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/InstitutionUserVO.java similarity index 91% rename from src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/InstitutionUserVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/InstitutionUserVO.java index 69284ea..93a4852 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/InstitutionUserVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/InstitutionUserVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.traininginstitutionuser; +package cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java similarity index 93% rename from src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java index e2a81b7..ead346a 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionuser/TrainingInstitutionUserVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.traininginstitutionuser; +package cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java similarity index 93% rename from src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java index be96a70..4e59a5e 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/TrainingInstitutionWorkTypeVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.traininginstitutionworktype; +package cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java similarity index 83% rename from src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java index b5ca084..7b7c600 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/traininginstitutionworktype/WorkTypeListVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.traininginstitutionworktype; +package cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/worktype/WorkTypeVO.java similarity index 97% rename from src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java rename to src/main/java/cn/com/tenlion/materialstore/pojo/vos/worktype/WorkTypeVO.java index 853b749..d724093 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/worktype/WorkTypeVO.java +++ b/src/main/java/cn/com/tenlion/materialstore/pojo/vos/worktype/WorkTypeVO.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.pojo.vos.worktype; +package cn.com.tenlion.materialstore.pojo.vos.worktype; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java index 8ed1e46..504ad40 100644 --- a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java +++ b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java @@ -1,14 +1,14 @@ package cn.com.tenlion.service.apply; -import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; -import cn.com.tenlion.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyAuditVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; -import cn.com.tenlion.pojo.bos.apply.ApplyBO; -import cn.com.tenlion.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.materialstore.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.materialstore.pojo.pos.apply.ApplyPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 69849be..2fa180c 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -3,18 +3,18 @@ package cn.com.tenlion.service.apply.impl; import cn.com.tenlion.dao.apply.IApplyDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.apply.ApplyBO; -import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.pos.apply.ApplyPO; -import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; -import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.materialstore.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyWorkTypeInstitutionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyAuditVO; +import cn.com.tenlion.materialstore.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.materialstore.pojo.vos.applyauditlog.ApplyAuditLogVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import cn.com.tenlion.service.classplan.IClassPlanService; diff --git a/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java b/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java index 75cf3fd..dfe607a 100644 --- a/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java +++ b/src/main/java/cn/com/tenlion/service/applyauditlog/IApplyAuditLogService.java @@ -2,10 +2,10 @@ package cn.com.tenlion.service.applyauditlog; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; -import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; -import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; -import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; +import cn.com.tenlion.materialstore.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.materialstore.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.materialstore.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.materialstore.pojo.pos.applyauditlog.ApplyAuditLogPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java index f82ca2d..cc78439 100644 --- a/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applyauditlog/impl/ApplyAuditLogServiceImpl.java @@ -1,26 +1,22 @@ package cn.com.tenlion.service.applyauditlog.impl; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; import cn.com.tenlion.service.apply.IApplyService; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.date.DateUtil; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import cn.com.tenlion.dao.applyauditlog.IApplyAuditLogDao; -import cn.com.tenlion.pojo.dtos.applyauditlog.ApplyAuditLogDTO; -import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; -import cn.com.tenlion.pojo.bos.applyauditlog.ApplyAuditLogBO; -import cn.com.tenlion.pojo.pos.applyauditlog.ApplyAuditLogPO; +import cn.com.tenlion.materialstore.pojo.dtos.applyauditlog.ApplyAuditLogDTO; +import cn.com.tenlion.materialstore.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.materialstore.pojo.bos.applyauditlog.ApplyAuditLogBO; +import cn.com.tenlion.materialstore.pojo.pos.applyauditlog.ApplyAuditLogPO; import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/com/tenlion/service/applystudents/IApplyStudentsService.java b/src/main/java/cn/com/tenlion/service/applystudents/IApplyStudentsService.java index 848af81..49cd4e4 100644 --- a/src/main/java/cn/com/tenlion/service/applystudents/IApplyStudentsService.java +++ b/src/main/java/cn/com/tenlion/service/applystudents/IApplyStudentsService.java @@ -2,10 +2,10 @@ package cn.com.tenlion.service.applystudents; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.vos.applystudents.ApplyStudentsVO; -import cn.com.tenlion.pojo.bos.applystudents.ApplyStudentsBO; -import cn.com.tenlion.pojo.pos.applystudents.ApplyStudentsPO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.vos.applystudents.ApplyStudentsVO; +import cn.com.tenlion.materialstore.pojo.bos.applystudents.ApplyStudentsBO; +import cn.com.tenlion.materialstore.pojo.pos.applystudents.ApplyStudentsPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java index b2a2d33..54714e1 100644 --- a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java @@ -1,16 +1,15 @@ package cn.com.tenlion.service.applystudents.impl; import cn.com.tenlion.dao.applystudents.IApplyStudentsDao; -import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.applystudents.ApplyStudentsBO; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.pos.apply.ApplyPO; -import cn.com.tenlion.pojo.pos.applystudents.ApplyStudentsPO; -import cn.com.tenlion.pojo.vos.applystudents.ApplyStudentsVO; +import cn.com.tenlion.materialstore.pojo.bos.applystudents.ApplyStudentsBO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.materialstore.pojo.pos.applystudents.ApplyStudentsPO; +import cn.com.tenlion.materialstore.pojo.vos.applystudents.ApplyStudentsVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import cn.com.tenlion.service.classplan.IClassPlanService; diff --git a/src/main/java/cn/com/tenlion/service/classplan/IClassPlanService.java b/src/main/java/cn/com/tenlion/service/classplan/IClassPlanService.java index cc40f98..c58a52e 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/IClassPlanService.java +++ b/src/main/java/cn/com/tenlion/service/classplan/IClassPlanService.java @@ -1,11 +1,11 @@ package cn.com.tenlion.service.classplan; -import cn.com.tenlion.pojo.bos.classplan.ClassPlanBO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanReportExamDTO; -import cn.com.tenlion.pojo.pos.classplan.ClassPlanPO; -import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; +import cn.com.tenlion.materialstore.pojo.bos.classplan.ClassPlanBO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanReportExamDTO; +import cn.com.tenlion.materialstore.pojo.pos.classplan.ClassPlanPO; +import cn.com.tenlion.materialstore.pojo.vos.classplan.ClassPlanVO; import com.alibaba.fastjson.JSONObject; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index 40554a2..be5f127 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -4,21 +4,21 @@ import cn.com.tenlion.dao.classplan.IClassPlanDao; import cn.com.tenlion.dao.examcheck.IExamCheckDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.classplan.ClassPlanBO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanReportExamDTO; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.pos.classplan.ClassPlanPO; -import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.bos.classplan.ClassPlanBO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanReportExamDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherLessonsTimeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.pos.classplan.ClassPlanPO; +import cn.com.tenlion.materialstore.pojo.vos.classplan.ClassPlanVO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import cn.com.tenlion.service.classplan.IClassPlanService; diff --git a/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java b/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java index 25005d1..2dc8d6b 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java +++ b/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.examapply; -import cn.com.tenlion.pojo.bos.examapply.ExamApplyBO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.pos.examapply.ExamApplyPO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.bos.examapply.ExamApplyBO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.pos.examapply.ExamApplyPO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java index fac37a8..971da34 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java @@ -3,16 +3,14 @@ package cn.com.tenlion.service.examapply.impl; import cn.com.tenlion.dao.examapply.IExamApplyDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.examapply.ExamApplyBO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.pos.examapply.ExamApplyPO; -import cn.com.tenlion.pojo.vos.distribution.DistributionSaveVO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.bos.examapply.ExamApplyBO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.pos.examapply.ExamApplyPO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examination.distribution.IDistributionService; -import cn.com.tenlion.service.teacher.ITeacherService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java b/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java index 7e9984d..fb000c2 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.examcheck; -import cn.com.tenlion.pojo.bos.examcheck.ExamCheckBO; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.pos.examcheck.ExamCheckPO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.bos.examcheck.ExamCheckBO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.pos.examcheck.ExamCheckPO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index f7b5ca3..3b138ff 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -3,12 +3,12 @@ package cn.com.tenlion.service.examcheck.impl; import cn.com.tenlion.dao.examcheck.IExamCheckDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.examcheck.ExamCheckBO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; -import cn.com.tenlion.pojo.pos.examcheck.ExamCheckPO; -import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; -import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; +import cn.com.tenlion.materialstore.pojo.bos.examcheck.ExamCheckBO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examcheck.ExamCheckDTO; +import cn.com.tenlion.materialstore.pojo.pos.examcheck.ExamCheckPO; +import cn.com.tenlion.materialstore.pojo.vos.classplan.ClassPlanVO; +import cn.com.tenlion.materialstore.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/IDistributionService.java b/src/main/java/cn/com/tenlion/service/examination/distribution/IDistributionService.java index 4d9ea5f..40a9f24 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distribution/IDistributionService.java +++ b/src/main/java/cn/com/tenlion/service/examination/distribution/IDistributionService.java @@ -1,12 +1,12 @@ package cn.com.tenlion.service.examination.distribution; -import cn.com.tenlion.pojo.bos.distribution.DistributionBO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldCountDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldProportionDTO; -import cn.com.tenlion.pojo.pos.distribution.DistributionPO; -import cn.com.tenlion.pojo.vos.distribution.DistributionSaveVO; -import cn.com.tenlion.pojo.vos.distribution.DistributionVO; +import cn.com.tenlion.materialstore.pojo.bos.distribution.DistributionBO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldCountDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldProportionDTO; +import cn.com.tenlion.materialstore.pojo.pos.distribution.DistributionPO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionSaveVO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java index efc5596..a1a3121 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java @@ -3,21 +3,21 @@ package cn.com.tenlion.service.examination.distribution.impl; import cn.com.tenlion.dao.examination.distribution.IDistributionDao; import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; -import cn.com.tenlion.pojo.bos.distribution.DistributionBO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldCountDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldProportionDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.pos.distribution.DistributionPO; -import cn.com.tenlion.pojo.vos.distribution.DistributionSaveVO; -import cn.com.tenlion.pojo.vos.distribution.DistributionVO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldVO; -import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.materialstore.pojo.bos.distribution.DistributionBO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldCountDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldProportionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.pos.distribution.DistributionPO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionSaveVO; +import cn.com.tenlion.materialstore.pojo.vos.distribution.DistributionVO; +import cn.com.tenlion.materialstore.pojo.vos.distributioncard.DistributionCardVO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldVO; +import cn.com.tenlion.materialstore.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import cn.com.tenlion.service.classplan.IClassPlanService; diff --git a/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java b/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java index aa779c4..90d3bbb 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.examination.distributioncard; -import cn.com.tenlion.pojo.bos.distributioncard.DistributionCardBO; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.pos.distributioncard.DistributionCardPO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import cn.com.tenlion.materialstore.pojo.bos.distributioncard.DistributionCardBO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.pos.distributioncard.DistributionCardPO; +import cn.com.tenlion.materialstore.pojo.vos.distributioncard.DistributionCardVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java index 433061c..8c8fc28 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java @@ -4,14 +4,14 @@ import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicture import cn.com.tenlion.dao.examination.distributioncard.IDistributionCardDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.bos.distributioncard.DistributionCardBO; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.pos.distributioncard.DistributionCardPO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardUserVO; -import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import cn.com.tenlion.materialstore.pojo.bos.distributioncard.DistributionCardBO; +import cn.com.tenlion.materialstore.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.pos.distributioncard.DistributionCardPO; +import cn.com.tenlion.materialstore.pojo.vos.distributioncard.DistributionCardUserVO; +import cn.com.tenlion.materialstore.pojo.vos.distributioncard.DistributionCardVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.examination.distribution.IDistributionService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; diff --git a/src/main/java/cn/com/tenlion/service/examination/distributionfield/IDistributionFieldService.java b/src/main/java/cn/com/tenlion/service/examination/distributionfield/IDistributionFieldService.java index 8b14bda..ffb44d3 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributionfield/IDistributionFieldService.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributionfield/IDistributionFieldService.java @@ -1,13 +1,12 @@ package cn.com.tenlion.service.examination.distributionfield; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldSaveVO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldSaveVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldVO; -import cn.com.tenlion.pojo.bos.distributionfield.DistributionFieldBO; -import cn.com.tenlion.pojo.pos.distributionfield.DistributionFieldPO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldVO; +import cn.com.tenlion.materialstore.pojo.bos.distributionfield.DistributionFieldBO; +import cn.com.tenlion.materialstore.pojo.pos.distributionfield.DistributionFieldPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/examination/distributionfield/impl/DistributionFieldServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distributionfield/impl/DistributionFieldServiceImpl.java index b61ae29..1b92a30 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributionfield/impl/DistributionFieldServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributionfield/impl/DistributionFieldServiceImpl.java @@ -1,22 +1,19 @@ package cn.com.tenlion.service.examination.distributionfield.impl; import cn.com.tenlion.dao.examination.distributionfield.IDistributionFieldDao; -import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldSaveVO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldSaveVO; import cn.com.tenlion.service.examination.distributionfield.IDistributionFieldService; import cn.com.tenlion.service.examinationuser.IExaminationService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldVO; -import cn.com.tenlion.pojo.bos.distributionfield.DistributionFieldBO; -import cn.com.tenlion.pojo.pos.distributionfield.DistributionFieldPO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldVO; +import cn.com.tenlion.materialstore.pojo.bos.distributionfield.DistributionFieldBO; +import cn.com.tenlion.materialstore.pojo.pos.distributionfield.DistributionFieldPO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java b/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java index a5ee823..787fa95 100644 --- a/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java +++ b/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java @@ -1,13 +1,6 @@ package cn.com.tenlion.service.examination.field; -import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; -import cn.com.tenlion.pojo.bos.worktype.WorkTypeBO; -import cn.com.tenlion.pojo.dtos.field.FieldDTO; -import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; -import cn.com.tenlion.pojo.pos.worktype.WorkTypePO; -import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.materialstore.pojo.dtos.field.FieldDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java index 791bc8f..359d464 100644 --- a/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java @@ -5,7 +5,7 @@ import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; -import cn.com.tenlion.pojo.dtos.field.FieldDTO; +import cn.com.tenlion.materialstore.pojo.dtos.field.FieldDTO; import cn.com.tenlion.service.examination.field.IFieldService; import cn.com.tenlion.service.examination.stationuser.IStationUserService; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/cn/com/tenlion/service/examination/stationuser/IStationUserService.java b/src/main/java/cn/com/tenlion/service/examination/stationuser/IStationUserService.java index 39f7683..d3534a9 100644 --- a/src/main/java/cn/com/tenlion/service/examination/stationuser/IStationUserService.java +++ b/src/main/java/cn/com/tenlion/service/examination/stationuser/IStationUserService.java @@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSONArray; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; -import cn.com.tenlion.pojo.vos.stationuser.StationUserVO; -import cn.com.tenlion.pojo.bos.stationuser.StationUserBO; -import cn.com.tenlion.pojo.pos.stationuser.StationUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.stationuser.StationUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.stationuser.StationUserVO; +import cn.com.tenlion.materialstore.pojo.bos.stationuser.StationUserBO; +import cn.com.tenlion.materialstore.pojo.pos.stationuser.StationUserPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/examination/stationuser/impl/StationUserServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/stationuser/impl/StationUserServiceImpl.java index 1025f11..c9103a2 100644 --- a/src/main/java/cn/com/tenlion/service/examination/stationuser/impl/StationUserServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/stationuser/impl/StationUserServiceImpl.java @@ -10,10 +10,10 @@ import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; -import cn.com.tenlion.pojo.vos.stationuser.StationUserVO; -import cn.com.tenlion.pojo.bos.stationuser.StationUserBO; -import cn.com.tenlion.pojo.pos.stationuser.StationUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.stationuser.StationUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.stationuser.StationUserVO; +import cn.com.tenlion.materialstore.pojo.bos.stationuser.StationUserBO; +import cn.com.tenlion.materialstore.pojo.pos.stationuser.StationUserPO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/cn/com/tenlion/service/examinationuser/IExaminationService.java b/src/main/java/cn/com/tenlion/service/examinationuser/IExaminationService.java index 0fc8b3c..807a5a4 100644 --- a/src/main/java/cn/com/tenlion/service/examinationuser/IExaminationService.java +++ b/src/main/java/cn/com/tenlion/service/examinationuser/IExaminationService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.examinationuser; -import cn.com.tenlion.pojo.bos.examinationuser.ExaminationBO; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.pos.examinationuser.ExaminationPO; -import cn.com.tenlion.pojo.vos.examinationuser.ExaminationVO; +import cn.com.tenlion.materialstore.pojo.bos.examinationuser.ExaminationBO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.pos.examinationuser.ExaminationPO; +import cn.com.tenlion.materialstore.pojo.vos.examinationuser.ExaminationVO; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java b/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java index 9c97b8e..39df479 100644 --- a/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examinationuser/impl/ExaminationServiceImpl.java @@ -2,14 +2,14 @@ package cn.com.tenlion.service.examinationuser.impl; import cn.com.tenlion.dao.examapply.IExamApplyDao; import cn.com.tenlion.dao.examinationuser.IExaminationDao; -import cn.com.tenlion.pojo.bos.examinationuser.ExaminationBO; -import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; -import cn.com.tenlion.pojo.dtos.distributionfield.DistributionFieldDTO; -import cn.com.tenlion.pojo.dtos.examinationuser.ExaminationDTO; -import cn.com.tenlion.pojo.dtos.examinationhis.ExaminationHisDTO; -import cn.com.tenlion.pojo.pos.examinationuser.ExaminationPO; -import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldSaveVO; -import cn.com.tenlion.pojo.vos.examinationuser.ExaminationVO; +import cn.com.tenlion.materialstore.pojo.bos.examinationuser.ExaminationBO; +import cn.com.tenlion.materialstore.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributionfield.DistributionFieldDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationuser.ExaminationDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examinationhis.ExaminationHisDTO; +import cn.com.tenlion.materialstore.pojo.pos.examinationuser.ExaminationPO; +import cn.com.tenlion.materialstore.pojo.vos.distributionfield.DistributionFieldSaveVO; +import cn.com.tenlion.materialstore.pojo.vos.examinationuser.ExaminationVO; import cn.com.tenlion.service.examinationuser.IExaminationService; import cn.com.tenlion.service.examination.distribution.IDistributionService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; diff --git a/src/main/java/cn/com/tenlion/service/handleimportexcel/IHandleImportExcelService.java b/src/main/java/cn/com/tenlion/service/handleimportexcel/IHandleImportExcelService.java index 3b64429..669762f 100644 --- a/src/main/java/cn/com/tenlion/service/handleimportexcel/IHandleImportExcelService.java +++ b/src/main/java/cn/com/tenlion/service/handleimportexcel/IHandleImportExcelService.java @@ -1,8 +1,8 @@ package cn.com.tenlion.service.handleimportexcel; -import cn.com.tenlion.pojo.dtos.excel.ImportFailDto; -import cn.com.tenlion.pojo.dtos.excel.ImportResultDto; -import cn.com.tenlion.pojo.model.ApplyStudentsModel; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportFailDto; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportResultDto; +import cn.com.tenlion.materialstore.pojo.model.ApplyStudentsModel; import java.util.List; diff --git a/src/main/java/cn/com/tenlion/service/handleimportexcel/impl/HandleImportExcelServiceImpl.java b/src/main/java/cn/com/tenlion/service/handleimportexcel/impl/HandleImportExcelServiceImpl.java index f7f5cc3..191eab4 100644 --- a/src/main/java/cn/com/tenlion/service/handleimportexcel/impl/HandleImportExcelServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/handleimportexcel/impl/HandleImportExcelServiceImpl.java @@ -2,10 +2,10 @@ package cn.com.tenlion.service.handleimportexcel.impl; import cn.com.tenlion.dao.applystudents.IApplyStudentsDao; import cn.com.tenlion.dao.classplan.IClassPlanDao; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.excel.ImportFailDto; -import cn.com.tenlion.pojo.dtos.excel.ImportResultDto; -import cn.com.tenlion.pojo.model.ApplyStudentsModel; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportFailDto; +import cn.com.tenlion.materialstore.pojo.dtos.excel.ImportResultDto; +import cn.com.tenlion.materialstore.pojo.model.ApplyStudentsModel; import cn.com.tenlion.service.handleimportexcel.IHandleImportExcelService; import ink.wgink.common.base.DefaultBaseService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/service/lessons/ILessonsService.java b/src/main/java/cn/com/tenlion/service/lessons/ILessonsService.java index 529f9f1..d717a97 100644 --- a/src/main/java/cn/com/tenlion/service/lessons/ILessonsService.java +++ b/src/main/java/cn/com/tenlion/service/lessons/ILessonsService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.lessons; -import cn.com.tenlion.pojo.bos.lessons.LessonsBO; -import cn.com.tenlion.pojo.dtos.lessons.LessonsDTO; -import cn.com.tenlion.pojo.pos.lessons.LessonsPO; -import cn.com.tenlion.pojo.vos.lessons.LessonsVO; +import cn.com.tenlion.materialstore.pojo.bos.lessons.LessonsBO; +import cn.com.tenlion.materialstore.pojo.dtos.lessons.LessonsDTO; +import cn.com.tenlion.materialstore.pojo.pos.lessons.LessonsPO; +import cn.com.tenlion.materialstore.pojo.vos.lessons.LessonsVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; diff --git a/src/main/java/cn/com/tenlion/service/lessons/impl/LessonsServiceImpl.java b/src/main/java/cn/com/tenlion/service/lessons/impl/LessonsServiceImpl.java index f85edf4..c9bb92c 100644 --- a/src/main/java/cn/com/tenlion/service/lessons/impl/LessonsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/lessons/impl/LessonsServiceImpl.java @@ -1,10 +1,10 @@ package cn.com.tenlion.service.lessons.impl; import cn.com.tenlion.dao.lessons.ILessonsDao; -import cn.com.tenlion.pojo.bos.lessons.LessonsBO; -import cn.com.tenlion.pojo.dtos.lessons.LessonsDTO; -import cn.com.tenlion.pojo.pos.lessons.LessonsPO; -import cn.com.tenlion.pojo.vos.lessons.LessonsVO; +import cn.com.tenlion.materialstore.pojo.bos.lessons.LessonsBO; +import cn.com.tenlion.materialstore.pojo.dtos.lessons.LessonsDTO; +import cn.com.tenlion.materialstore.pojo.pos.lessons.LessonsPO; +import cn.com.tenlion.materialstore.pojo.vos.lessons.LessonsVO; import cn.com.tenlion.service.lessons.ILessonsService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/com/tenlion/service/myexamforapp/IMyExamForAppService.java b/src/main/java/cn/com/tenlion/service/myexamforapp/IMyExamForAppService.java index b05896b..da6ab03 100644 --- a/src/main/java/cn/com/tenlion/service/myexamforapp/IMyExamForAppService.java +++ b/src/main/java/cn/com/tenlion/service/myexamforapp/IMyExamForAppService.java @@ -1,6 +1,6 @@ package cn.com.tenlion.service.myexamforapp; -import cn.com.tenlion.pojo.dtos.myexam.MyExamDTO; +import cn.com.tenlion.materialstore.pojo.dtos.myexam.MyExamDTO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/myexamforapp/impl/MyExamForAppServiceImpl.java b/src/main/java/cn/com/tenlion/service/myexamforapp/impl/MyExamForAppServiceImpl.java index 3b83963..ea7fb2d 100644 --- a/src/main/java/cn/com/tenlion/service/myexamforapp/impl/MyExamForAppServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/myexamforapp/impl/MyExamForAppServiceImpl.java @@ -2,11 +2,11 @@ package cn.com.tenlion.service.myexamforapp.impl; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; -import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; -import cn.com.tenlion.pojo.dtos.myexam.MyExamDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.materialstore.pojo.dtos.examapply.ExamApplyDTO; +import cn.com.tenlion.materialstore.pojo.dtos.myexam.MyExamDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; diff --git a/src/main/java/cn/com/tenlion/service/teacher/ITeacherService.java b/src/main/java/cn/com/tenlion/service/teacher/ITeacherService.java index c9334e6..f89c511 100644 --- a/src/main/java/cn/com/tenlion/service/teacher/ITeacherService.java +++ b/src/main/java/cn/com/tenlion/service/teacher/ITeacherService.java @@ -1,9 +1,9 @@ package cn.com.tenlion.service.teacher; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; -import cn.com.tenlion.pojo.vos.teacher.TeacherVO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherLessonsTimeDTO; +import cn.com.tenlion.materialstore.pojo.vos.teacher.TeacherVO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.ListPage; diff --git a/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java b/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java index dffd571..0351b7b 100644 --- a/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java @@ -3,12 +3,12 @@ package cn.com.tenlion.service.teacher.impl; import cn.com.tenlion.dao.teacher.ITeacherDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; -import cn.com.tenlion.pojo.dtos.lessons.LessonsDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.vos.teacher.TeacherVO; +import cn.com.tenlion.materialstore.pojo.dtos.classplan.ClassPlanDTO; +import cn.com.tenlion.materialstore.pojo.dtos.lessons.LessonsDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherDTO; +import cn.com.tenlion.materialstore.pojo.dtos.teacher.TeacherLessonsTimeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.teacher.TeacherVO; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.lessons.ILessonsService; import cn.com.tenlion.service.teacher.ITeacherService; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java index 544802f..7ab11d3 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/ITrainingInstitutionServiceUserService.java @@ -2,10 +2,10 @@ package cn.com.tenlion.service.traininginstitutionserviceuser; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; -import cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java index 00da3f5..f575b65 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionserviceuser/impl/TrainingInstitutionServiceUserServiceImpl.java @@ -5,15 +5,14 @@ import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserSe import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import cn.com.tenlion.dao.traininginstitutionserviceuser.ITrainingInstitutionServiceUserDao; -import cn.com.tenlion.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; -import cn.com.tenlion.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionserviceuser.TrainingInstitutionServiceUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionserviceuser.TrainingInstitutionServiceUserVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionserviceuser.TrainingInstitutionServiceUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionserviceuser.TrainingInstitutionServiceUserPO; import cn.com.tenlion.service.traininginstitutionserviceuser.ITrainingInstitutionServiceUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionuser/ITrainingInstitutionUserService.java b/src/main/java/cn/com/tenlion/service/traininginstitutionuser/ITrainingInstitutionUserService.java index d544758..28dd82c 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionuser/ITrainingInstitutionUserService.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionuser/ITrainingInstitutionUserService.java @@ -3,10 +3,10 @@ package cn.com.tenlion.service.traininginstitutionuser; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; -import cn.com.tenlion.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionuser/impl/TrainingInstitutionUserServiceImpl.java b/src/main/java/cn/com/tenlion/service/traininginstitutionuser/impl/TrainingInstitutionUserServiceImpl.java index 0fcd0b0..bc809ad 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionuser/impl/TrainingInstitutionUserServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionuser/impl/TrainingInstitutionUserServiceImpl.java @@ -2,20 +2,19 @@ package cn.com.tenlion.service.traininginstitutionuser.impl; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; -import cn.com.tenlion.pojo.vos.traininginstitutionuser.InstitutionUserVO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser.InstitutionUserVO; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.interfaces.expand.login.ILoginHandlerService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.LoginUser; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import cn.com.tenlion.dao.traininginstitutionuser.ITrainingInstitutionUserDao; -import cn.com.tenlion.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; -import cn.com.tenlion.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; -import cn.com.tenlion.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionuser.TrainingInstitutionUserDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionuser.TrainingInstitutionUserVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionuser.TrainingInstitutionUserBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionuser.TrainingInstitutionUserPO; import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/ITrainingInstitutionWorkTypeService.java b/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/ITrainingInstitutionWorkTypeService.java index 628c052..6880027 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/ITrainingInstitutionWorkTypeService.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/ITrainingInstitutionWorkTypeService.java @@ -1,12 +1,12 @@ package cn.com.tenlion.service.traininginstitutionworktype; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.WorkTypeListVO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.WorkTypeListVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; -import cn.com.tenlion.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; -import cn.com.tenlion.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/impl/TrainingInstitutionWorkTypeServiceImpl.java b/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/impl/TrainingInstitutionWorkTypeServiceImpl.java index 2c77f47..9fa4cf9 100644 --- a/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/impl/TrainingInstitutionWorkTypeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/traininginstitutionworktype/impl/TrainingInstitutionWorkTypeServiceImpl.java @@ -1,17 +1,16 @@ package cn.com.tenlion.service.traininginstitutionworktype.impl; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.WorkTypeListVO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.WorkTypeListVO; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import cn.com.tenlion.dao.traininginstitutionworktype.ITrainingInstitutionWorkTypeDao; -import cn.com.tenlion.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; -import cn.com.tenlion.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; -import cn.com.tenlion.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; -import cn.com.tenlion.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.traininginstitutionworktype.TrainingInstitutionWorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.traininginstitutionworktype.TrainingInstitutionWorkTypeVO; +import cn.com.tenlion.materialstore.pojo.bos.traininginstitutionworktype.TrainingInstitutionWorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.traininginstitutionworktype.TrainingInstitutionWorkTypePO; import cn.com.tenlion.service.traininginstitutionworktype.ITrainingInstitutionWorkTypeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/com/tenlion/service/worktype/IWorkTypeService.java b/src/main/java/cn/com/tenlion/service/worktype/IWorkTypeService.java index 1b5b925..5f0912e 100644 --- a/src/main/java/cn/com/tenlion/service/worktype/IWorkTypeService.java +++ b/src/main/java/cn/com/tenlion/service/worktype/IWorkTypeService.java @@ -1,12 +1,12 @@ package cn.com.tenlion.service.worktype; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeZTreeDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; -import cn.com.tenlion.pojo.bos.worktype.WorkTypeBO; -import cn.com.tenlion.pojo.pos.worktype.WorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.materialstore.pojo.bos.worktype.WorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.worktype.WorkTypePO; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java b/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java index e0e17f0..4d06c50 100644 --- a/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/worktype/impl/WorkTypeServiceImpl.java @@ -1,18 +1,17 @@ package cn.com.tenlion.service.worktype.impl; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeZTreeDTO; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import cn.com.tenlion.dao.worktype.IWorkTypeDao; -import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; -import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; -import cn.com.tenlion.pojo.bos.worktype.WorkTypeBO; -import cn.com.tenlion.pojo.pos.worktype.WorkTypePO; +import cn.com.tenlion.materialstore.pojo.dtos.worktype.WorkTypeDTO; +import cn.com.tenlion.materialstore.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.materialstore.pojo.bos.worktype.WorkTypeBO; +import cn.com.tenlion.materialstore.pojo.pos.worktype.WorkTypePO; import cn.com.tenlion.service.worktype.IWorkTypeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/com/tenlion/util/ImportExcelHelper.java b/src/main/java/cn/com/tenlion/util/ImportExcelHelper.java index 4db87a9..f9a2f10 100644 --- a/src/main/java/cn/com/tenlion/util/ImportExcelHelper.java +++ b/src/main/java/cn/com/tenlion/util/ImportExcelHelper.java @@ -1,7 +1,7 @@ package cn.com.tenlion.util; import cn.com.tenlion.dao.excel.IExcelDao; -import cn.com.tenlion.pojo.model.ApplyStudentsModel; +import cn.com.tenlion.materialstore.pojo.model.ApplyStudentsModel; import cn.com.tenlion.service.handleimportexcel.IHandleImportExcelService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index de08097..1df3848 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: port: 7009 - url: http://127.0.0.1:7009/signup + url: http://192.168.0.115:7009/signup system-title: 考试报名系统 system-sub-title: 考试报名系统 default-home-page: indexweb @@ -26,11 +26,11 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://49.232.216.45:3306/db_module_building_pictures?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://192.168.0.151:3306/db_baotou_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver - username: liuyang - password: tsliuyang + username: root + password: root initial-size: 2 min-idle: 2 max-active: 5 diff --git a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml index 25c672e..8672811 100644 --- a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml @@ -2,7 +2,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml b/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml index f3f40a1..97d5a9a 100644 --- a/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml +++ b/src/main/resources/mybatis/mapper/applyauditlog/apply-audit-log-mapper.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/applystudents/apply-students-mapper.xml b/src/main/resources/mybatis/mapper/applystudents/apply-students-mapper.xml index 9fae13e..f2f6da7 100644 --- a/src/main/resources/mybatis/mapper/applystudents/apply-students-mapper.xml +++ b/src/main/resources/mybatis/mapper/applystudents/apply-students-mapper.xml @@ -2,7 +2,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml index 828c3e5..2584db9 100644 --- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml +++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml @@ -2,7 +2,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml b/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml index a31db57..949efc4 100644 --- a/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml +++ b/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml @@ -2,7 +2,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml b/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml index 15daae8..4531bf7 100644 --- a/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml +++ b/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml @@ -2,7 +2,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/distributionfield/distribution-field-mapper.xml b/src/main/resources/mybatis/mapper/distributionfield/distribution-field-mapper.xml index 3d43bff..8efd388 100644 --- a/src/main/resources/mybatis/mapper/distributionfield/distribution-field-mapper.xml +++ b/src/main/resources/mybatis/mapper/distributionfield/distribution-field-mapper.xml @@ -2,7 +2,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml index 11cd3b0..419b4fe 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -2,7 +2,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml index 6e7af74..1229bf0 100644 --- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml +++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/examinationuser/examination-mapper.xml b/src/main/resources/mybatis/mapper/examinationuser/examination-mapper.xml index 2617dfb..3798f25 100644 --- a/src/main/resources/mybatis/mapper/examinationuser/examination-mapper.xml +++ b/src/main/resources/mybatis/mapper/examinationuser/examination-mapper.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/lessons/lessons-mapper.xml b/src/main/resources/mybatis/mapper/lessons/lessons-mapper.xml index 9670f3f..78ac04e 100644 --- a/src/main/resources/mybatis/mapper/lessons/lessons-mapper.xml +++ b/src/main/resources/mybatis/mapper/lessons/lessons-mapper.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/stationuser/station-user-mapper.xml b/src/main/resources/mybatis/mapper/stationuser/station-user-mapper.xml index 019af14..8c5996d 100644 --- a/src/main/resources/mybatis/mapper/stationuser/station-user-mapper.xml +++ b/src/main/resources/mybatis/mapper/stationuser/station-user-mapper.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml b/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml index 9df318d..8bd4559 100644 --- a/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml +++ b/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml @@ -2,7 +2,7 @@ - + @@ -254,7 +254,7 @@ WHERE is_delete = 0 AND org_id = #{orgId} - + diff --git a/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml b/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml index f3caf9b..cae9425 100644 --- a/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml +++ b/src/main/resources/mybatis/mapper/traininginstitutionserviceuser/training-institution-service-user-mapper.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/src/main/resources/mybatis/mapper/traininginstitutionuser/training-institution-user-mapper.xml b/src/main/resources/mybatis/mapper/traininginstitutionuser/training-institution-user-mapper.xml index 879c8bf..6f3fc51 100644 --- a/src/main/resources/mybatis/mapper/traininginstitutionuser/training-institution-user-mapper.xml +++ b/src/main/resources/mybatis/mapper/traininginstitutionuser/training-institution-user-mapper.xml @@ -2,7 +2,7 @@ - + @@ -10,14 +10,14 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml b/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml index fc78ebe..b1f0e1a 100644 --- a/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/traininginstitutionworktype/training-institution-work-type-mapper.xml @@ -2,21 +2,21 @@ - + - + - + diff --git a/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml b/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml index 1cb9d6f..fa0f248 100644 --- a/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/worktype/work-type-mapper.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -45,7 +45,7 @@ - +