Skip to content

涂亚平 / electron

Go to a project
Commit e6508a56 by 涂亚平
Options

电子信息第一次上线

1 parent b589f99f
Inline Side-by-side
Showing with 851 additions and 695 deletions
.idea/workspace.xml
......@@ -2,567 +2,44 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e82733a3-3c3d-4d7f-90eb-e52456e72ec4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_6_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/DataSourceAspect.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/DataSourceSwitch.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/DbContextHolder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/DynamicDataSource.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/DBTypeEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/ProjectAssignStatus.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2025-12-26-0.log238105064062600.tmp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2026-06-11-0.log83820385586800.tmp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectChildUtilsService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectChildUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/application-dm.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/electron.iml" beforeDir="false" afterPath="$PROJECT_DIR$/electron.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/springboot-logback-info.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-06-25-0.log369654871580500.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-07-17-0.log697102954626500.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2025-06-23-0.log889027455809700.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2025-06-25-0.log1776510630187400.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2025-07-08-0.log114997343299600.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-06-07-0.log1551670073619900.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-06-12-0.log1902288615402600.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-06-23-0.log884130424764700.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-06-24-0.log973484542888100.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-07-09-0.log108950183181400.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/info/2025-09-16-0.log468194821761300.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/MybatisPlusConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/MybatisPlusConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/generator/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/generator/CodeGenerator.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/interceptor/AuthenticationInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/interceptor/AuthenticationInterceptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/utils/ConstantUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/utils/ConstantUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/CollegesDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/CollegesDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MajorDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MajorDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/ProjectType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/constant/ProjectType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/exception/GlobalExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/exception/GlobalExceptionHandler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MatchDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MatchDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MatchScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MatchScheduleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/MessageController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/OssController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/OssController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectJudgeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectReviewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectReviewController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectSchoolJudgeController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/ProjectSchoolReviewController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/StudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/controller/StudentController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/CollegesDictDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotGroupDictMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotGroupDictMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsGroupItemsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsGroupItemsMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsScoresMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/DrawLotsScoresMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/MatchDictDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/MatchDictDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/ProjectDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/ProjectDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/ProjectSchoolJudgeDAO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dao/ProjectSchoolReviewDAO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/administer/LoginDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/dto/student/RegisterDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectSchoolJudgeDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectSchoolReviewDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/ProjectJudgeDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/StudentDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/model/StudentDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MajorDictService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MajorDictService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MatchDictService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MatchDictService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MatchScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/MatchScheduleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectJudgeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectJudgeService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectReviewPeriodService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectReviewService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectReviewService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectSchoolJudgeService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectSchoolReviewService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/ProjectService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/CollegesDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsGroupJudgesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsGroupJudgesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsScenesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsScenesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsScoresServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/DrawLotsScoresServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MajorDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MajorDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchCollegePdfServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchCollegePdfServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchScheduleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MatchScheduleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/MessageServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectJudgeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectJudgeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectReviewPeriodServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectReviewPeriodServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectReviewServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectReviewServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectSchoolJudgeServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectSchoolReviewServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/SmsCodeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/SmsCodeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/SmsNoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/SmsNoticeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/StudentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/StudentServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/YearDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/YearDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/ProjectAssignNumVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/ProjectAssignNumVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/ReviewListVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/ReviewListVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/SeedTrackProjectPageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/SeedTrackProjectPageVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/VocationalReviewNumVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/VocationalReviewNumVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/judge/ProjectJudgePageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/judge/ProjectJudgePageVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/VocationalProjectNum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/project/VocationalProjectNum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/student/StudentInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zhongzhi/vo/student/StudentInfoVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-pre.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/code.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/code.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MatchDictDAO.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MatchDictDAO.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectDAO.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectDAO.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectJudgeDAO.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectJudgeDAO.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectReviewDAO.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectReviewDAO.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectSchoolJudgeDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectSchoolReviewDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/electron.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-dev.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-pre.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-prod.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/banner.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/code.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/ZhongzhiApplication.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/AliyunSmsProperties.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/MybatisPlusConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/RemoteProperties.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/SwaggerConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/VODConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/configure/WebConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/Code.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/MemberType.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/OpenStatus.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/PDFCheckBox.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/Platform.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/ProjectProgress.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/ProjectReview.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/ProjectSchedule.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/ProjectStatus.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/ProjectType.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/RoleType.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/SMSTemplate.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/SmsCode.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/SubmitStatus.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/constant/TeachType.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/exception/GlobalExceptionHandler.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/exception/HttpException.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/generator/CodeGenerator$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/generator/CodeGenerator$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/generator/CodeGenerator.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/handler/MetaHandler.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/interceptor/AuthenticationInterceptor.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/AliyunSmsUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/ApplicationContextUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/ConstantUtils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/DateFormatUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/ExcelColumn.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/ExcelUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/IpAddressUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/JwtUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/Localstorage.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/LoginRequired.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/PDFUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/RandomUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/ResponseData.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/SMSSendUtils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/Signature.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/SmsUtils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/SysLog.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/common/utils/VodUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/AdministerController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/AdministerPermissionController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/CollegesDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/CourseDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotGroupDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotsGroupItemsController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotsGroupJudgesController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotsJudgeNumController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotsScenesController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/DrawLotsScoresController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/FinalMatchMemberController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/FundDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ItemFieldDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MajorDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MatchCollegeCountController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MatchCollegePdfController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MatchDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MatchScheduleController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/MessageController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/OssController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/PermissionsController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectAwardController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectCopyrightController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectJudgeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectMaterialsController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectMemberController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectOwnershipStructureController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectPaperController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectPatentController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectReviewController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectReviewPeriodController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectScheduleRecordController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectSchoolJudgeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectSchoolReviewController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectTrademarkController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/ProjectWorksController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/SmsCodeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/SmsNoticeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/StudentController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/VodDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/controller/YearDictController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/AdministerDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/AdministerPermissionDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/CollegesDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/CourseDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotGroupDictMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotsGroupItemsMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotsGroupJudgesMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotsJudgeNumMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotsScenesMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/DrawLotsScoresMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/FinalMatchMemberDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/FundDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ItemFieldDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MajorDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MatchCollegeCountDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MatchCollegePdfMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MatchDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MatchScheduleDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/MessageDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/PermissionsDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectAwardMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectCopyrightMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectJudgeDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectMaterialsDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectMemberDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectOwnershipStructureDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectPaperMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectPatentMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectReviewDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectReviewPeriodMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectScheduleRecordDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectSchoolJudgeDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectSchoolReviewDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectTrademarkMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/ProjectWorksMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/SmsCodeDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/SmsNoticeMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/StudentDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/VodDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dao/YearDictDAO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/administer/AdministerPageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/administer/LoginDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/AddProjectMemberDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/AwardedListDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/CollegesDOT.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/CollegesDictDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/CollegesPageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/DownloadErrorDataDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/ExportCollegeDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/GetCollegesListDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/LoginDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/LoginStatusDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/RegisterMembersDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/college/UpdatePwdDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/course/ChangeOrdersDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/course/CoursesDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/course/VodsDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/AddJudgeDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/AddProjectToSceneDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/AllGroupItemsDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/CollegeProjectsDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/DrawLoginDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/GroupScoresDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/JudgeScoreScreenDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/drawlots/MatchProjectsDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/judge/MatchJudgesDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/judge/ProjectJudgePageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/match/MatchDictDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/match/SelectListPageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/member/CreateProjectMemberDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/member/MentorDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/member/TeamMemberDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/message/MessagePageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/notice/SmsNoticeDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/notice/SmsNoticePageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/period/ProjectReviewPeriodDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ApproveDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/AttendCountDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/BatchRollbackDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/CollegeProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/CreateMainTrackProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/CreateSeedTrackProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/CreateVocationalProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/DataOverviewDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/DownloadCulturalPDFDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/EditStatusDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ExportDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ExportProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ImportVocationalProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/PrintAttachmentDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ProjectCollegeListDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ProjectListPageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ReviewListDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/ReviewVocationalNumDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/SeedTrackProjectNumDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/project/StudentProjectDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/projectJudge/ImportJudge.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/CancelReviewDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/ProjectReviewDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/ProjectReviewPageDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/ProjectReviewScoreDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/ReviewScoreDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/SetReviewDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/review/SubmittedDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/scheduleRecord/ProjectScheduleRecordDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/student/LoginDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/dto/student/RegisterDTO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/AdministerDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/AdministerPermissionDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/CollegesDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/CourseDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotGroupDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotsGroupItemsDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotsGroupJudgesDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotsJudgeNumDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotsScenesDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/DrawLotsScoresDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/FinalMatchMemberDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/FundDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ItemFieldDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MajorDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MatchCollegeCountDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MatchCollegePdfDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MatchDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MatchScheduleDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/MessageDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/PermissionsDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectAwardDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectCopyrightDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectJudgeDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectMaterialsDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectMemberDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectOwnershipStructureDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectPaperDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectPatentDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectReviewDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectReviewPeriodDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectScheduleRecordDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectSchoolJudgeDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectSchoolReviewDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectTrademarkDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/ProjectWorksDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/SmsCodeDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/SmsNoticeDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/StudentDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/VodDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/YearDictDO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/model/base/BaseModel.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/AdministerPermissionService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/AdministerService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/CollegesDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/CourseDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotGroupDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotsGroupItemsService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotsGroupJudgesService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotsJudgeNumService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotsScenesService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/DrawLotsScoresService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/FinalMatchMemberService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/FundDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ItemFieldDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MajorDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MatchCollegeCountService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MatchCollegePdfService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MatchDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MatchScheduleService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/MessageService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/PermissionsService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectAwardService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectCopyrightService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectJudgeService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectMaterialsService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectMemberService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectOwnershipStructureService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectPaperService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectPatentService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectReviewPeriodService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectReviewService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectScheduleRecordService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectSchoolJudgeService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectSchoolReviewService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectTrademarkService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/ProjectWorksService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/SmsCodeService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/SmsNoticeService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/StudentService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/VodDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/YearDictService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/AdministerPermissionServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/AdministerServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/CollegesDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/CourseDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotGroupDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotsGroupItemsServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotsGroupJudgesServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotsJudgeNumServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotsScenesServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/DrawLotsScoresServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/FinalMatchMemberServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/FundDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ItemFieldDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MajorDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MatchCollegeCountServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MatchCollegePdfServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MatchDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MatchScheduleServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/MessageServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/PermissionsServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectAwardServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectCopyrightServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectJudgeServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectMaterialsServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectMemberServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectOwnershipStructureServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectPaperServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectPatentServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectReviewPeriodServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectReviewServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectScheduleRecordServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectSchoolJudgeServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectSchoolReviewServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectTrademarkServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/ProjectWorksServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/SmsCodeServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/SmsNoticeServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/StudentServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/VodDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/service/impl/YearDictServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/ExcelFieldVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/ResponseVO$ResponseVOBuilder.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/ResponseVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/administer/AdministerVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/AwardedListVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/CollegePageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/CollegesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/DetailVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/ExportListVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/GetCollegeInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/RegisterMembersVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/college/SchoolsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/course/CourseVodsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/course/CoursesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/course/SignatureVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/course/VodsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/AllGroupItemsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/AllGroupsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/CollegeProjectsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/DrawJudgeInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/DrawlotsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupJudgeScoresVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupJudgesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupProjectInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupProjectScreenVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupRankVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/GroupScoresVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/JudgeFullInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/JudgeScoreScreenVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/JudgeScreenVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/LeaderFullVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/LoginVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/MatchJudgesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/MatchProjectsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/QueryItemsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/RankListVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/RankVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/SceneGroupsVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/ScoreScreenVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/drawlots/SelectJudgesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/judge/JudgeInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/judge/ProjectJudgePageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/judge/ProjectReviewVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/match/MatchDictVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/member/ProjectMemberVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/message/MessageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/notice/SmsNoticeVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/oss/GetSecretVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/oss/UploadFileVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/permission/PermissionVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/AllMatchScenesVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/CollegeProjectVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/MainTrackProjectDetailVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/MainTrackProjectPageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectAssignNumVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectDataOverview.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectJudgeVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectNumVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ProjectPageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/QueryPdfStatusVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/ReviewListVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/SeedTrackProjectDetailVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/SeedTrackProjectNumVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/SeedTrackProjectPageVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/SeedTrackProjectVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/VocationalNumVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/VocationalProjectInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/VocationalProjectNum.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/VocationalProjectVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/project/VocationalReviewNumVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/projectReviewPeriod/ProjectReviewPeriodVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/review/FinalsReviewVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/review/ReMatchReviewVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/review/SchoolReviewVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/review/SendNoticeVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/scheduleRecord/ProjectScheduleRecordVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/student/JudgeThemeDoneVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/zhongzhi/vo/student/StudentInfoVO.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/logback-spring.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/AdministerDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/AdministerPermissionDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/CollegesDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/CourseDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotGroupDictMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotsGroupItemsMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotsGroupJudgesMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotsJudgeNumMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotsScenesMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/DrawLotsScoresMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/FinalMatchMemberMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/FundDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ItemFieldDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MajorDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MatchCollegeCountDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MatchCollegePdfMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MatchDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MatchScheduleDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/MessageDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/PermissionsDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectAwardMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectCopyrightMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectJudgeDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectMaterialsDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectMemberDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectOwnershipStructureDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectPaperMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectPatentMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectReviewDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectReviewPeriodMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectScheduleRecordDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectSchoolJudgeDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectSchoolReviewDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectTrademarkMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/ProjectWorksMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/SmsCodeDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/SmsNoticeMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/StudentDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/VodDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/YearDictDAO.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mybatis-generator.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/controller.java.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/entity.java.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/mapper.java.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/mapper.xml.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/service.java.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/templates/serviceImpl.java.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/zhongzhi.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/zhongzhi.jar.original" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectScheduleRecordDAO.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectScheduleRecordDAO.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -619,13 +96,13 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/zhongzhi/common/configure/multidataource" />
<property name="project.structure.last.edited" value="Project" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="project.propCompiler" />
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
......@@ -633,13 +110,14 @@
<recent name="D:\code\electron\src\main\resources\com\zhongzhi\dao" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.zhongzhi.service.impl" />
<recent name="com.zhongzhi.common.constant" />
<recent name="com.zhongzhi.common.utils" />
<recent name="com.zhongzhi.vo.college" />
<recent name="com.zhongzhi.dto.college" />
<recent name="com.zhongzhi.common.configure" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\code\electron\src\main\resources" />
<recent name="D:\code\electron\src\main\java\com\zhongzhi\common\configure\multidataource" />
</key>
</component>
......@@ -974,7 +452,20 @@
<workItem from="1766734545196" duration="274000" />
<workItem from="1766735007615" duration="1384000" />
<workItem from="1766736660866" duration="1408000" />
<workItem from="1766738341660" duration="11096000" />
<workItem from="1766738341660" duration="21687000" />
<workItem from="1767579402402" duration="1525000" />
<workItem from="1775013588153" duration="2062000" />
<workItem from="1776171580246" duration="606000" />
<workItem from="1781160756130" duration="11604000" />
<workItem from="1781230938577" duration="821000" />
<workItem from="1781705007798" duration="18746000" />
<workItem from="1782179730423" duration="700000" />
<workItem from="1782181501328" duration="2400000" />
<workItem from="1782196907524" duration="269000" />
<workItem from="1782201385983" duration="4421000" />
<workItem from="1782271880991" duration="754000" />
<workItem from="1782291982265" duration="1645000" />
<workItem from="1782358980235" duration="3049000" />
</task>
<task id="LOCAL-00001" summary="111111">
<created>1664510105320</created>
......@@ -1081,7 +572,14 @@
<option name="project" value="LOCAL" />
<updated>1750241952139</updated>
</task>
<option name="localTasksCounter" value="16" />
<task id="LOCAL-00016" summary="电子信息第一次上线">
<created>1766756814360</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1766756814360</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -1124,121 +622,90 @@
<MESSAGE value="五年一贯制新功能..." />
<MESSAGE value="汤老师小改" />
<MESSAGE value="抽签版本前" />
<option name="LAST_COMMIT_MESSAGE" value="抽签版本前" />
<MESSAGE value="电子信息第一次上线" />
<option name="LAST_COMMIT_MESSAGE" value="电子信息第一次上线" />
</component>
<component name="WindowStateProjectService">
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1766738375864">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1766738375864" />
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1766568335969">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1766568335969" />
<state x="769" y="378" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1766737468666">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="769" y="378" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1766737468666" />
<state x="492" y="112" key="CommitChangelistDialog2" timestamp="1766756641525">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="492" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1766756641525" />
<state width="1367" height="466" key="DebuggerActiveHint" timestamp="1766745204614">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1367" height="466" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1766745204614" />
<state width="1877" height="217" key="GridCell.Tab.0.bottom" timestamp="1766756643022">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.0.center" timestamp="1766756643022">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.0.left" timestamp="1766756643022">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.0.right" timestamp="1766756643022">
<state x="703" y="374" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1781166660660">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.1.bottom" timestamp="1766756643022">
<state x="703" y="374" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1781166660660" />
<state width="468" height="447" key="DebuggerActiveHint" timestamp="1781771088263">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.1.center" timestamp="1766756643022">
<state width="468" height="447" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1781771088263" />
<state width="1877" height="225" key="GridCell.Tab.0.bottom" timestamp="1782369833196">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.1.left" timestamp="1766756643022">
<state width="1877" height="225" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833196" />
<state width="1877" height="225" key="GridCell.Tab.0.center" timestamp="1782369833196">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.1.right" timestamp="1766756643022">
<state width="1877" height="225" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833196" />
<state width="1877" height="225" key="GridCell.Tab.0.left" timestamp="1782369833196">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.2.bottom" timestamp="1766756643023">
<state width="1877" height="225" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833196" />
<state width="1877" height="225" key="GridCell.Tab.0.right" timestamp="1782369833196">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643023" />
<state width="1877" height="217" key="GridCell.Tab.2.center" timestamp="1766756643022">
<state width="1877" height="225" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833196" />
<state width="1877" height="169" key="GridCell.Tab.1.bottom" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.2.left" timestamp="1766756643022">
<state width="1877" height="169" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.1.center" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643022" />
<state width="1877" height="217" key="GridCell.Tab.2.right" timestamp="1766756643023">
<state width="1877" height="169" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.1.left" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="217" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1766756643023" />
<state x="776" y="230" key="RollbackChangesDialog" timestamp="1766736525640">
<state width="1877" height="169" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.1.right" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="776" y="230" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1766736525640" />
<state x="440" y="94" key="SettingsEditor" timestamp="1766547323040">
<state width="1877" height="169" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.2.bottom" timestamp="1782369833194">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1766547323040" />
<state width="498" height="548" key="SwitcherDM" timestamp="1766631814906">
<state width="1877" height="169" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833194" />
<state width="1877" height="169" key="GridCell.Tab.2.center" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="498" height="548" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1766631814906" />
<state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1760060106841">
<state width="1877" height="169" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.2.left" timestamp="1782369833193">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1760060106841" />
<state x="537" y="122" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1766731567848">
<state width="1877" height="169" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833193" />
<state width="1877" height="169" key="GridCell.Tab.2.right" timestamp="1782369833194">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="537" y="122" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1766731567848" />
<state x="392" y="256" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1766738502422">
<state width="1877" height="169" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1782369833194" />
<state x="440" y="94" key="SettingsEditor" timestamp="1781170213387">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="392" y="256" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1920.1040@0.0.1920.1040" timestamp="1766738502422" />
<state x="569" y="178" width="1138" height="718" key="find.popup" timestamp="1766748247007">
<state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1781170213387" />
<state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1781170048039">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="569" y="178" width="1138" height="718" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1766748247007" />
<state x="616" y="240" key="run.anything.popup" timestamp="1766732866663">
<state x="92" y="92" width="1736" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1781170048039" />
<state x="443" y="45" width="1199" height="995" key="find.popup" timestamp="1782367900318">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1766732866663" />
<state x="443" y="45" width="1199" height="995" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1782367900318" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java</url>
<line>2179</line>
<line>2827</line>
<option name="timeStamp" value="89" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java</url>
<line>2616</line>
<line>3594</line>
<option name="timeStamp" value="94" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -1248,7 +715,7 @@
</line-breakpoint>
<line-breakpoint type="java-method">
<url>file://$PROJECT_DIR$/src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java</url>
<line>6806</line>
<line>7433</line>
<properties class="com.zhongzhi.service.impl.ProjectServiceImpl" method="getSeedTrackProjectNum" />
<option name="timeStamp" value="111" />
</line-breakpoint>
......
electron.iml
......@@ -122,5 +122,6 @@
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.13" level="project" />
<orderEntry type="library" name="Maven: com.dameng:DmJdbcDriver18:8.1.2.192" level="project" />
</component>
</module>
\ No newline at end of file
logs/springboot-logback-error.log
This diff could not be displayed because it is too large.
logs/springboot-logback-info.log
This diff could not be displayed because it is too large.
pom.xml
......@@ -189,6 +189,13 @@
<version>4.5.13</version>
</dependency>
<!-- DM8 达梦驱动 -->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.2.192</version>
</dependency>
</dependencies>
<repositories>
......
src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java
......@@ -18,7 +18,7 @@ public class ProjectSchedule {
// public static final String PRELIMINARY_REVIEW = "市级初赛项目";
public static final String SEMI_FINAL_REVIEW = "市级复赛项目";
public static final String SEMI_FINAL_REVIEW = "校级复赛项目";
public static final String FINAL_REVIEW = "市级决赛项目";
public static final String FINAL_REVIEW = "校级决赛项目";
}
src/main/java/com/zhongzhi/common/constant/ProjectType.java
......@@ -21,6 +21,8 @@ public class ProjectType {
public static final String HONGLV = "红旅赛道";
public static final String CHANYE = "产业赛道";
public static final String INTERNATIONAL = "国际合作";
/**
......
src/main/java/com/zhongzhi/controller/MatchDictController.java
......@@ -136,6 +136,15 @@ public class MatchDictController {
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/createHonglvMatch")
@ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
"schedule:[{ scheduleTime/时间安排、explains/说明 }]")
public ResponseVO createHonglvMatch(@RequestBody MatchDictDTO matchDictDTO) {
matchDictDTO.setMatchType(ProjectType.HONGLV);
matchDictService.createMatch(matchDictDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "/createInternationalMatch")
@LoginRequired({Platform.center})
@ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
......@@ -186,6 +195,20 @@ public class MatchDictController {
return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalMatchAll());
}
@PostMapping(value = "/getHonglvMatchAll")
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
@ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
public ResponseVO getHonglvMatchAll() {
return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvMatchAll());
}
@PostMapping(value = "/getChanYeMatchAll")
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
@ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
public ResponseVO getChanYeMatchAll() {
return ResponseData.generateCreatedResponse(0, matchDictService.getChanYeMatchAll());
}
@PostMapping(value = "/getInternationalMatchAll")
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
@ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
......@@ -204,6 +227,22 @@ public class MatchDictController {
}
/* 职教管理端 */
@PostMapping(value = "/getHonglvPage")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
public ResponseVO getHonglvPage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvPage(selectListPageDTO));
}
/* 职教管理端 */
@PostMapping(value = "/getChanYePage")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
public ResponseVO getChanYePage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getChanYePage(selectListPageDTO));
}
/* 职教管理端 */
@PostMapping(value = "/getVocationalPageCity")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
......@@ -219,12 +258,4 @@ public class MatchDictController {
return ResponseData.generateCreatedResponse(0, matchDictService.getInternationalPage(selectListPageDTO));
}
/* 职教管理端 */
@PostMapping(value = "/getHonglvlPage")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
public ResponseVO getHonglvlPage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvlPage(selectListPageDTO));
}
}
\ No newline at end of file
src/main/java/com/zhongzhi/controller/MatchScheduleController.java
......@@ -55,6 +55,20 @@ public class MatchScheduleController {
return ResponseData.generateCreatedResponse(0, matchScheduleService.getVocationalMatchSchedule(matchScheduleDO));
}
@PostMapping(value = "getHonglvMatchSchedule")
@LoginRequired({Platform.student})
@ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
public ResponseVO getHonglvMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
return ResponseData.generateCreatedResponse(0, matchScheduleService.getHonglvMatchSchedule(matchScheduleDO));
}
@PostMapping(value = "getChanYeMatchSchedule")
@LoginRequired({Platform.student})
@ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
public ResponseVO getChanYeMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
return ResponseData.generateCreatedResponse(0, matchScheduleService.getChanYeMatchSchedule(matchScheduleDO));
}
@PostMapping(value = "getInternationalMatchSchedule")
@LoginRequired({Platform.student})
@ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
......
src/main/java/com/zhongzhi/controller/ProjectController.java
......@@ -36,7 +36,6 @@ public class ProjectController {
private ProjectService projectService;
@PostMapping(value = "/getProjectDetail")
@LoginRequired({Platform.student})
@ApiOperation("学生端（高职赛道、种子赛道、国际合作通用） ---项目详情: id/项目ID")
public ResponseVO getProjectDetail(@RequestBody ProjectDO projectDO) {
return ResponseData.generateCreatedResponse(0, projectService.getProjectById(projectDO.getId()));
......@@ -356,14 +355,12 @@ public class ProjectController {
}
@PostMapping(value = "/exportProjectList")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 批量导出种子赛道项目：matchId/赛事ID")
public void exportProjectList(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
projectService.exportProjectList(projectCollegeListDTO);
}
@PostMapping(value = "/exportProjectAll")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 导出全部种子赛道项目：matchId/赛事ID, projectSchedule/项目进度,projectGroup/项目组别")
public void exportProjectAll(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
projectService.exportProjectAll(projectCollegeListDTO);
......@@ -385,7 +382,6 @@ public class ProjectController {
}
@PostMapping(value = "/exportProject")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 评审项目导出：matchId/赛事ID")
public ResponseVO exportProject(@RequestBody ReviewListDTO reviewListDTO) {
projectService.exportProjectReview(reviewListDTO);
......@@ -543,8 +539,8 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
/* -- 国际合作（学生端） -- */
@PostMapping(value = "createInternationalProject")
/* -- 职教接口（学生端） -- */
@PostMapping(value = "createHonglvProject")
@LoginRequired({ Platform.student })
@ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
"学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
......@@ -558,14 +554,15 @@ public class ProjectController {
"works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
"trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
"vodUrl")
public ResponseVO createInternationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.createInternationalProject(createVocationalProjectDTO);
public ResponseVO createHonglvProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.createHonglvProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "updateVocationalProject")
/* -- 职教接口（学生端） -- */
@PostMapping(value = "createChanYeProject")
@LoginRequired({ Platform.student })
@ApiOperation("学生端(职教)--修改职教项目：id/项目ID、项目logo/logoUri、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
@ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
"学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
"公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
"ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
......@@ -575,13 +572,34 @@ public class ProjectController {
"award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
"copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
"works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
"trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]")
public ResponseVO updateVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.updateVocationalProject(createVocationalProjectDTO);
"trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
"vodUrl")
public ResponseVO createChanYeProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.createChanYeProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "updateInternationalProject")
/* -- 国际合作（学生端） -- */
@PostMapping(value = "createInternationalProject")
@LoginRequired({ Platform.student })
@ApiOperation("学生端(职教)--创建职教项目：项目logo/logoUri、项目名称/projectName、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
"学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
"公司名称/companyName、法人姓名/legalPersonName、法人职务/position、注册资金/registerFund、注册时间/registerDate、注册省份/registerProvince、注册地址/registerAddress、统一社会信用代码/unifyCode、财务报表地址/financialStatement、是否获得投资/investment、" +
"ownership（股权结构）: [{ shareholderStatus/股东身份、shareholderName/股东名称、shareholdingRatio/持股比例 }]" +
"隐私设置/privacySetting（保密，公开）、materialsType/项目计划书类型、materialsSize/项目计划书大小、materialsName/项目计划书名称、materialsUrl/项目计划书地址、项目PPT地址/projectPptUrl、项目TTP类型/projectPptType、项目PPT名称/projectPptName" +
"patent（获得专利）: [{专利国别/country、公开号/publicationNumber、专利标题/patentTitle、专利类型/patentType、专利号/patentNumber、专利申请人/patentApplicants、获得时间/issuedTime、到期时间/expirationTime、发明人/inventor、其他发明人/otherInventors}]"+
"paper（论文发表）: [{论文名称/paperTitle、发表期刊/publishedJournals、DOI号/doi、是否有共同/common、第一作者/firstAuthor、其他作者/otherAuthor}]"+
"award（奖项）: [{奖项名称/awardTitle、获奖项目名称/awardProjectTitle、level/级别、获奖人/prizewinner、获奖时间/winningTime}]"+
"copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
"works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
"trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]" +
"vodUrl")
public ResponseVO createInternationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.createInternationalProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "updateVocationalProject")
@LoginRequired({ Platform.student })
@ApiOperation("学生端(职教)--修改职教项目：id/项目ID、项目logo/logoUri、所属领域/itemField、项目概述/projectIntro、国家级重大、重点科研项目的科研成果转化项目/projectTransform、" +
"学校科技成果转化/resultTransfer、参赛申报人为科技成果的完成人或所有人/competitionOwner、参赛申报人为科技成果的第一完成人或所有人/competitionFirst、师生共创/bothInvention、组别/projectProgress、项目进展/projectStage" +
......@@ -594,8 +612,8 @@ public class ProjectController {
"copyright（软件著作）: [{软件名称/dynacomm、著作权人/copyrightOwner、权利获取方式/rightAcquisitionMethod、开发完成日期/developmentDate、开发发表日期/publishedDate、权利范围/interestField、登记号/registerNumber}]"+
"works（作品著作）: [{作品名称/worksName、作者/author、创作完成日期/completionDate、首次发表日期/firstPublicationDate、作品类别/worksType、登记号/registerNumber}]" +
"trademark（商标）: [{国际分类号/classificationNumber、商标名称/tradeName、注册人/registeredPerson、注册时间/registeredDate、有效日期/effectiveDate、商标编号/trademarkNumber}]")
public ResponseVO updateInternationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.updateInternationalProject(createVocationalProjectDTO);
public ResponseVO updateVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
projectService.updateVocationalProject(createVocationalProjectDTO);
return ResponseData.generateCreatedResponse(0);
}
......@@ -606,6 +624,20 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProject(projectListPageDTO));
}
@PostMapping(value = "getHonglvProject")
@LoginRequired(Platform.student)
@ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getHonglvProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvProject(projectListPageDTO));
}
@PostMapping(value = "getChanYeProject")
@LoginRequired(Platform.student)
@ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getChanYeProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeProject(projectListPageDTO));
}
@PostMapping(value = "getInternationalProject")
@LoginRequired(Platform.student)
@ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
......@@ -620,6 +652,20 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectById());
}
@PostMapping(value = "getHonglvProjectById")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教)--根据ID查询高职赛道项目信息")
public ResponseVO getHonglvProjectById() {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectById());
}
@PostMapping(value = "getChanYeProjectById")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教)--根据ID查询高职赛道项目信息")
public ResponseVO getChanYeProjectById() {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeProjectById());
}
@PostMapping(value = "getInternationalProjectById")
@LoginRequired(Platform.student)
@ApiOperation("学生端(国际合作)--根据ID查询高职赛道项目信息")
......@@ -637,6 +683,26 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "createHonglvMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 fiveYears" +
"teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 teamTelephone 手机号 }]" +
"mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号 idCard}]")
public ResponseVO createHonglvMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
projectService.createHonglvMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "createChanYeMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 fiveYears" +
"teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 teamTelephone 手机号 }]" +
"mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号 idCard}]")
public ResponseVO createChanYeMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
projectService.createChanYeMember(createProjectMemberDTO);
return ResponseData.generateCreatedResponse(0);
}
@PostMapping(value = "updateVocationalMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
......@@ -674,6 +740,20 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.VOCATIONAL,null));
}
@PostMapping(value = "getHonglvProjectMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教) ---查询职教项目团队信息")
public ResponseVO getHonglvProjectMember() {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.HONGLV,null));
}
@PostMapping(value = "getChanYeProjectMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(职教) ---查询职教项目团队信息")
public ResponseVO getChanYeProjectMember() {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectMember(ProjectType.CHANYE,null));
}
@PostMapping(value = "getInternationalProjectMember")
@LoginRequired(Platform.student)
@ApiOperation("学生端(国际合作) ---查询国际合作项目团队信息")
......@@ -736,8 +816,21 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
}
@PostMapping(value = "/getHonglvReviewList")
@ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
"pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getHonglvReviewList(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvReviewList(reviewListDTO));
}
@PostMapping(value = "/getChanYeReviewList")
@ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
"pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getChanYeReviewList(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeReviewList(reviewListDTO));
}
@PostMapping(value = "/getInternationalReviewList")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
"pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getInternationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
......@@ -806,6 +899,22 @@ public class ProjectController {
}
/* -- 评审端 -- */
@PostMapping(value = "/getHonglvProjectReviewPage")
@LoginRequired({Platform.review})
@ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getHonglvProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectReviewPage(projectReviewPageDTO));
}
/* -- 评审端 -- */
@PostMapping(value = "/getChanYeProjectReviewPage")
@LoginRequired({Platform.review})
@ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getChanYeProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectReviewPage(projectReviewPageDTO));
}
/* -- 评审端 -- */
@PostMapping(value = "/getInternationalProjectReviewPage")
@LoginRequired({Platform.review})
@ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
......@@ -840,6 +949,18 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewNum(reviewListDTO));
}
@PostMapping(value = "/getHonglvReviewNum")
@ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getHonglvReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvReviewNum(reviewListDTO));
}
@PostMapping(value = "/getChanYeReviewNum")
@ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getChanYeReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeReviewNum(reviewListDTO));
}
@PostMapping(value = "/getInternationalReviewNum")
@ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getInternationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
......@@ -852,8 +973,19 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalAssignNum(reviewListDTO));
}
@PostMapping(value = "/getHonglvAssignNum")
@ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getHonglvAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvAssignNum(reviewListDTO));
}
@PostMapping(value = "/getChanYeAssignNum")
@ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getChanYeAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeAssignNum(reviewListDTO));
}
@PostMapping(value = "/getInternationalAssignNum")
@LoginRequired({Platform.center})
@ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
public ResponseVO getInternationalAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getInternationalAssignNum(reviewListDTO));
......@@ -901,6 +1033,14 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectPage(projectListPageDTO));
}
/* -- 管理端 -- */
@PostMapping(value = "/getChanYeProjectPage")
@ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
"projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
public ResponseVO getChanYeProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeProjectPage(projectListPageDTO));
}
@PostMapping(value = "getHonglvProjectNum")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
......@@ -908,6 +1048,13 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectNum(seedTrackProjectNumDTO));
}
@PostMapping(value = "getChanYeProjectNum")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
public ResponseVO getChanYeProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeProjectNum(seedTrackProjectNumDTO));
}
@PostMapping(value = "/getHonglvProjectDetail")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
......@@ -915,4 +1062,11 @@ public class ProjectController {
return ResponseData.generateCreatedResponse(0, projectService.getHonglvProjectDetail(projectDO.getId()));
}
@PostMapping(value = "/getChanYeProjectDetail")
@LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
public ResponseVO getChanYeProjectDetail(@RequestBody ProjectDO projectDO) {
return ResponseData.generateCreatedResponse(0, projectService.getChanYeProjectDetail(projectDO.getId()));
}
}
\ No newline at end of file
src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java
......@@ -46,7 +46,6 @@ public class ProjectReviewPeriodController {
}
@PostMapping(value = "/updateProjectReviewPeriod")
@LoginRequired(Platform.center)
@ApiOperation("中心端 --- 修改评审时间：id/ID、matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、startTime/开始时间、endTime/结束时间")
public ResponseVO updateProjectReviewPeriod(@RequestBody ProjectReviewPeriodDO projectReviewPeriodDO) {
projectReviewPeriodService.updateProjectReviewPeriod(projectReviewPeriodDO);
......
src/main/java/com/zhongzhi/dto/administer/LoginDTO.java
......@@ -8,4 +8,8 @@ public class LoginDTO {
private String telephone;
private String code;
private String accountName;
private String password;
}
src/main/java/com/zhongzhi/dto/project/ExportProjectDTO.java
......@@ -6,39 +6,47 @@ import lombok.Data;
@Data
public class ExportProjectDTO {
@ExcelColumn(col = 1, value = "届数")
@ExcelColumn(col = 1, value = "序号")
private String id;
@ExcelColumn(col = 2, value = "届数")
private String matchName;
@ExcelColumn(col = 2, value = "项目名称")
@ExcelColumn(col = 3, value = "项目名称")
private String projectName;
@ExcelColumn(col = 3, value = "组别")
@ExcelColumn(col = 4, value = "组别")
private String projectProgress;
@ExcelColumn(col = 4, value = "负责人")
@ExcelColumn(col = 5, value = "负责人")
private String name;
@ExcelColumn(col = 5, value = "院校")
@ExcelColumn(col = 6, value = "院校")
private String college;
@ExcelColumn(col = 6, value = "学籍号")
@ExcelColumn(col = 7, value = "学院")
private String xueyuan;
@ExcelColumn(col = 8, value = "学籍号")
private String studentNo;
@ExcelColumn(col = 7, value = "专业")
@ExcelColumn(col = 9, value = "专业")
private String major;
@ExcelColumn(col = 8, value = "手机号")
@ExcelColumn(col = 10, value = "手机号")
private String telephone;
@ExcelColumn(col = 9, value = "团队成员")
@ExcelColumn(col = 11, value = "团队成员")
private String teamMembers;
@ExcelColumn(col = 10, value = "指导老师")
@ExcelColumn(col = 12, value = "指导老师")
private String teachers;
@ExcelColumn(col = 11, value = "项目阶段")
@ExcelColumn(col = 13, value = "项目阶段")
private String projectSchedule;
@ExcelColumn(col = 12, value = "项目状态")
@ExcelColumn(col = 14, value = "项目状态")
private String projectStatus;
}
src/main/java/com/zhongzhi/dto/student/RegisterDTO.java
......@@ -28,4 +28,6 @@ public class RegisterDTO {
private String sex;
private String className;
private String xueyuan;
}
src/main/java/com/zhongzhi/model/ProjectJudgeDO.java
......@@ -33,6 +33,10 @@ public class ProjectJudgeDO extends BaseModel {
*/
private String username;
private String accountName;
private String password;
/**
* 手机号
*/
......
src/main/java/com/zhongzhi/model/StudentDO.java
......@@ -68,6 +68,11 @@ public class StudentDO extends BaseModel {
private String college;
/**
* 学院
*/
private String xueyuan;
/**
* 就读专业
*/
private String major;
......
src/main/java/com/zhongzhi/service/MatchDictService.java
......@@ -32,13 +32,17 @@ public interface MatchDictService extends IService<MatchDictDO> {
void createMatch(MatchDictDTO matchDictDTO);
void createHonglvMatch(MatchDictDTO matchDictDTO);
List<MatchDictDO> getMatch();
List<MatchDictDO> getList(String projectType, String projectGroup);
IPage getVocationalPage(SelectListPageDTO selectListPageDTO);
IPage getHonglvlPage(SelectListPageDTO selectListPageDTO);
IPage getHonglvPage(SelectListPageDTO selectListPageDTO);
IPage getChanYePage(SelectListPageDTO selectListPageDTO);
IPage getVocationalPageCity(SelectListPageDTO selectListPageDTO);
......@@ -53,4 +57,7 @@ public interface MatchDictService extends IService<MatchDictDO> {
List<MatchDictDO> getSeedTrackMatchAll();
List<MatchDictDO> getVocationalMatchAll();
List<MatchDictDO> getHonglvMatchAll();
List<MatchDictDO> getChanYeMatchAll();
}
src/main/java/com/zhongzhi/service/MatchScheduleService.java
......@@ -19,4 +19,8 @@ public interface MatchScheduleService extends IService<MatchScheduleDO> {
List<MatchScheduleDO> getVocationalMatchSchedule(MatchScheduleDO matchScheduleDO);
List<MatchScheduleDO> getHonglvMatchSchedule(MatchScheduleDO matchScheduleDO);
List<MatchScheduleDO> getChanYeMatchSchedule(MatchScheduleDO matchScheduleDO);
}
src/main/java/com/zhongzhi/service/ProjectChildUtilsService.java 0 → 100644
package com.zhongzhi.service;
import com.zhongzhi.dto.project.CreateVocationalProjectDTO;
import com.zhongzhi.model.StudentDO;
public interface ProjectChildUtilsService {
void createVocationalProject(StudentDO studentDO ,CreateVocationalProjectDTO createVocationalProjectDTO);
}
src/main/java/com/zhongzhi/service/ProjectService.java
......@@ -136,18 +136,26 @@ public interface ProjectService extends IService<ProjectDO> {
void createVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void createInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void createHonglvProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void createChanYeProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void updateInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
VocationalProjectInfoVO getVocationalProjectById();
VocationalProjectInfoVO getHonglvProjectById();
VocationalProjectInfoVO getChanYeProjectById();
VocationalProjectInfoVO getInternationalProjectById();
void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
void createHonglvMember(CreateProjectMemberDTO createProjectMemberDTO);
void createChanYeMember(CreateProjectMemberDTO createProjectMemberDTO);
void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
void createInternationalMember(CreateProjectMemberDTO createProjectMemberDTO);
......@@ -158,14 +166,24 @@ public interface ProjectService extends IService<ProjectDO> {
IPage getVocationalProject(ProjectListPageDTO projectListPageDTO);
IPage getHonglvProject(ProjectListPageDTO projectListPageDTO);
IPage getChanYeProject(ProjectListPageDTO projectListPageDTO);
IPage getInternationalProject(ProjectListPageDTO projectListPageDTO);
IPage getVocationalReviewList(ReviewListDTO reviewListDTO);
IPage getHonglvReviewList(ReviewListDTO reviewListDTO);
IPage getChanYeReviewList(ReviewListDTO reviewListDTO);
SeedTrackProjectDetailVO getVocationalProjectDetail(Long id);
SeedTrackProjectDetailVO getHonglvProjectDetail(Long id);
SeedTrackProjectDetailVO getChanYeProjectDetail(Long id);
SeedTrackProjectDetailVO getVocationalProjectDetailCity(Long id);
SeedTrackProjectDetailVO getInternationalProjectDetail(Long id);
......@@ -174,6 +192,8 @@ public interface ProjectService extends IService<ProjectDO> {
IPage getHonglvProjectPage(ProjectListPageDTO projectListPageDTO);
IPage getChanYeProjectPage(ProjectListPageDTO projectListPageDTO);
IPage getVocationalProjectPageCity(ProjectListPageDTO projectListPageDTO);
IPage getInternationalProjectPage(ProjectListPageDTO projectListPageDTO);
......@@ -192,12 +212,18 @@ public interface ProjectService extends IService<ProjectDO> {
VocationalNumVO getHonglvProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
VocationalNumVO getChanYeProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
VocationalNumVO getVocationalProjectNumCity(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
VocationalNumVO getInternationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
VocationalReviewNumVO getVocationalReviewNum(ReviewListDTO reviewListDTO);
VocationalReviewNumVO getHonglvReviewNum(ReviewListDTO reviewListDTO);
VocationalReviewNumVO getChanYeReviewNum(ReviewListDTO reviewListDTO);
VocationalReviewNumVO getInternationalReviewNum(ReviewListDTO reviewListDTO);
void exportProjectById(ReviewListDTO reviewListDTO);
......@@ -214,6 +240,10 @@ public interface ProjectService extends IService<ProjectDO> {
ProjectAssignNumVO getVocationalAssignNum(ReviewListDTO reviewListDTO);
ProjectAssignNumVO getHonglvAssignNum(ReviewListDTO reviewListDTO);
ProjectAssignNumVO getChanYeAssignNum(ReviewListDTO reviewListDTO);
ProjectAssignNumVO getInternationalAssignNum(ReviewListDTO reviewListDTO);
void importProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
......@@ -226,5 +256,7 @@ public interface ProjectService extends IService<ProjectDO> {
List<JudgeThemeDoneVO> judgeThemeDone(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
void createInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
// ProjectDataOverview getCollegeVocationalDataOverview();
}
src/main/java/com/zhongzhi/service/impl/MatchDictServiceImpl.java
......@@ -179,6 +179,26 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
}
@Override
@Transactional(rollbackFor = Exception.class)
public void createHonglvMatch(MatchDictDTO matchDictDTO) {
DbContextHolder.setDbType(DBTypeEnum.db2);
MatchDictDO matchDictDO = new MatchDictDO();
BeanUtils.copyProperties(matchDictDTO, matchDictDO);
this.baseMapper.insert(matchDictDO);
if (matchDictDTO.getSchedule().size() > 0) {
for (MatchScheduleDO matchScheduleDO : matchDictDTO.getSchedule()) {
MatchScheduleDO matchSchedule = new MatchScheduleDO();
BeanUtils.copyProperties(matchScheduleDO, matchSchedule);
matchSchedule.setMatchId(matchDictDO.getId());
matchScheduleDAO.insert(matchSchedule);
}
}
}
@Override
public List<MatchDictDO> getMatch() {
DbContextHolder.setDbType(DBTypeEnum.db2);
......@@ -231,6 +251,25 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
}
@Override
public List<MatchDictDO> getHonglvMatchAll() {
DbContextHolder.setDbType(DBTypeEnum.db2);
return this.baseMapper.selectList(new QueryWrapper<MatchDictDO>()
.lambda()
.eq(MatchDictDO::getMatchType, ProjectType.HONGLV));
}
@Override
public List<MatchDictDO> getChanYeMatchAll() {
DbContextHolder.setDbType(DBTypeEnum.db2);
return this.baseMapper.selectList(new QueryWrapper<MatchDictDO>()
.lambda()
.eq(MatchDictDO::getMatchType, ProjectType.CHANYE));
}
@Override
public List<MatchDictDO> getList(String projectType, String projectGroup) {
DbContextHolder.setDbType(DBTypeEnum.db2);
......@@ -254,7 +293,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
}
@Override
public IPage getHonglvlPage(SelectListPageDTO selectListPageDTO) {
public IPage getHonglvPage(SelectListPageDTO selectListPageDTO) {
DbContextHolder.setDbType(DBTypeEnum.db2);
......@@ -270,6 +309,22 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
}
@Override
public IPage getChanYePage(SelectListPageDTO selectListPageDTO) {
DbContextHolder.setDbType(DBTypeEnum.db2);
Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize());
IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page, ProjectType.CHANYE);
for (MatchDictVO record : iPage.getRecords()) {
List<MatchScheduleDO> list = matchScheduleDAO.selectList(new QueryWrapper<MatchScheduleDO>()
.lambda()
.eq(MatchScheduleDO::getMatchId, record.getId()));
record.setSchedule(list);
}
return iPage;
}
@Override
public IPage getVocationalPageCity(SelectListPageDTO selectListPageDTO) {
DbContextHolder.setDbType(DBTypeEnum.db1);
......
src/main/java/com/zhongzhi/service/impl/MatchScheduleServiceImpl.java
......@@ -66,4 +66,37 @@ public class MatchScheduleServiceImpl extends ServiceImpl<MatchScheduleDAO, Matc
}
return list;
}
@Override
public List<MatchScheduleDO> getHonglvMatchSchedule(MatchScheduleDO matchScheduleDO) {
MatchDictDO matchDictDO = matchDictDAO.selectOne(new QueryWrapper<MatchDictDO>()
.lambda()
.eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
.eq(MatchDictDO::getMatchType, ProjectType.HONGLV)
.eq(MatchDictDO::getStatus, 1));
List<MatchScheduleDO> list = new ArrayList<>();
if (matchDictDO != null) {
list = this.baseMapper.selectList(new QueryWrapper<MatchScheduleDO>()
.lambda()
.eq(MatchScheduleDO::getMatchId, matchDictDO.getId()));
}
return list;
}
@Override
public List<MatchScheduleDO> getChanYeMatchSchedule(MatchScheduleDO matchScheduleDO) {
MatchDictDO matchDictDO = matchDictDAO.selectOne(new QueryWrapper<MatchDictDO>()
.lambda()
.eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
.eq(MatchDictDO::getMatchType, ProjectType.CHANYE)
.eq(MatchDictDO::getStatus, 1));
List<MatchScheduleDO> list = new ArrayList<>();
if (matchDictDO != null) {
list = this.baseMapper.selectList(new QueryWrapper<MatchScheduleDO>()
.lambda()
.eq(MatchScheduleDO::getMatchId, matchDictDO.getId()));
}
return list;
}
}
src/main/java/com/zhongzhi/service/impl/ProjectChildUtils.java 0 → 100644
package com.zhongzhi.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhongzhi.common.constant.*;
import com.zhongzhi.common.exception.HttpException;
import com.zhongzhi.common.utils.Localstorage;
import com.zhongzhi.dao.*;
import com.zhongzhi.dto.project.CreateVocationalProjectDTO;
import com.zhongzhi.model.*;
import com.zhongzhi.service.ProjectChildUtilsService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@Service
public class ProjectChildUtils implements ProjectChildUtilsService {
@Autowired
private MatchDictDAO matchDictDAO;
@Autowired
private ProjectDAO projectDAO;
@Autowired
private ProjectOwnershipStructureDAO projectOwnershipStructureDAO;
@Autowired
private ProjectMaterialsDAO projectMaterialsDAO;
@Autowired
private ProjectMemberDAO projectMemberDAO;
@Autowired
private ProjectReviewDAO projectReviewDAO;
@Autowired
private ProjectJudgeDAO projectJudgeDAO;
@Autowired
private ProjectScheduleRecordDAO projectScheduleRecordDAO;
@Autowired
private ProjectReviewPeriodMapper projectReviewPeriodMapper;
@Autowired
private StudentDAO studentDAO;
@Autowired
private ProjectPatentMapper patentMapper;
@Autowired
private ProjectPaperMapper paperMapper;
@Autowired
private ProjectAwardMapper awardMapper;
@Autowired
private ProjectCopyrightMapper copyrightMapper;
@Autowired
private ProjectWorksMapper worksMapper;
@Autowired
private ProjectTrademarkMapper trademarkMapper;
@Autowired
private MatchCollegeCountDAO matchCollegeCountDAO;
@Override
@Transactional(rollbackFor = Exception.class)
public void createVocationalProject(StudentDO studentDO ,CreateVocationalProjectDTO createVocationalProjectDTO) {
MatchDictDO matchDictDO = matchDictDAO.selectOne(new QueryWrapper<MatchDictDO>()
.lambda()
.eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
.eq(MatchDictDO::getStatus, 1));
if (matchDictDO == null) {
throw new HttpException(10054);
}
if (new Date().before(matchDictDO.getStartTime()) || new Date().after(matchDictDO.getEndTime())) {
throw new HttpException(10057);
}
ProjectDO po = projectDAO.selectOne(new QueryWrapper<ProjectDO>()
.lambda()
.eq(ProjectDO::getMatchId, matchDictDO.getId())
.eq(ProjectDO::getProposerId, studentDO.getId())
.eq(ProjectDO::getProjectType, ProjectType.VOCATIONAL));
/**
* 验证是否存在过项目，决赛开启编辑不需要进行验证，填写中的项目也不需要进行验证
*/
if (po != null && po.getEditStatus() == 0 && !po.getProjectStatus().equals(ProjectStatus.UN_SUBMITTED)) {
throw new HttpException(10040);
}
ProjectDO projectDO = new ProjectDO();
BeanUtils.copyProperties(createVocationalProjectDTO, projectDO);
projectDO.setCollege(studentDO.getCollege());
/**
* 第一次创建项目设置基础状态，开启编辑不需要进行设置
*/
if (po == null) {
projectDO.setProposerId(studentDO.getId());
if (matchDictDO != null) {
projectDO.setMatchId(matchDictDO.getId());
}
projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
projectDO.setProjectSchedule(ProjectSchedule.REGISTER);
projectDO.setProjectType(ProjectType.VOCATIONAL);
projectDO.setProjectGroup(studentDO.getEducation());
projectDO.setProjectAssigned(ProjectAssignStatus.NO_ASSIGNED);
projectDO.setProjectReview(ProjectReview.TO_REVIEWED);
}
if (po == null) {
projectDAO.insert(projectDO);
} else {
projectDO.setId(po.getId());
projectDAO.updateById(projectDO);
}
/**
* 项目材料
*/
ProjectMaterialsDO projectMaterialsDO = projectMaterialsDAO.selectOne(new QueryWrapper<ProjectMaterialsDO>()
.lambda()
.eq(ProjectMaterialsDO::getProjectId, projectDO.getId()));
ProjectMaterialsDO materialsDO = new ProjectMaterialsDO();
materialsDO.setMaterialsName(createVocationalProjectDTO.getMaterialsName());
materialsDO.setLanguageType(createVocationalProjectDTO.getLanguageType());
materialsDO.setMaterialsSize(createVocationalProjectDTO.getMaterialsSize());
materialsDO.setMaterialsType(createVocationalProjectDTO.getMaterialsType());
materialsDO.setMaterialsUrl(createVocationalProjectDTO.getMaterialsUrl());
materialsDO.setLanguageType("cn");
materialsDO.setProjectId(projectDO.getId());
if (projectMaterialsDO == null) {
projectMaterialsDAO.insert(materialsDO);
} else {
materialsDO.setId(projectMaterialsDO.getId());
projectMaterialsDAO.updateById(materialsDO);
}
/**
* 项目股权
*/
if (null != createVocationalProjectDTO.getOwnership() ) {
List<ProjectOwnershipStructureDO> list = projectOwnershipStructureDAO.selectList(new QueryWrapper<ProjectOwnershipStructureDO>()
.lambda()
.eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
if (list != null) {
projectOwnershipStructureDAO.delete(new QueryWrapper<ProjectOwnershipStructureDO>()
.lambda()
.eq(ProjectOwnershipStructureDO::getProjectId,projectDO.getId()));
}
for (ProjectOwnershipStructureDO projectOwnershipStructureDO : createVocationalProjectDTO.getOwnership()) {
projectOwnershipStructureDO.setProjectId(projectDO.getId());
projectOwnershipStructureDAO.insert(projectOwnershipStructureDO);
}
}
/**
* 专利
*/
if (null != createVocationalProjectDTO.getPatent() ) {
List<ProjectPatentDO> list = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
.lambda()
.eq(ProjectPatentDO::getProjectId, projectDO.getId()));
if (list != null ) {
patentMapper.delete(new QueryWrapper<ProjectPatentDO>()
.lambda()
.eq(ProjectPatentDO::getProjectId,projectDO.getId())); }
for (ProjectPatentDO patentDO : createVocationalProjectDTO.getPatent()) {
patentDO.setProjectId(projectDO.getId());
patentMapper.insert(patentDO);
}
}
/**
* 论文
*/
if (null != createVocationalProjectDTO.getPaper() ) {
List<ProjectPaperDO> list = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
.lambda()
.eq(ProjectPaperDO::getProjectId, projectDO.getId()));
if (list != null ) {
paperMapper.delete(new QueryWrapper<ProjectPaperDO>()
.lambda()
.eq(ProjectPaperDO::getProjectId,projectDO.getId())) ; }
for (ProjectPaperDO projectPaperDO : createVocationalProjectDTO.getPaper()) {
projectPaperDO.setProjectId(projectDO.getId());
paperMapper.insert(projectPaperDO);
}
}
/**
* 奖项
*/
if (null != createVocationalProjectDTO.getAward() ) {
List<ProjectAwardDO> list = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
.lambda()
.eq(ProjectAwardDO::getProjectId, projectDO.getId()));
if (list != null ) {
awardMapper.delete(new QueryWrapper<ProjectAwardDO>()
.lambda()
.eq(ProjectAwardDO::getProjectId,projectDO.getId())) ; }
for (ProjectAwardDO projectAwardDO : createVocationalProjectDTO.getAward()) {
projectAwardDO.setProjectId(projectDO.getId());
awardMapper.insert(projectAwardDO);
}
}
/**
* 软件著作权
*/
if (null != createVocationalProjectDTO.getCopyright() ) {
List<ProjectCopyrightDO> list = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
.lambda()
.eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
if (list != null ) {
copyrightMapper.delete(new QueryWrapper<ProjectCopyrightDO>()
.lambda()
.eq(ProjectCopyrightDO::getProjectId,projectDO.getId())); }
for (ProjectCopyrightDO projectCopyrightDO : createVocationalProjectDTO.getCopyright()) {
projectCopyrightDO.setProjectId(projectDO.getId());
copyrightMapper.insert(projectCopyrightDO);
}
}
/**
* 作品著作
*/
if (null != createVocationalProjectDTO.getWorks() ) {
List<ProjectWorksDO> list = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
.lambda()
.eq(ProjectWorksDO::getProjectId, projectDO.getId()));
if (list != null ) {
worksMapper.delete(new QueryWrapper<ProjectWorksDO>()
.lambda()
.eq(ProjectWorksDO::getProjectId,projectDO.getId())) ; }
for (ProjectWorksDO work : createVocationalProjectDTO.getWorks()) {
work.setProjectId(projectDO.getId());
worksMapper.insert(work);
}
}
/**
* 商标
*/
if (null != createVocationalProjectDTO.getTrademark()) {
List<ProjectTrademarkDO> list = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
.lambda()
.eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
if (list != null) {
trademarkMapper.delete(new QueryWrapper<ProjectTrademarkDO>()
.lambda()
.eq(ProjectTrademarkDO::getProjectId,projectDO.getId())) ; }
for (ProjectTrademarkDO projectTrademarkDO : createVocationalProjectDTO.getTrademark()) {
projectTrademarkDO.setProjectId(projectDO.getId());
trademarkMapper.insert(projectTrademarkDO);
}
}
}
}
src/main/java/com/zhongzhi/service/impl/ProjectJudgeServiceImpl.java
......@@ -46,10 +46,6 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
@Autowired
private ProjectReviewDAO projectReviewDAO;
@Autowired
private SmsCodeDAO smsCodeDAO;
@Override
public IPage<ProjectJudgePageVO> getProjectJudgePage(ProjectJudgePageDTO projectJudgePageDTO) {
......@@ -116,32 +112,31 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
ProjectJudgeDO projectJudgeDO = this.baseMapper.selectOne(new QueryWrapper<ProjectJudgeDO>()
.lambda()
.eq(ProjectJudgeDO::getTelephone, loginDTO.getTelephone()));
.eq(ProjectJudgeDO::getAccountName, loginDTO.getAccountName()));
if (null != projectJudgeDO){
if (null != projectJudgeDO) {
if (null != projectJudgeDO.getPasswordFree() && projectJudgeDO.getPasswordFree() != 1){
SmsCodeDO smsCodeDO = smsCodeDAO.getOneByTelePhone(loginDTO.getTelephone(), SmsCode.login, SmsCode.review);
if (smsCodeDO == null) {
throw new HttpException(10025);
}
if (!smsCodeDO.getCode().equals(loginDTO.getCode())) {
throw new HttpException(10021);
}
smsCodeDAO.deleteById(smsCodeDO.getId());
if (null != projectJudgeDO.getPasswordFree() && 1 == projectJudgeDO.getPasswordFree()) {
String token = JwtUtil.generateToken(projectJudgeDO.getId(), SmsCode.review);
judgeInfoVO.setTelephone(projectJudgeDO.getTelephone());
judgeInfoVO.setPosition(projectJudgeDO.getPosition());
judgeInfoVO.setUnit(projectJudgeDO.getUnit());
judgeInfoVO.setUsername(projectJudgeDO.getUsername());
judgeInfoVO.setToken(token);
return judgeInfoVO;
}else {
ProjectJudgeDO projectJudgeDO2 = this.baseMapper.selectOne(new QueryWrapper<ProjectJudgeDO>()
.lambda()
.eq(ProjectJudgeDO::getAccountName, loginDTO.getAccountName())
.eq(ProjectJudgeDO::getPassword, loginDTO.getPassword()));
if (projectJudgeDO == null) {
throw new HttpException(10024);
if (null == projectJudgeDO2 ) {
throw new HttpException(10027);
}
if (projectJudgeDO.getStatus() == 0) {
throw new HttpException(10024);
}
throw new HttpException(10028);
}
}
String token = JwtUtil.generateToken(projectJudgeDO.getId(), SmsCode.review);
judgeInfoVO.setTelephone(projectJudgeDO.getTelephone());
judgeInfoVO.setPosition(projectJudgeDO.getPosition());
......@@ -150,6 +145,10 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
judgeInfoVO.setToken(token);
return judgeInfoVO;
}
} else {
throw new HttpException(10028);
}
}
@Override
public IPage<ProjectJudgePageVO> projectJudgesAssigned(ProjectJudgePageDTO projectJudgePageDTO) {
......
src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java
This diff could not be displayed because it is too large.
src/main/java/com/zhongzhi/vo/judge/ProjectJudgePageVO.java
......@@ -12,6 +12,10 @@ public class ProjectJudgePageVO {
*/
private String username;
private String accountName;
private String password;
/**
* 手机号
*/
......
src/main/java/com/zhongzhi/vo/project/VocationalProjectNum.java
......@@ -25,7 +25,7 @@ public class VocationalProjectNum {
/**
* 高职初赛项目数量
*/
// private Long secPreliminaryNUm;
private Long secPreliminaryNUm;
/**
* 已评审项目数量
......
src/main/java/com/zhongzhi/vo/student/StudentInfoVO.java
......@@ -38,4 +38,6 @@ public class StudentInfoVO {
private String graduateDate;
private String className;
private String xueyuan;
}
src/main/resources/application-dm.properties 0 → 100644
# 本地环境配置
# 端口号
server.port=23508
spring.datasource.dynamic.strict=false
spring.datasource.dynamic.primary=master
spring.datasource.dynamic.hikari.min-idle=5
spring.datasource.dynamic.hikari.max-pool-size=20
spring.datasource.dynamic.hikari.connection-timeout=30000
spring.datasource.dynamic.hikari.idle-timeout=600000
# db1 中职库
spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://116.62.57.92:3306/zhongzhi?connectTimeout=3000&socketTimeout=6000
spring.datasource.dynamic.datasource.db1.username=devloper
spring.datasource.dynamic.datasource.db1.password=dev@1553$
spring.datasource.dynamic.datasource.db1.driver-class-name=com.mysql.cj.jdbc.Driver
# db2 校内数据库
spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://localhost:5236/electron?connectTimeout=3000&socketTimeout=6000
spring.datasource.dynamic.datasource.db2.username=SYSDBA
spring.datasource.dynamic.datasource.db2.password=Ykhl1800
spring.datasource.dynamic.datasource.db2.driver-class-name=dm.jdbc.driver.DmDriver
# 控制台日志打印
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
src/main/resources/application-prod.properties
......@@ -3,14 +3,14 @@
server.port=23508
# db1
spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.dynamic.datasource.db1.username=ykadmin
spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.dynamic.datasource.db1.username=ykadmin_new
spring.datasource.dynamic.datasource.db1.password=youkedb608@good
spring.datasource.dynamic.datasource.db1.driver-class-name=com.mysql.cj.jdbc.Driver
# db2
spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/electron?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.dynamic.datasource.db2.username=ykadmin
spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/electron?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.dynamic.datasource.db2.username=ykadmin_new
spring.datasource.dynamic.datasource.db2.password=youkedb608@good
spring.datasource.dynamic.datasource.db2.driver-class-name=com.mysql.cj.jdbc.Driver
......
src/main/resources/code.properties
......@@ -9,6 +9,8 @@ c.code-message[10022]=输入的手机号和接收验证码手机号不一致
c.code-message[10023]=该身份证号已注册
c.code-message[10024]=手机号未注册
c.code-message[10026]=请稍后再试
c.code-message[10027]=密码不正确
c.code-message[10028]=账号不存在
# 项目
c.code-message[10040]=项目已申请
c.code-message[10041]=项目负责人已存在
......
src/main/resources/mapper/MatchDictDAO.xml
......@@ -32,7 +32,8 @@
<select id="getList" resultType="com.zhongzhi.model.MatchDictDO">
SELECT
p.*
c.id,
count(1)
FROM project p
LEFT JOIN student s ON s.id = p.proposer_id
LEFT JOIN colleges_dict c ON c.`name` = s.college
......@@ -62,7 +63,9 @@
and t2.delete_time is null
and t2.`status` = 1
and t.proposer_id = #{memberId}
<if test="progress != null and progress != ''">
and t.project_type = #{progress}
</if>
</select>
<select id="getSeedCurrentMatch" resultType="com.zhongzhi.model.MatchDictDO">
......
src/main/resources/mapper/ProjectDAO.xml
......@@ -249,7 +249,7 @@
pr.score as score,
pr.review_opinion
from project p
left join project_school_review pr on pr.project_id = p.id
left join project_review pr on pr.project_id = p.id
<where>
<if test="judgeId != null and judgeId != ''">
and pr.judge_id = #{judgeId}
......@@ -286,7 +286,7 @@
pr.project_schedule as projectSchedule,
pr.review_status as projectReview
from project p
left join project_school_review pr on p.id = pr.project_id
left join project_review pr on p.id = pr.project_id
where
p.match_id = #{matchId}
and pr.judge_id = #{id}
......
src/main/resources/mapper/ProjectJudgeDAO.xml
......@@ -40,7 +40,7 @@
<select id="projectJudgesAssigned" resultType="com.zhongzhi.vo.judge.ProjectJudgePageVO">
select
pj.*
distinct pj.*
from project_school_judge pj
left join project_school_review pr on pr.judge_id = pj.id
left join project p on p.id = pr.project_id
......@@ -58,7 +58,6 @@
and pj.delete_time is null
and pr.delete_time is null
</where>
group by pj.id
</select>
</mapper>
src/main/resources/mapper/ProjectScheduleRecordDAO.xml
......@@ -27,7 +27,7 @@
<select id="getProjectScheduleRecord" resultType="com.zhongzhi.vo.scheduleRecord.ProjectScheduleRecordVO">
select
p.id,
min(p.id) id,
s.college as collegeName
from project p
left join student s on s.id = p.proposer_id
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!