Skip to content

涂亚平 / ecnutrack

Go to a project
Commit e5dc9d86 by 涂亚平
Options

瑞金医院

1 parent 3ffa3955
Inline Side-by-side
Showing with 383 additions and 391 deletions
.idea/workspace.xml
......@@ -6,244 +6,45 @@
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2025-01-07-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2025-01-08-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2025-01-13-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/error/2025-01-14-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2024-08-26-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-07-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-08-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-09-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-10-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-13-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-14-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-15-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/MemberType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/Platform.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectReview.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectSchedule.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectStatus.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/Role.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/PermissionsController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectMembersController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/SmsVerifyCodeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/TeacherController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/administer/AdministerPageDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/administer/LoginDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/college/ExportCollegeDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/college/FileManagementDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/college/GetCollegesListDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/message/CreateMessageDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/message/MessagePageDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/oss/GetSecretVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ApproveDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/DataOverviewDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ExportProjectDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/GetSeedTrackMatchPageDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/MatchCollegeVodsDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ProjectCollegeListDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ProjectListPageDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/SeedTrackProjectNumDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/UpdateProjectDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/UploadVodsDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/teacher/LoginVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/teacher/RegisterDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/MatchDictMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/MessageMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/PermissionsMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/TeacherMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/CollegesDictDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/MessageDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectMembersDO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/CollegesDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/MatchDictService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/MessageService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/PermissionsService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectMembersService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/SmsVerifyCodeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/TeacherService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollegeFileServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollegesDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MatchDictServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MessageServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/PermissionsServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectMembersServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/TeacherServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/PDFUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/AdministerVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/PermissionVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/CollegeInfoVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/CollegesVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/ExcelFieldVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/ExportSchoolProjectSummaryVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/FileManagementVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/MatchCollegeVodsVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/RecentFileVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/message/MessageVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/OneProjectVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/ProjectDataOverview.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/RecentVodVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/SeedTrackProjectPageVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/SignatureVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/UploadVodsVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/VocationalNumVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/teacher/TeacherInfoVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/CollegesDictMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/MessageMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/PermissionsMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectMembersMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/TeacherMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/subsidy.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-01-16-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-06-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-07-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-08-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-10-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-11-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/logs/springboot-logback/info/2025-02-13-0.log.gz" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectTrack.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ecnutrack.iml" beforeDir="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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/SmsCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/SmsCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/common/interceptor/AuthenticationInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/interceptor/AuthenticationInterceptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/common/interceptor/LoginRequired.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/interceptor/LoginRequired.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AccessTokenController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CollegeFileController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AdministerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AdministerController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CompanyDictController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/GroupMemberMappingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/MatchDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/LaborGroupDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CollegesDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/LaborProjectMappingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/MessageController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/LaborServiceDictController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/MemberController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/OssController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/OssController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-08-02-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-08-05-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-08-07-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/springboot-logback/error/2024-08-09-0.log.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectReview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectReview.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/common/constant/ProjectStatus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CollegesDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/CollegesDictController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectMemberMappingController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectSalaryHistoryController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/ProjectSalaryNoticeController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/WechatController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/administer/AppLoginDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/administer/ChangeServiceDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/administer/VerifyCodeDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/company/OperatorsDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/AbnormalRecordDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/AddProjectDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/LaborProjectsDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/ProjectManageDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/labor/ProjectsDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/member/AddProjectMembersDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/member/DownloadFailClassMembers.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/member/DownloadFailClassMembersDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/member/ImportClassMemberDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ProjectMembersDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/TalentListDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/TalentSalaryDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/TalentSalaryDetailDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/salary/CommitSalaryDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/salary/ImportSalaryDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/salary/PushMsgDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/salary/SaveSalaryDTO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/wewchat/AuthenRequestVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/wewchat/JsSdkVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/wewchat/PushMsgPO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/wewchat/SignVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/job/ProjectSalaryNotificationJob.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AccessTokenMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/CollegeFileMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/AdministerMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/CompanyDictMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/GroupMemberMappingMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/CollegesDictMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/LaborProjectMappingMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/MemberMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/TeacherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/controller/TeacherController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ProjectListPageDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/ProjectListPageDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/SeedTrackProjectNumDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/dto/project/SeedTrackProjectNumDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectSalaryHistoryMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectSalaryNoticeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/ProjectMembersMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/SmsVerifyCodeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/mapper/SmsVerifyCodeMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AccessTokenDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/AdministerProjectMappingDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/CompanyDictDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/GroupMemberMappingDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/LaborGroupDictDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/LaborProjectMappingDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/LaborServiceDictDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/CollegeFileDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/MemberDO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/CollegesDictDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/CollegesDictDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/MatchDictDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectSalaryHistoryDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/TeacherDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectSalaryNoticeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/PermissionsDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/SmsVerifyCodeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/SmsVerifyCodeDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AccessTokenService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/CollegeFileService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AdministerLaborMappingService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AdministerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/AdministerService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/CompanyDictService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/GroupMemberMappingService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/LaborGroupDictService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/LaborProjectMappingService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/LaborServiceDictService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/MemberService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectMemberMappingService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectSalaryHistoryService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectSalaryNoticeService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectMembersDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/ProjectMembersDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/model/TeacherDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/model/TeacherDO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/ProjectService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AccessTokenServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/GroupMemberMappingServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/LaborProjectMappingServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectMemberMappingServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectSalaryHistoryServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectSalaryNoticeServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollegesDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/CollegesDictServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/BaseModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/BaseModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/ConstantUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/ConstantUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/Localstorage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/Localstorage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/RandomUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/RandomUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/SMSUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/SMSUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/excel/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/excel/ExcelUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/AdministerPermissionVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/ChangeServiceVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/PermissionsVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/administer/UserRoleVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/company/OperatorsVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/AbnormalRecordVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/LoginVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/ProjectManageVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/labor/ProjectsVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/GetMemberListVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/GetMembersVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/GroupMembersVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/member/ImportClassMembersVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/oss/GetSecretVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/oss/UploadFileVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/oss/UploadFileVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/LaborProjectsVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/TalentListVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/TalentSalaryDetailVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/TalentSalaryVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/salary/ProjectMembersVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/wechat/AccessTokenVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/wechat/AuthenTokenVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/wechat/PushMsgVO.java" beforeDir="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/java/com/subsidy/service/impl/TeacherServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/TeacherServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/util/PDFUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/util/PDFUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/CollegesVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/college/CollegesVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/SeedTrackProjectPageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/subsidy/vo/project/SeedTrackProjectPageVO.java" afterDir="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/AccessTokenMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CollegeFileMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/AdministerLaborMappingMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/AdministerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdministerMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/CompanyDictMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/GroupMemberMappingMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/LaborGroupDictMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/LaborProjectMappingMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/LaborServiceDictMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MemberMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ProjectMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectMemberMappingMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectSalaryHistoryMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ProjectSalaryNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MatchDictMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/SmsVerifyCodeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/SmsVerifyCodeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mybatis-plus.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis-plus.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -1129,13 +930,21 @@
<workItem from="1737007426654" duration="29000" />
<workItem from="1737008894655" duration="26000" />
<workItem from="1737009409184" duration="1475000" />
</task>
<task id="LOCAL-00027" summary="websocket上线了~~~">
<created>1665648136974</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1665648136974</updated>
<workItem from="1737644281379" duration="53000" />
<workItem from="1738748637968" duration="24231000" />
<workItem from="1738895911098" duration="19059000" />
<workItem from="1738993107191" duration="9234000" />
<workItem from="1739009230692" duration="28000" />
<workItem from="1739151594068" duration="599000" />
<workItem from="1739154579184" duration="728000" />
<workItem from="1739165906343" duration="5245000" />
<workItem from="1739254089025" duration="11000" />
<workItem from="1739266782479" duration="3079000" />
<workItem from="1739343533798" duration="115000" />
<workItem from="1739414520654" duration="607000" />
<workItem from="1739433106642" duration="13750000" />
<workItem from="1739775361968" duration="647000" />
<workItem from="1740994892903" duration="353000" />
</task>
<task id="LOCAL-00028" summary="92-online版本">
<created>1665655155929</created>
......@@ -1473,7 +1282,14 @@
<option name="project" value="LOCAL" />
<updated>1726716578337</updated>
</task>
<option name="localTasksCounter" value="76" />
<task id="LOCAL-00076" summary="居家办公前版本">
<created>1737644324163</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1737644324164</updated>
</task>
<option name="localTasksCounter" value="77" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -1556,70 +1372,86 @@
<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="1736317757627" />
<state width="1045" height="466" key="DebuggerActiveHint" timestamp="1736946086218">
<state x="468" y="112" key="CommitChangelistDialog2" timestamp="1737644323018">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="468" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1737644323018" />
<state width="1045" height="466" key="DebuggerActiveHint" timestamp="1739444227247">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1045" height="466" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1739444227247" />
<state x="165" y="157" width="1115" height="780" key="DiffContextDialog" timestamp="1738895076181">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1045" height="466" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1736946086218" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1737010519418">
<state x="165" y="157" width="1115" height="780" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1738895076181" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1739434553990">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1737010519418" />
<state width="1877" height="308" key="GridCell.Tab.0.bottom" timestamp="1737012226960">
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1739434553990" />
<state width="1754" height="247" key="GridCell.Tab.0.bottom" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="308" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226960" />
<state width="1877" height="308" key="GridCell.Tab.0.center" timestamp="1737012226960">
<state width="1754" height="247" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.0.center" timestamp="1739523793433">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="308" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226960" />
<state width="1877" height="308" key="GridCell.Tab.0.left" timestamp="1737012226960">
<state width="1754" height="247" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793433" />
<state width="1754" height="247" key="GridCell.Tab.0.left" timestamp="1739523793433">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="308" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226960" />
<state width="1877" height="308" key="GridCell.Tab.0.right" timestamp="1737012226960">
<state width="1754" height="247" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793433" />
<state width="1754" height="247" key="GridCell.Tab.0.right" timestamp="1739523793433">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="308" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226960" />
<state width="1877" height="225" key="GridCell.Tab.1.bottom" timestamp="1737012226958">
<state width="1754" height="247" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793433" />
<state width="1754" height="247" key="GridCell.Tab.1.bottom" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226958" />
<state width="1877" height="225" key="GridCell.Tab.1.center" timestamp="1737012226958">
<state width="1754" height="247" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.1.center" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226958" />
<state width="1877" height="225" key="GridCell.Tab.1.left" timestamp="1737012226958">
<state width="1754" height="247" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.1.left" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226958" />
<state width="1877" height="225" key="GridCell.Tab.1.right" timestamp="1737012226958">
<state width="1754" height="247" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.1.right" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226958" />
<state width="1877" height="225" key="GridCell.Tab.2.bottom" timestamp="1737012226959">
<state width="1754" height="247" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.2.bottom" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226959" />
<state width="1877" height="225" key="GridCell.Tab.2.center" timestamp="1737012226959">
<state width="1754" height="247" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.2.center" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226959" />
<state width="1877" height="225" key="GridCell.Tab.2.left" timestamp="1737012226958">
<state width="1754" height="247" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.2.left" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226958" />
<state width="1877" height="225" key="GridCell.Tab.2.right" timestamp="1737012226959">
<state width="1754" height="247" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state width="1754" height="247" key="GridCell.Tab.2.right" timestamp="1739523793434">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="225" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1737012226959" />
<state x="683" y="253" width="647" height="534" key="find.popup" timestamp="1736949654420">
<state width="1754" height="247" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1739523793434" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1737644330014">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="683" y="253" width="647" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1736949654420" />
<state x="926" y="230" width="672" height="678" key="search.everywhere.popup" timestamp="1736845652537">
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1737644330014" />
<state x="211" y="100" width="1614" height="847" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1739442045631">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="926" y="230" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1736845652537" />
<state x="211" y="100" width="1614" height="847" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1739442045631" />
<state x="283" y="122" width="647" height="694" key="find.popup" timestamp="1739444010083">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="283" y="122" width="647" height="694" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1739444010083" />
<state x="926" y="230" width="672" height="678" key="search.everywhere.popup" timestamp="1738909155534">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="926" y="230" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1738909155534" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1651,8 +1483,13 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectServiceImpl.java</url>
<line>734</line>
<option name="timeStamp" value="243" />
<line>353</line>
<option name="timeStamp" value="247" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/subsidy/service/impl/ProjectServiceImpl.java</url>
<line>779</line>
<option name="timeStamp" value="293" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
......
src/main/java/com/subsidy/common/constant/ProjectReview.java
......@@ -15,8 +15,11 @@ public class ProjectReview {
/**
* 评审状态（对于项目）
*/
// public static final String INNER_TO_REVIEWED = "待评审";
public static final String TO_REVIEWED = "待评审";
public static final String ASSIGNED = "已分配";
public static final String UNASSIGNED = "未分配";
......
src/main/java/com/subsidy/common/constant/ProjectStatus.java
......@@ -11,7 +11,15 @@ public class ProjectStatus {
public static final String WITHDRAWN = "已撤回";
public static final String SCHOOL_NOT_PASSED = "淘汰";
public static final String FIRST_NOT_PASSED = "校内初审未通过";
public static final String SECOND_NOT_PASSED = "复赛审核未通过";
public static final String FIRST_REVIEW = "等待校内初审";
public static final String SECOND_REVIEW = "等待复赛审核";
public static final String THIRD_REVIEW = "等待决赛结果";
public static final String REMATCH_WINNING_AWARD = "优秀奖";
......
src/main/java/com/subsidy/common/constant/ProjectTrack.java 0 → 100644
package com.subsidy.common.constant;
import lombok.Data;
@Data
public class ProjectTrack {
public static final String COURSE_TRACK = "课程赛道";
public static final String TEACH_TRACK = "教学赛道";
}
src/main/java/com/subsidy/controller/CollegesDictController.java
......@@ -66,7 +66,8 @@ public class CollegesDictController {
}
@PostMapping(value = "addContact")
@ApiOperation("院校端 --- 新增联系人：id 院校idleaderName/领导姓名、leaderPost/领导职务、leaderPhone/领导手机号、contactName/联系人姓名、contactPost/联系人职务、contactPhone/联系人手机号")
@ApiOperation("院校端 --- 新增联系人：id 院校id leaderName/领导姓名、leaderPost/领导职务、leaderPhone/领导手机号、contactName/联系人姓名、contactPost/联系人职务、contactPhone/联系人手机号" +
"contactDept 部门名称 contractDesc 职责说明")
public ResponseVO addContact(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.addContact(collegesDictDO);
return ResponseData.generateCreatedResponse(0);
......
src/main/java/com/subsidy/controller/ProjectController.java
......@@ -36,12 +36,21 @@ public class ProjectController {
private ProjectService projectService;
@PostMapping("createProject")
@ApiOperation("基本信息--保存并继续 id matchId teacherId courseName courseCode courseType grade courseHour theoryHour practiseHour" +
"score years startDate1 endDate1 startDate2 endDate2 studentTotalNum vodUrl")
@ApiOperation("基本信息--保存并继续 id matchId teacherId projectTrack 赛道：课程赛道/教学赛道 courseName courseNameEn 课程英文名称 courseCode courseType grade courseHour " +
" courseObject 开课对象：0：专业不限 1：限制专业 courseObjectMajor 开课对象专业 theoryHour practiseHour" +
"score years startDate1 endDate1 startDate2 endDate2 studentTotalNum1 studentTotalNum2 vodUrl " +
" 开课单位 companyName courseUrl 课程网址" +
" supportFile 课程支撑材料上传 relateResult teachComment")
public ResponseVO createProject(@RequestBody UpdateProjectDTO updateProjectDTO)throws Exception{
return ResponseData.generateCreatedResponse(0, projectService.createProject(updateProjectDTO));
}
@PostMapping("returnPrevious")
@ApiOperation("查看这个老师这一届是否填过 matchId teacherId projectTrack")
public ResponseVO returnPrevious(@RequestBody ProjectDO projectDO){
return ResponseData.generateCreatedResponse(0,projectService.returnPrevious(projectDO));
}
@PostMapping("updateProject")
@ApiOperation("[弃用]基本信息--课程团队/课程信息 id semester startDate endDate teachHours teachGrade classTotalNum " +
"projectMembersDOS[userName birthDate education position title major semester courseTarget startDate endDate teachHours teachGrade classTotalNum ]" +
......@@ -58,7 +67,7 @@ public class ProjectController {
}
@PostMapping("oneProjectByTeacherId")
@ApiOperation("查询单个项目 matchId teacherId")
@ApiOperation("查询单个项目 matchId teacherId projectTrack")
public ResponseVO oneProjectByTeacherId(@RequestBody ProjectDO projectDO){
return ResponseData.generateCreatedResponse(0,projectService.oneProjectByTeacherId(projectDO));
}
......@@ -137,14 +146,14 @@ public class ProjectController {
}
@PostMapping(value = "getVocationalProjectNum")
@ApiOperation("中心端/院校端 --- (职教)项目管理数量:id 院校id matchId/赛事ID、projectGroup/项目组别")
@ApiOperation("中心端/院校端 --- (职教)项目管理数量:id 院校id matchId/赛事ID、projectGroup/项目组别 projectTrack 赛道")
public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
}
@PostMapping(value = "/getSeedTrackProjectList")
@ApiOperation("院校端 --- 分页查询种子赛道全部项目：collegeId 院校id matchId/赛事ID,projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
"projectStatus/项目状态,name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
"projectStatus/项目状态, projectTrack 赛道 name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
}
......@@ -152,7 +161,7 @@ public class ProjectController {
/* -- 管理端 -- */
@PostMapping(value = "/getVocationalProjectPage")
@ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
"projectStatus/项目状态, itemField/领域, name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
"projectStatus/项目状态, projectTrack 赛道,itemField/领域, name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectPage(projectListPageDTO));
}
......
src/main/java/com/subsidy/controller/TeacherController.java
......@@ -39,7 +39,7 @@ public class TeacherController {
}
@PostMapping("register")
@ApiOperation("教师注册-提交 userName idCard nationality education collegeId major position title email telephone verifyCode")
@ApiOperation("教师注册-提交 userName idCard nationality education collegeId major position title years 工作年限 email telephone verifyCode")
public ResponseVO register(@RequestBody RegisterDTO registerDTO){
return ResponseData.generateCreatedResponse(0,teacherService.register(registerDTO));
}
......
src/main/java/com/subsidy/dto/project/ProjectListPageDTO.java
......@@ -27,4 +27,7 @@ public class ProjectListPageDTO {
private Long collegeId;
private String projectTrack;
}
src/main/java/com/subsidy/dto/project/SeedTrackProjectNumDTO.java
......@@ -13,4 +13,6 @@ public class SeedTrackProjectNumDTO {
private String projectProgress;
private String projectTrack;
}
src/main/java/com/subsidy/mapper/ProjectMapper.java
......@@ -24,17 +24,19 @@ import java.util.List;
@Repository
public interface ProjectMapper extends BaseMapper<ProjectDO> {
void updateMajor(Long id);
IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage(Page page, Long matchId, String projectGroup, String courseName);
IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage1(Page page, Long matchId, String projectGroup, @Param("type") String type,
Long collegeId, String projectSchedule,
String projectStatus, @Param("name") String name,@Param("projectProgress") String projectProgress);
String projectStatus, @Param("name") String name,@Param("projectProgress") String projectProgress,String projectTrack);
List<MatchCollegeVodsVO> matchCollegeVods(Long collegeId, Long matchId);
List<MatchDictDO> getList( @Param("projectGroup") String projectGroup);
List<ProjectDO> getSeedTrackProjectList(Long collegeId,Long matchId, String projectGroup, @Param("projectProgress")String projectProgress);
List<ProjectDO> getSeedTrackProjectList(Long collegeId,Long matchId, String projectGroup, @Param("projectProgress")String projectProgress,String projectTrack);
List<RecentVodVO> recentVod(Long matchId,Long collegeId);
}
src/main/java/com/subsidy/model/CollegesDictDO.java
......@@ -54,25 +54,30 @@ public class CollegesDictDO extends BaseModel {
*/
private String password;
/**
* 分管领导姓名
*/
private String leaderName;
/**
* 分管领导职位
*/
private String leaderPost;
// /**
// * 分管领导姓名
// */
// private String leaderName;
//
// /**
// * 分管领导职位
// */
// private String leaderPost;
//
// /**
// * 分管领导手机号
// */
// private String leaderPhone;
/**
* 分管领导手机号
* 联系人姓名
*/
private String leaderPhone;
private String contactName;
/**
* 联系人姓名
* 部门
*/
private String contactName;
private String contactDept;
/**
* 联系人职位
......@@ -85,6 +90,11 @@ public class CollegesDictDO extends BaseModel {
private String contactPhone;
/**
* 职责说明
*/
private String contractDesc;
/**
* 登录时间
*/
private LocalDateTime loginTime;
......
src/main/java/com/subsidy/model/ProjectDO.java
......@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* <p>
*
......@@ -29,6 +31,8 @@ public class ProjectDO extends BaseModel {
private Long teacherId;
private String projectTrack;
private Long collegeId;
private String projectGroup;
......@@ -39,6 +43,11 @@ public class ProjectDO extends BaseModel {
private String courseName;
/**
* 课程英文名称
*/
private String courseNameEn;
/**
* 课程编码
*/
private String courseCode;
......@@ -49,6 +58,16 @@ public class ProjectDO extends BaseModel {
private String courseType;
/**
* 开课对象
*/
private Integer courseObject;
/**
* 开课对象专业
*/
private String courseObjectMajor;
/**
* 开课年级
*/
private String grade;
......@@ -56,27 +75,22 @@ public class ProjectDO extends BaseModel {
/**
* 课程总学时
*/
private Integer courseHour;
private BigDecimal courseHour;
/**
* 理论学时
* 理论学时【弃用】
*/
private Integer theoryHour;
private String theoryHour;
/**
* 实践学时
*/
private Integer practiseHour;
private BigDecimal practiseHour;
/**
* 分数
*/
private Integer score;
/**
* 授课年数
*/
private String years;
private BigDecimal score;
private String startDate1;
......@@ -87,9 +101,14 @@ public class ProjectDO extends BaseModel {
private String endDate2;
/**
* 最近两轮学生总人数
* 最近学生总人数1
*/
private Integer studentTotalNum1;
/**
* 最近学生总人数2
*/
private Integer studentTotalNum;
private Integer studentTotalNum2;
/**
* 学期
......@@ -109,7 +128,7 @@ public class ProjectDO extends BaseModel {
/**
* 授课学时
*/
private Integer teachHours;
private BigDecimal teachHours;
/**
* 授课年级
......@@ -196,4 +215,29 @@ public class ProjectDO extends BaseModel {
*/
private String uploadDate;
/**
* 课程支撑材料上传
*/
private String supportFile;
/**
* 相关成果
*/
private String relateResult;
/**
* 教学反思和自我评价
*/
private String teachComment;
/**
* 开课单位
*/
private String companyName;
/**
* 课程地址
*/
private String courseUrl;
}
src/main/java/com/subsidy/model/ProjectMembersDO.java
......@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* <p>
*
......@@ -77,7 +79,7 @@ public class ProjectMembersDO extends BaseModel {
/**
* 授课学时
*/
private Integer teachHours;
private BigDecimal teachHours;
/**
* 授课年级
......
src/main/java/com/subsidy/model/TeacherDO.java
......@@ -67,6 +67,11 @@ public class TeacherDO extends BaseModel {
private String title;
/**
* 工作年限
*/
private Integer years;
/**
* 邮箱
*/
private String email;
......
src/main/java/com/subsidy/service/ProjectService.java
......@@ -22,13 +22,15 @@ public interface ProjectService extends IService<ProjectDO> {
ProjectDO createProject(UpdateProjectDTO updateProjectDTO)throws Exception;
ProjectDO returnPrevious(ProjectDO projectDO);
ProjectDO updateProject(UpdateProjectDTO updateProjectDTO)throws Exception;
OneProjectVO oneProject(ProjectDO projectDO);
OneProjectVO oneProjectByTeacherId(ProjectDO projectDO);
OneProjectVO teacherProject(ProjectDO projectDO);
List<OneProjectVO> teacherProject(ProjectDO projectDO);
void downloadPdf(ProjectDO projectDO);
......
src/main/java/com/subsidy/service/impl/CollegesDictServiceImpl.java
......@@ -206,7 +206,7 @@ public class CollegesDictServiceImpl extends ServiceImpl<CollegesDictMapper, Col
eps.setTeacherName(teacherDO.getUserName());
eps.setGender(PDFUtil.idCard2Gender(teacherDO.getIdCard()));
eps.setBirthDate(PDFUtil.idCard2BirthDate(teacherDO.getIdCard()));
eps.setYears(projectDO.getYears());
eps.setYears(teacherDO.getYears()+"");
eps.setPosition(teacherDO.getPosition() + "/" + teacherDO.getTitle());
eps.setEmail(teacherDO.getEmail());
......
src/main/java/com/subsidy/service/impl/ProjectServiceImpl.java
......@@ -80,7 +80,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
ProjectDO projectDO1 = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
.lambda()
.eq(ProjectDO::getMatchId, projectDO.getMatchId())
.eq(ProjectDO::getTeacherId, projectDO.getTeacherId()));
.eq(ProjectDO::getTeacherId, projectDO.getTeacherId())
.eq(ProjectDO::getProjectTrack, projectDO.getProjectTrack()));
if (null == projectDO1) {
projectDO.setProjectSchedule(ProjectSchedule.REGISTER);
projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
......@@ -112,35 +113,35 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
if (StringUtils.isNotEmpty(projectDO.getAttachment())) {
projectDO1.setProjectReview(ProjectReview.TO_REVIEWED);
projectDO1.setProjectAssigned(ProjectReview.UNASSIGNED);
projectDO1.setProjectStatus(ProjectStatus.TO_REVIEW);
projectDO1.setProjectStatus(ProjectStatus.FIRST_REVIEW);
}
ProjectMembersDO projectMembersDO = projectMembersMapper.selectOne(new QueryWrapper<ProjectMembersDO>()
.lambda()
.eq(ProjectMembersDO::getProjectId,projectDO1.getId())
.eq(ProjectMembersDO::getRole,Role.LEADER));
.eq(ProjectMembersDO::getProjectId, projectDO1.getId())
.eq(ProjectMembersDO::getRole, Role.LEADER));
if (StringUtils.isNotEmpty(projectDO.getSemester())){
if (StringUtils.isNotEmpty(projectDO.getSemester())) {
projectMembersDO.setSemester(projectDO.getSemester());
}
if (StringUtils.isNotEmpty(projectDO.getStartDate())){
if (StringUtils.isNotEmpty(projectDO.getStartDate())) {
projectMembersDO.setStartDate(projectDO.getStartDate());
}
if (StringUtils.isNotEmpty(projectDO.getEndDate())){
if (StringUtils.isNotEmpty(projectDO.getEndDate())) {
projectMembersDO.setEndDate(projectDO.getEndDate());
}
if (null != projectDO.getTeachHours()){
if (null != projectDO.getTeachHours()) {
projectMembersDO.setTeachHours(projectDO.getTeachHours());
}
if (StringUtils.isNotEmpty(projectDO.getTeachGrade())){
if (StringUtils.isNotEmpty(projectDO.getTeachGrade())) {
projectMembersDO.setTeachGrade(projectDO.getTeachGrade());
}
if (null != projectDO.getClassTotalNum()){
if (null != projectDO.getClassTotalNum()) {
projectMembersDO.setClassTotalNum(projectDO.getClassTotalNum());
}
if (null != projectDO.getCourseTarget()){
if (null != projectDO.getCourseTarget()) {
projectMembersDO.setCourseTarget(projectDO.getCourseTarget());
}
projectMembersMapper.updateById(projectMembersDO);
......@@ -158,12 +159,45 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
projectMembersMapper.insert(pmd);
}
}
if (null != projectDO.getCourseObject() && 0 == projectDO.getCourseObject()){
this.baseMapper.updateMajor(projectDO1.getId());
}
this.baseMapper.updateById(projectDO1);
}
return projectDO;
}
public ProjectDO returnPrevious(ProjectDO projectDO) {
ProjectDO projectDO1 = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
.lambda()
.eq(ProjectDO::getMatchId, projectDO.getMatchId())
.eq(ProjectDO::getTeacherId, projectDO.getTeacherId())
.ne(ProjectDO::getProjectTrack, projectDO.getProjectTrack()));
if (null != projectDO1) {
List<ProjectMembersDO> projectMembersDOS = projectMembersMapper.selectList(new QueryWrapper<ProjectMembersDO>()
.lambda()
.eq(ProjectMembersDO::getProjectId,projectDO1.getId()));
projectDO1.setProjectTrack(projectDO.getProjectTrack());
projectDO1.setId(null);
projectDO1.setAttachment(null);
projectDO1.setProjectStatus(ProjectStatus.UN_SUBMITTED);
projectDO1.setProjectSchedule(ProjectSchedule.REGISTER);
this.baseMapper.insert(projectDO1);
projectMembersDOS.stream().forEach(x->{
x.setProjectId(projectDO1.getId());
projectMembersMapper.insert(x);
});
}
return null;
}
public ProjectDO updateProject(UpdateProjectDTO updateProjectDTO) throws Exception {
ProjectDO projectDO = this.baseMapper.selectById(updateProjectDTO.getId());
// BeanUtils.copyProperties(updateProjectDTO, projectDO);
......@@ -217,9 +251,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
ProjectDO projectDO1 = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
.lambda()
.eq(ProjectDO::getTeacherId, projectDO.getTeacherId())
.eq(ProjectDO::getMatchId, projectDO.getMatchId()));
.eq(ProjectDO::getMatchId, projectDO.getMatchId())
.eq(ProjectDO::getProjectTrack, projectDO.getProjectTrack()));
if (null != projectDO1) {
List<ProjectMembersDO> projectMembersDOS = projectMembersMapper.selectList(new QueryWrapper<ProjectMembersDO>()
.lambda()
.eq(ProjectMembersDO::getProjectId, projectDO1.getId())
......@@ -232,28 +266,28 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
return oneProjectVO;
}
public OneProjectVO teacherProject(ProjectDO projectDO) {
public List<OneProjectVO> teacherProject(ProjectDO projectDO) {
OneProjectVO oneProjectVO = new OneProjectVO();
ProjectDO projectDO1 = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
List<OneProjectVO> result = new ArrayList<>();
List<ProjectDO> projectDOS = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
.lambda()
.eq(ProjectDO::getMatchId, projectDO.getMatchId())
.eq(ProjectDO::getTeacherId, projectDO.getTeacherId()));
if (null != projectDO1) {
BeanUtils.copyProperties(projectDO1, oneProjectVO);
for (ProjectDO pd : projectDOS) {
OneProjectVO oneProjectVO = new OneProjectVO();
BeanUtils.copyProperties(pd, oneProjectVO);
List<ProjectMembersDO> projectMembersDOS = projectMembersMapper.selectList(new QueryWrapper<ProjectMembersDO>()
.lambda()
.eq(ProjectMembersDO::getProjectId, projectDO.getId()));
oneProjectVO.setProjectMembersDOS(projectMembersDOS);
TeacherDO teacherDO = teacherMapper.selectById(projectDO1.getTeacherId());
TeacherDO teacherDO = teacherMapper.selectById(pd.getTeacherId());
CollegesDictDO collegesDictDO = collegesDictMapper.selectById(teacherDO.getCollegeId());
oneProjectVO.setCollegeName(collegesDictDO.getName());
oneProjectVO.setUserName(teacherDO.getUserName());
return oneProjectVO;
} else {
return new OneProjectVO();
result.add(oneProjectVO);
}
return result;
}
public void downloadPdf(ProjectDO projectDO) {
......@@ -270,7 +304,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
.lambda()
.eq(ProjectMembersDO::getProjectId, projectDO.getId()));
PDFUtil.create(projectDO1, matchDictDO, teacherDO, projectMembersDOS, collegesDictDO);
//判断项目类型 课程赛道和教学赛道
if (ProjectTrack.COURSE_TRACK.equals(projectDO1.getProjectTrack())) {
PDFUtil.createCourse(projectDO1, matchDictDO, teacherDO, projectMembersDOS, collegesDictDO);
} else {
PDFUtil.createTeach(projectDO1, matchDictDO, teacherDO, projectMembersDOS, collegesDictDO);
}
}
@Override
......@@ -294,16 +334,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
ProjectDO project = new ProjectDO();
project.setId(projectDO.getId());
if (ProjectStatus.SCHOOL_NOT_PASSED.equals(projectDO.getProjectStatus())){
if (ProjectStatus.FIRST_NOT_PASSED.equals(projectDO.getProjectStatus())) {
throw new HttpException(10032);
}
if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
} else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
&& ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
project.setProjectStatus(ProjectReview.TO_REVIEWED);
project.setProjectStatus(ProjectStatus.SECOND_REVIEW);
project.setProjectReview(ProjectReview.TO_SCORE);
} else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
&& ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
......@@ -312,7 +353,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
*/
if (approveDTO.getProjectStatus() == 1) {
project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
project.setProjectStatus(ProjectReview.TO_REVIEWED);
project.setProjectStatus(ProjectStatus.THIRD_REVIEW);
project.setProjectReview(ProjectReview.TO_SCORE);
project.setProjectAssigned(ProjectReview.UNASSIGNED);
}
......@@ -349,28 +390,30 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
ProjectDO project = new ProjectDO();
project.setId(projectDO.getId());
if (ProjectStatus.SCHOOL_NOT_PASSED.equals(projectDO.getProjectStatus())){
if (ProjectStatus.FIRST_NOT_PASSED.equals(projectDO.getProjectStatus())) {
throw new HttpException(10032);
}
if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
} else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
&& ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
project.setProjectStatus(ProjectReview.TO_REVIEWED);
project.setProjectReview(ProjectReview.TO_SCORE);
} else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
project.setProjectStatus(ProjectStatus.SECOND_REVIEW);
} else if (ProjectStatus.SECOND_REVIEW.equals(projectDO.getProjectStatus())
&& ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
/**
* 复赛通过 ---> 决赛审核
*/
if (approveDTO.getProjectStatus() == 1) {
project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
project.setProjectStatus(ProjectReview.TO_REVIEWED);
project.setProjectStatus(ProjectStatus.THIRD_REVIEW);
project.setProjectReview(ProjectReview.TO_SCORE);
project.setProjectAssigned(ProjectReview.UNASSIGNED);
}
// }
// else if (ProjectStatus.THIRD_REVIEW.equals(projectDO.getProjectStatus())
// && ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
// /**
// * 复赛通过 ---> 决赛审核
// */
// if (approveDTO.getProjectStatus() == 1) {
// project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
// project.setProjectStatus(ProjectStatus.THIRD_REVIEW);
// project.setProjectReview(ProjectReview.TO_SCORE);
// project.setProjectAssigned(ProjectReview.UNASSIGNED);
// }
} else {
/**
* 决赛通过 ---> 决赛通过
......@@ -559,7 +602,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
throw new HttpException(10045);
}
if (project.getProjectStatus().equals(ProjectStatus.SCHOOL_NOT_PASSED)) {
if (project.getProjectStatus().equals(ProjectStatus.FIRST_NOT_PASSED)) {
throw new HttpException(10045);
}
......@@ -589,7 +632,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
* 校内赛上报撤回，没有分配评委 + 没有评分
*/
if (!project.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
if (project.getProjectStatus().equals(ProjectStatus.SECOND_NOT_PASSED)) {
throw new HttpException(10073);
}
......@@ -609,14 +652,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
if (ProjectSchedule.REGISTER.equals(project.getProjectSchedule())) {
p.setProjectSchedule(ProjectSchedule.REGISTER);
p.setProjectStatus(ProjectStatus.UN_SUBMITTED);
}
if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(project.getProjectSchedule())) {
p.setProjectSchedule(ProjectSchedule.REGISTER);
p.setProjectStatus(ProjectStatus.FIRST_REVIEW);
}
if (project.getProjectSchedule().equals(ProjectSchedule.REGISTER)) {
p.setProjectStatus(ProjectStatus.UN_SUBMITTED);
}
//
// if (project.getProjectSchedule().equals(ProjectSchedule.REGISTER)) {
// p.setProjectStatus(ProjectStatus.UN_SUBMITTED);
// }
this.baseMapper.updateById(p);
......@@ -628,9 +673,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
List<ProjectDO> list = new ArrayList<ProjectDO>();
if (null != seedTrackProjectNumDTO.getId()) {
list = this.baseMapper.getSeedTrackProjectList(collegesDictDO.getId(), seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), null);
list = this.baseMapper.getSeedTrackProjectList(collegesDictDO.getId(), seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), null, seedTrackProjectNumDTO.getProjectTrack());
} else {
list = this.baseMapper.getSeedTrackProjectList(null, seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), null);
list = this.baseMapper.getSeedTrackProjectList(null, seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), null, seedTrackProjectNumDTO.getProjectTrack());
}
VocationalNumVO vocationalNumVO = new VocationalNumVO();
......@@ -659,7 +704,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
Page page = new Page(projectListPageDTO.getPageNum(), projectListPageDTO.getPageSize());
return this.baseMapper.getSeedTrackProjectPage1(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, projectListPageDTO.getCollegeId(),
projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress(), projectListPageDTO.getProjectTrack());
}
......@@ -679,7 +724,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
}
IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage1(page, matchId, projectListPageDTO.getProjectGroup(), ProjectType.VOCATIONAL, null,
projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress(), projectListPageDTO.getProjectTrack());
return iPage;
}
......@@ -696,21 +741,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
if (!projectDO.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
throw new HttpException(10065);
}
// String projectStatus = "";
// if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
// && ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
// projectStatus = ProjectStatus.SCHOOL_NOT_PASSED;
// } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
// && ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
// projectStatus = ProjectStatus.SCHOOL_NOT_PASSED;
// }
//StudentDO studentDO = studentService.getById(projectDO.getProposerId());
ProjectDO project = new ProjectDO();
if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
&& ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectStatus(ProjectStatus.FIRST_NOT_PASSED);
} else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
&& ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
project.setProjectStatus(ProjectStatus.SECOND_NOT_PASSED);
}
project.setId(projectDO.getId());
project.setProjectStatus(ProjectStatus.SCHOOL_NOT_PASSED);
project.setProjectSchedule(projectDO.getProjectSchedule());
this.baseMapper.updateById(project);
......@@ -726,28 +766,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectDO> im
throw new HttpException(10046);
}
if (!projectDO.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
throw new HttpException(10065);
}
// String projectStatus = "";
// if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
// && ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
// projectStatus = ProjectStatus.SCHOOL_NOT_PASSED;
// } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
// && ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
// projectStatus = ProjectStatus.SCHOOL_NOT_PASSED;
// if (!projectDO.getProjectStatus().equals(ProjectStatus.FIRST_NOT_PASSED)) {
// throw new HttpException(10065);
// }
//StudentDO studentDO = studentService.getById(projectDO.getProposerId());
ProjectDO project = new ProjectDO();
if (ProjectStatus.FIRST_REVIEW.equals(projectDO.getProjectStatus())
&& ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
project.setProjectStatus(ProjectStatus.FIRST_NOT_PASSED);
} else if (ProjectStatus.SECOND_REVIEW.equals(projectDO.getProjectStatus())
&& ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
project.setProjectStatus(ProjectStatus.SECOND_NOT_PASSED);
}
project.setId(projectDO.getId());
project.setProjectStatus(ProjectStatus.SCHOOL_NOT_PASSED);
project.setProjectSchedule(projectDO.getProjectSchedule());
this.baseMapper.updateById(project);
}
}
}
......
src/main/java/com/subsidy/service/impl/TeacherServiceImpl.java
......@@ -149,7 +149,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, TeacherDO> im
BeanUtils.copyProperties(teacherDO,loginVO);
return loginVO;
} else {
throw new HttpException(10003);
throw new HttpException(10004);
}
}
......
src/main/java/com/subsidy/util/PDFUtil.java
This diff could not be displayed because it is too large.
src/main/java/com/subsidy/vo/college/CollegesVO.java
......@@ -29,10 +29,14 @@ public class CollegesVO {
private String contactName;
private String contactDept;
private String contactPost;
private String contactPhone;
private String contractDesc;
private String token;
}
src/main/java/com/subsidy/vo/project/SeedTrackProjectPageVO.java
......@@ -21,6 +21,8 @@ public class SeedTrackProjectPageVO {
private String title;
private Integer years;
private String education;
private String major;
......
src/main/resources/application-prod.properties
......@@ -2,11 +2,11 @@
spring.server.port=23504
# 数据源配置
spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/ecnutrack?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://172.20.4.227:3306/ecnutrack?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ykadmin_new
spring.datasource.password=youkedb608@good
spring.datasource.username=root
spring.datasource.password=ecnutrack10269!&
spring.datasource.druid.initialSize=5
spring.datasource.druid.minIdle=5
......
src/main/resources/mapper/ProjectMapper.xml
......@@ -2,6 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.subsidy.mapper.ProjectMapper">
<update id="updateMajor" parameterType="long">
update project t set t.course_object_major = null where id = #{id}
</update>
<select id="getSeedTrackProjectPage" resultType="com.subsidy.vo.project.SeedTrackProjectPageVO">
SELECT
p.course_name,
......@@ -14,6 +18,7 @@
s.telephone,
p.project_group,
p.`status`,
s.years,
DATE_FORMAT( p.create_date, '%Y-%m-%d' ) AS applicationTime
FROM
project p
......@@ -98,6 +103,9 @@
<if test="projectProgress!= null and projectProgress != ''">
and p.project_progress = #{projectProgress}
</if>
<if test="projectTrack != null and projectTrack != ''">
and p.project_track = #{projectTrack}
</if>
and p.project_status != '填写中'
and p.delete_date is null
and s.delete_date is null
......@@ -128,6 +136,7 @@
s.position,
s.title,
s.education,
s.years,
p.course_name,
DATE_FORMAT(p.create_date, '%Y-%m-%d') as applicationTime
from project p
......@@ -159,6 +168,9 @@
<if test="name != null and name != ''">
and (p.course_name like concat('%',#{name},'%') or s.user_name like concat('%',#{name},'%') or cd.name like concat('%',#{name},'%'))
</if>
<if test="projectTrack != null and projectTrack != ''">
and p.project_track = #{projectTrack}
</if>
and p.delete_date is null
and s.delete_date is null
</where>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!