回家代码同步

pom.xml

@@ -198,7 +198,7 @@
     </repositories>
 
     <build>
-        <finalName>zhongzhi</finalName>
+        <finalName>gtja</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/zhongzhi/common/configure/SwaggerConfig.java

@@ -30,7 +30,7 @@ public class SwaggerConfig {
                 .paths(PathSelectors.any())
                 .build()
                 .apiInfo(new ApiInfoBuilder()
-                        .title("中职双创系统")
+                        .title("国泰君安")
                         .description("接口文档")
                         .version("1.0")
                         .build());

src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java

@@ -14,7 +14,7 @@ public class ProjectSchedule {
     public static final String REGISTER = "报名阶段";
 
     // 校内赛
-    public static final String SCHOOL_REVIEW = "校级申请项目";
+    public static final String SCHOOL_REVIEW = "市级初赛项目";
 
 //    public static final String PRELIMINARY_REVIEW = "市级初赛项目";
 

src/main/java/com/zhongzhi/common/constant/ProjectStatus.java

@@ -22,11 +22,13 @@ public class ProjectStatus {
 
     public static final String PRELIMINARY_NOT_PASSED = "不予提交市级初赛";
 
-    public static final String REMATCH_WINNING_AWARD = "市级优胜奖";
+    public static final String REMATCH_WINNING_AWARD = "优胜奖";
 
-    public static final String REMATCH_SILVER_AWARD = "市级银奖";
+    public static final String REMATCH_SILVER_AWARD = "二等奖";
 
-    public static final String REMATCH_BRONZE_AWARD = "市级铜奖";
+    public static final String REMATCH_BRONZE_AWARD = "三等奖";
 
-    public static final String REMATCH_FINALS_GOLD_AWARD = "市级金奖";
+    public static final String REMATCH_FINALS_GOLD_AWARD = "一等奖";
+
+    public static final String ABANDON = "未通过";
 }

src/main/java/com/zhongzhi/common/constant/ProjectType.java

@@ -17,7 +17,7 @@ public class ProjectType {
 
     public static final String SEED_TRACK = "种子赛道";
 
-    public static final String VOCATIONAL = "职教赛道";
+//    public static final String VOCATIONAL = "职教赛道";
 
     /**
      * 组别

src/main/java/com/zhongzhi/controller/AdministerController.java

@@ -40,14 +40,14 @@ public class AdministerController {
 
     @PostMapping(value = "/getAdministerPage")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
+    @ApiOperation("####中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
     public ResponseVO getAdministerPage(@RequestBody AdministerPageDTO administerPageDTO) {
         return ResponseData.generateCreatedResponse(0, administerService.getAdministerPage(administerPageDTO));
     }
 
     @PostMapping(value = "/createAdminister")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色")
+    @ApiOperation("####中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色")
     public ResponseVO createAdminister(@RequestBody AdministerDO administerDO) {
         administerService.save(administerDO);
         return ResponseData.generateCreatedResponse(0);
@@ -55,7 +55,7 @@ public class AdministerController {
 
     @PostMapping(value = "/updateAdminister")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色")
+    @ApiOperation("####中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色")
     public ResponseVO updateAdminister(@RequestBody AdministerDO administerDO) {
         administerService.updateById(administerDO);
         return ResponseData.generateCreatedResponse(0);
@@ -63,7 +63,7 @@ public class AdministerController {
 
     @PostMapping(value = "/deleteById")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 删除成员：id/成员ID")
+    @ApiOperation("####中心端 --- 删除成员：id/成员ID")
     public ResponseVO delete(@RequestBody AdministerDO administerDO) {
         administerService.removeById(administerDO.getId());
         return ResponseData.generateCreatedResponse(0);

src/main/java/com/zhongzhi/controller/CollegesDictController.java

@@ -40,7 +40,7 @@ public class CollegesDictController {
     public CollegesDictService collegesDictService;
 
     @PostMapping(value = "/getCollegesList")
-    @ApiOperation("查询所有就读院校: name/院校名称, education/学历")
+    @ApiOperation("####查询所有就读院校: name/院校名称, education/学历")
     public ResponseVO getCollegesList(@RequestBody CollegesDictDTO collegesDictDTO) {
         QueryWrapper<CollegesDictDO> queryWrapper = new QueryWrapper();
         if (StringUtils.isNotBlank(collegesDictDTO.getEducation())) {
@@ -65,8 +65,8 @@ public class CollegesDictController {
     }
 
     @PostMapping(value = "updateCollegeById")
-    @LoginRequired({Platform.center})
-    @ApiOperation("院校端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码")
+    @LoginRequired({Platform.center,Platform.school})
+    @ApiOperation("####院校端，中心端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码")
     public ResponseVO updateCollegeById(@RequestBody CollegesDictDO collegesDictDO) {
         collegesDictService.updateById(collegesDictDO);
         return ResponseData.generateCreatedResponse(0);
@@ -194,14 +194,14 @@ public class CollegesDictController {
 
     @PostMapping(value = "/getCollegesPage")
     @LoginRequired(Platform.center)
-    @ApiOperation("中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数")
+    @ApiOperation("####中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数")
     public ResponseVO getCollegesPage(@RequestBody CollegesPageDTO collegesPageDTO) {
         return ResponseData.generateCreatedResponse(0, collegesDictService.getCollegesPage(collegesPageDTO));
     }
 
     @PostMapping(value = "/createColleges")
     @LoginRequired(Platform.center)
-    @ApiOperation("中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号")
+    @ApiOperation("####中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号")
     public ResponseVO createColleges(@RequestBody CollegesDictDO collegesDictDO) {
         collegesDictService.createColleges(collegesDictDO);
         return ResponseData.generateCreatedResponse(0);
@@ -209,7 +209,7 @@ public class CollegesDictController {
 
     @PostMapping(value = "/delete")
     @LoginRequired(Platform.center)
-    @ApiOperation("中心端 --- 删除院校: id/院校ID")
+    @ApiOperation("####中心端 --- 删除院校: id/院校ID")
     public ResponseVO delete(@RequestBody CollegesDictDO collegesDictDO) {
         collegesDictService.removeById(collegesDictDO.getId());
         return ResponseData.generateCreatedResponse(0);
@@ -246,7 +246,7 @@ public class CollegesDictController {
 
     @PostMapping(value = "/exportCollege")
     @LoginRequired(Platform.center)
-    @ApiOperation("导出院校名录")
+    @ApiOperation("####导出院校名录")
     public ResponseVO exportCollege() {
         collegesDictService.exportCollege();
         return ResponseData.generateCreatedResponse(0);

src/main/java/com/zhongzhi/controller/MajorDictController.java

@@ -33,7 +33,7 @@ public class MajorDictController {
     private MajorDictService majorDictService;
 
     @PostMapping(value = "/getMajorList")
-    @ApiOperation("查询全部就读专业: major/专业名称、education/学历、code/院校代码")
+    @ApiOperation("####查询全部就读专业: major/专业名称、education/学历、code/院校代码")
     public ResponseVO getMajorList(@RequestBody MajorDictDO majorDictDO) {
         return ResponseData.generateCreatedResponse(0, majorDictService.list(new QueryWrapper<MajorDictDO>()
                 .lambda()

src/main/java/com/zhongzhi/controller/MatchDictController.java

@@ -114,17 +114,16 @@ public class MatchDictController {
 
     @PostMapping(value = "/createVocationalMatch")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
+    @ApiOperation("####中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
             "schedule:[{ scheduleTime/时间安排、explains/说明 }]")
     public ResponseVO createVocationalMatch(@RequestBody MatchDictDTO matchDictDTO) {
-        matchDictDTO.setMatchType(ProjectType.VOCATIONAL);
         matchDictService.createMatch(matchDictDTO);
         return ResponseData.generateCreatedResponse(0);
     }
 
     @PostMapping(value = "/updateMatch")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---编辑赛事年份：id/ID、matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、status/状态（1：启动，0：暂停）" +
+    @ApiOperation("####中心端 ---编辑赛事年份：id/ID、matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、status/状态（1：启动，0：暂停）" +
             "schedule:[{ id/时间安排ID、scheduleTime/时间安排、explains/说明 }]")
     public ResponseVO updateMatch(@RequestBody MatchDictDTO matchDictDTO) {
         matchDictService.updateMatch(matchDictDTO);
@@ -133,7 +132,7 @@ public class MatchDictController {
 
     @PostMapping(value = "/delete")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---删除赛事年份：id/ID")
+    @ApiOperation("####中心端 ---删除赛事年份：id/ID")
     public ResponseVO delete(@RequestBody MatchDictDO matchDictDO) {
         matchDictService.removeById(matchDictDO.getId());
         return ResponseData.generateCreatedResponse(0);
@@ -159,17 +158,15 @@ public class MatchDictController {
 
     @PostMapping(value = "/getVocationalMatchAll")
     @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
-    @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
+    @ApiOperation("####中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
     public ResponseVO getVocationalMatchAll() {
-        return ResponseData.generateCreatedResponse(0, matchDictService.list(new QueryWrapper<MatchDictDO>()
-                .lambda()
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)));
+        return ResponseData.generateCreatedResponse(0, matchDictService.list(null));
     }
 
     /* 职教管理端 */
     @PostMapping(value = "/getVocationalPage")
     @LoginRequired({Platform.center, Platform.school, Platform.review})
-    @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
+    @ApiOperation("####中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
     public ResponseVO getVocationalPage(@RequestBody SelectListPageDTO selectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalPage(selectListPageDTO));
     }

src/main/java/com/zhongzhi/controller/MatchScheduleController.java

@@ -66,7 +66,6 @@ public class MatchScheduleController {
         MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
                 .eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
                 .eq(MatchDictDO::getStatus, 1));
         List<MatchScheduleDO> list = new ArrayList<>();
         if (matchDictDO != null) {

src/main/java/com/zhongzhi/controller/MessageController.java

@@ -43,7 +43,7 @@ public class MessageController {
     private MessageService messageService;
 
     @PostMapping(value = "/getMessage")
-    @ApiOperation("查询通知")
+    @ApiOperation("####查询通知")
     public ResponseVO getMessage() {
         List<MessageVO> messages = new ArrayList();
 
@@ -68,14 +68,14 @@ public class MessageController {
 
     @PostMapping(value = "/getMessagePage")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端  ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数")
+    @ApiOperation("####中心端  ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数")
     public ResponseVO getMessagePage(@RequestBody MessagePageDTO messagePageDTO) {
         return ResponseData.generateCreatedResponse(0, messageService.getMessagePage(messagePageDTO));
     }
 
     @PostMapping(value = "/createMessage")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端  ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型")
+    @ApiOperation("####中心端  ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型")
     public ResponseVO createMessage(@RequestBody MessageDO messageDO) {
         messageService.createMessage(messageDO);
         return ResponseData.generateCreatedResponse(0);
@@ -83,7 +83,7 @@ public class MessageController {
 
     @PostMapping(value = "/updateMessage")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端  ---编辑通知: id/ID, title/标题, content/内容, attachmentUrl/附件地址, attachmentName/附件名称, attachmentType/附件类型")
+    @ApiOperation("####中心端  ---编辑通知: id/ID, title/标题, content/内容, attachmentUrl/附件地址, attachmentName/附件名称, attachmentType/附件类型")
     public ResponseVO updateMessage(@RequestBody MessageDO messageDO) {
         messageService.updateById(messageDO);
         return ResponseData.generateCreatedResponse(0);
@@ -91,7 +91,7 @@ public class MessageController {
 
     @PostMapping(value = "/delete")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端  ---删除通知: id/ID, ")
+    @ApiOperation("####中心端  ---删除通知: id/ID, ")
     public ResponseVO delete(@RequestBody MessageDO messageDO) {
         messageService.removeById(messageDO.getId());
         return ResponseData.generateCreatedResponse(0);

src/main/java/com/zhongzhi/controller/ProjectController.java

@@ -37,17 +37,17 @@ public class ProjectController {
 
     @PostMapping(value = "/getProjectDetail")
     @LoginRequired({Platform.student})
-    @ApiOperation("学生端（高职赛道、种子赛道通用） ---项目详情: id/项目ID")
+    @ApiOperation("####学生端（高职赛道、种子赛道通用） ---项目详情: id/项目ID")
     public ResponseVO getProjectDetail(@RequestBody ProjectDO projectDO) {
         return ResponseData.generateCreatedResponse(0, projectService.getProjectById(projectDO.getId()));
     }
 
-    @PostMapping(value = "/getMainTrackProject")
-    @LoginRequired(Platform.student)
-    @ApiOperation("学生端 ---主赛道项目分页查询: matchId/赛事年份ID, pageNo/当前页数, pageSize/每页显示条数")
-    public ResponseVO getMainTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
-        return ResponseData.generateCreatedResponse(0, projectService.getMainTrackProject(projectListPageDTO));
-    }
+//    @PostMapping(value = "/getMainTrackProject")
+//    @LoginRequired(Platform.student)
+//    @ApiOperation("学生端 ---主赛道项目分页查询: matchId/赛事年份ID, pageNo/当前页数, pageSize/每页显示条数")
+//    public ResponseVO getMainTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
+//        return ResponseData.generateCreatedResponse(0, projectService.getMainTrackProject(projectListPageDTO));
+//    }
 
     @PostMapping(value = "/getMainTrackProjectById")
     @LoginRequired(Platform.student)
@@ -105,12 +105,12 @@ public class ProjectController {
         return ResponseData.generateCreatedResponse(0);
     }
 
-    @PostMapping(value = "/getSeedTrackProject")
-    @LoginRequired(Platform.student)
-    @ApiOperation("学生端 ---种子赛道项目分页查询: matchId/年份ID, pageNo/当前页数, pageSize/每页显示条数")
-    public ResponseVO getSeedTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
-        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProject(projectListPageDTO));
-    }
+//    @PostMapping(value = "/getSeedTrackProject")
+//    @LoginRequired(Platform.student)
+//    @ApiOperation("学生端 ---种子赛道项目分页查询: matchId/年份ID, pageNo/当前页数, pageSize/每页显示条数")
+//    public ResponseVO getSeedTrackProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
+//        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProject(projectListPageDTO));
+//    }
 
     @PostMapping(value = "/createSeedTrackProject")
     @LoginRequired(Platform.student)
@@ -157,12 +157,12 @@ public class ProjectController {
         return ResponseData.generateCreatedResponse(0);
     }
 
-    @PostMapping(value = "/getTechnologyProjectMember")
-    @LoginRequired(Platform.student)
-    @ApiOperation("学生端 ---查询科技创新项目团队信息")
-    public ResponseVO getTechnologyProjectMember() {
-        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.TECHNOLOGY_INNOVATION_GROUP));
-    }
+//    @PostMapping(value = "/getTechnologyProjectMember")
+//    @LoginRequired(Platform.student)
+//    @ApiOperation("学生端 ---查询科技创新项目团队信息")
+//    public ResponseVO getTechnologyProjectMember() {
+//        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.TECHNOLOGY_INNOVATION_GROUP));
+//    }
 
     @PostMapping(value = "/uploadCulturalProjectAttachment")
     @LoginRequired(Platform.student)
@@ -185,12 +185,12 @@ public class ProjectController {
         return ResponseData.generateCreatedResponse(0);
     }
 
-    @PostMapping(value = "/getCulturalProjectMember")
-    @LoginRequired(Platform.student)
-    @ApiOperation("学生端 ---查询红色文创项目团队信息")
-    public ResponseVO getCulturalProjectMember() {
-        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.CULTURAL_CREATIVE_GROUP));
-    }
+//    @PostMapping(value = "/getCulturalProjectMember")
+//    @LoginRequired(Platform.student)
+//    @ApiOperation("学生端 ---查询红色文创项目团队信息")
+//    public ResponseVO getCulturalProjectMember() {
+//        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.CULTURAL_CREATIVE_GROUP));
+//    }
 
     @PostMapping(value = "/getMainTrackProjectPage")
     @LoginRequired(Platform.school)
@@ -215,21 +215,21 @@ public class ProjectController {
         return ResponseData.generateCreatedResponse(0);
     }
 
-    @PostMapping(value = "/getSeedTrackProjectList")
-    @LoginRequired(Platform.school)
-    @ApiOperation("院校端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
-            "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
-    public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
-        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
-    }
+//    @PostMapping(value = "/getSeedTrackProjectList")
+//    @LoginRequired(Platform.school)
+//    @ApiOperation("院校端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
+//            "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
+//    public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
+//        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
+//    }
 
-    @PostMapping(value = "/getSeedTrackProjectPage")
-    @LoginRequired(Platform.center)
-    @ApiOperation("中心端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
-            "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数  projectProgress")
-    public ResponseVO getSeedTrackProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
-        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectPage(projectListPageDTO));
-    }
+//    @PostMapping(value = "/getSeedTrackProjectPage")
+//    @LoginRequired(Platform.center)
+//    @ApiOperation("中心端 --- 分页查询种子赛道全部项目：matchId/赛事ID,projectGroup/项目组别（科技创新、红色文创）、projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
+//            "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数  projectProgress")
+//    public ResponseVO getSeedTrackProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
+//        return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectPage(projectListPageDTO));
+//    }
 
     @PostMapping(value = "/downloadTechnologyPDF")
     @LoginRequired({Platform.student})
@@ -271,7 +271,7 @@ public class ProjectController {
     @PostMapping(value = "/pass")
     @LoginRequired({Platform.center, Platform.school})
     @ApiOperation("中心端/院校端 --- （校内赛/初赛/复赛/决赛）通过：id/项目ID、" +
-            "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖")
+            "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖  7 未通过")
     public ResponseVO pass(@RequestBody ApproveDTO approveDTO) {
         projectService.pass(approveDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -280,7 +280,7 @@ public class ProjectController {
     @PostMapping(value = "/batchPass")
     @LoginRequired({Platform.center, Platform.school})
     @ApiOperation("中心端/院校端 --- 批量（校内赛/初赛/复赛/决赛）通过：ids/项目ID、" +
-            "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖")
+            "projectStatus/1：市级复赛通过, 2：市级优胜奖,3/6：市级银奖,4：市级铜奖,5：市级金奖  7 未通过")
     public ResponseVO batchPass(@RequestBody ApproveDTO approveDTO) {
         projectService.batchPass(approveDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -331,14 +331,14 @@ public class ProjectController {
 
     @PostMapping(value = "/exportProjectList")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 批量导出种子赛道项目：matchId/赛事ID")
+    @ApiOperation("####中心端 --- 批量导出种子赛道项目：matchId/赛事ID")
     public void exportProjectList(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
         projectService.exportProjectList(projectCollegeListDTO);
     }
 
     @PostMapping(value = "/exportProjectAll")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 导出全部种子赛道项目：matchId/赛事ID, projectSchedule/项目进度,projectGroup/项目组别")
+    @ApiOperation("####中心端 --- 导出全部种子赛道项目：matchId/赛事ID, projectSchedule/项目进度,projectGroup/项目组别")
     public void exportProjectAll(@RequestBody ProjectCollegeListDTO projectCollegeListDTO) {
         projectService.exportProjectAll(projectCollegeListDTO);
     }
@@ -359,8 +359,8 @@ public class ProjectController {
     }
 
     @PostMapping(value = "/exportProject")
-//    @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 评审项目导出：matchId/赛事ID")
+    @LoginRequired({Platform.center})
+    @ApiOperation("####中心端 --- 评审项目导出：matchId/赛事ID")
     public ResponseVO exportProject(@RequestBody ReviewListDTO reviewListDTO) {
         projectService.exportProjectReview(reviewListDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -376,7 +376,7 @@ public class ProjectController {
 
     @PostMapping(value = "/exportProjectById")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 评审项目根据ID导出：id/ID")
+    @ApiOperation("####中心端 --- 评审项目根据ID导出：id/ID")
     public ResponseVO exportProjectById(@RequestBody ReviewListDTO reviewListDTO) {
         projectService.exportProjectById(reviewListDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -423,7 +423,7 @@ public class ProjectController {
 
     @PostMapping(value = "getDataOverview")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 数据概览")
+    @ApiOperation("####中心端 --- 数据概览  matchId")
     public ResponseVO getDataOverview(@RequestBody DataOverviewDTO dataOverviewDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalDataOverview(dataOverviewDTO));
     }
@@ -468,18 +468,11 @@ public class ProjectController {
     /* -- 职教接口（学生端） -- */
     @PostMapping(value = "createVocationalProject")
     @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")
+    @ApiOperation("####学生端--创建项目：项目名称/projectName、项目概述/projectIntro、参赛赛道/projectTrack、单元赛道/unitTrack、组别/projectGroup" +
+    "公司名称/companyName、注册资金/registerFund、注册时间/registerDate、注册地址/registerAddress、营业执照/businessLicense" +
+            "项目计划书 projectAttachment  projectAttachmentName  projectAttachmentType" +
+            "答辩PPT  projectPptUrl  projectPptType   projectPptName"+
+            "身份证明书/identityCertificate  承诺书 commitmentLetter   participationCertificate 参赛证明书")
     public ResponseVO createVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
         projectService.createVocationalProject(createVocationalProjectDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -487,17 +480,7 @@ public class ProjectController {
 
     @PostMapping(value = "updateVocationalProject")
     @LoginRequired({ Platform.student })
-    @ApiOperation("学生端(职教)--修改职教项目：id/项目ID、项目logo/logoUri、所属领域/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}]")
+    @ApiOperation("学生端(职教)--修改职教项目：id/项目ID、  createVocationalProject的字段， projectSchedule 项目阶段  ")
     public ResponseVO updateVocationalProject(@RequestBody CreateVocationalProjectDTO createVocationalProjectDTO) {
         projectService.updateVocationalProject(createVocationalProjectDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -505,31 +488,39 @@ public class ProjectController {
 
     @PostMapping(value = "getVocationalProject")
     @LoginRequired(Platform.student)
-    @ApiOperation("学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
+    @ApiOperation("####学生端 ---职教赛道项目分页查询: matchId/赛事届数ID ,pageNo/当前页数, pageSize/每页显示条数")
     public ResponseVO getVocationalProject(@RequestBody ProjectListPageDTO projectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProject(projectListPageDTO));
     }
 
     @PostMapping(value = "getVocationalProjectById")
     @LoginRequired(Platform.student)
-    @ApiOperation("学生端(职教)--根据ID查询高职赛道项目信息")
+    @ApiOperation("####学生端(职教)--根据ID查询高职赛道项目信息")
     public ResponseVO getVocationalProjectById() {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectById());
     }
 
     @PostMapping(value = "createVocationalMember")
     @LoginRequired(Platform.student)
-    @ApiOperation("学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱  fiveYears" +
-            "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号  teamTelephone 手机号 }]" +
+    @ApiOperation("####学生端(职教) ---保存职教赛道团队信息：name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱 " +
+            "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号}]" +
                 "mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号  idCard}]")
     public ResponseVO createVocationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
         projectService.createVocationalMember(createProjectMemberDTO);
         return ResponseData.generateCreatedResponse(0);
     }
 
+    @PostMapping("confirm")
+    @LoginRequired(Platform.student)
+    @ApiOperation("id 项目id")
+    public ResponseVO confirm(@RequestBody ProjectDO projectDO){
+        projectService.confirm(projectDO);
+        return ResponseData.generateCreatedResponse(0);
+    }
+
     @PostMapping(value = "updateVocationalMember")
     @LoginRequired(Platform.student)
-    @ApiOperation("学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
+    @ApiOperation("####学生端(职教) ---保存职教赛道团队信息：id/项目ID、name/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号、email/邮箱" +
             "teamMember/团队成员：[{ teamName/姓名、school/就读学校、grade/年级、major/就读专业、sex/性别、studentNo/学籍号 }]" +
             "mentor/指导老师：[{ teacherName/姓名、 company/工作单位、positionTitle/职称、position/职务、telephone/手机号}]")
     public ResponseVO updateVocationalMember(@RequestBody CreateProjectMemberDTO createProjectMemberDTO) {
@@ -539,15 +530,15 @@ public class ProjectController {
 
     @PostMapping(value = "getVocationalProjectMember")
     @LoginRequired(Platform.student)
-    @ApiOperation("学生端(职教) ---查询职教项目团队信息")
+    @ApiOperation("####学生端(职教) ---查询职教项目团队信息")
     public ResponseVO getVocationalProjectMember() {
-        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember(ProjectType.VOCATIONAL));
+        return ResponseData.generateCreatedResponse(0, projectService.getProjectMember());
     }
 
     /* -- 管理端 -- */
     @PostMapping(value = "/getVocationalProjectPage")
     @LoginRequired(Platform.center)
-    @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
+    @ApiOperation("####中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别、赛道  projectTrack、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
             "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
     public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectPage(projectListPageDTO));
@@ -579,7 +570,7 @@ public class ProjectController {
 
     @PostMapping(value = "/getVocationalReviewList")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
+    @ApiOperation("####中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
             "pageNo/当前页数、pageSize/每页显示条数")
     public ResponseVO getVocationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
@@ -587,7 +578,7 @@ public class ProjectController {
 
     @PostMapping(value = "/getVocationalProjectDetail")
     @LoginRequired({Platform.center, Platform.school, Platform.review})
-    @ApiOperation("中心端/院校端 --- 职教赛道项目详情：id/项目ID")
+    @ApiOperation("####中心端/院校端 --- 职教赛道项目详情：id/项目ID")
     public ResponseVO getVocationalProjectDetail(@RequestBody ProjectDO projectDO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectDetail(projectDO.getId()));
     }
@@ -618,14 +609,14 @@ public class ProjectController {
 
     @PostMapping(value = "getVocationalProjectNum")
     @LoginRequired({Platform.center, Platform.school, Platform.review})
-    @ApiOperation("中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
+    @ApiOperation("####中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
     public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
     }
 
     @PostMapping(value = "/getVocationalReviewNum")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
+    @ApiOperation("####中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
     public ResponseVO getVocationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewNum(reviewListDTO));
     }
@@ -637,12 +628,12 @@ public class ProjectController {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalAssignNum(reviewListDTO));
     }
 
-    @PostMapping(value = "importVocationalProject")
-    @ApiOperation("中心端/院校端 --- 导出高职项目赛事： projectGroup/项目组别")
-    @LoginRequired({ Platform.center, Platform.school })
-    public void importVocationalProject(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
-        projectService.importVocationalProject(importVocationalProjectDTO);
-    }
+//    @PostMapping(value = "importVocationalProject")
+//    @ApiOperation("中心端/院校端 --- 导出高职项目赛事： projectGroup/项目组别")
+//    @LoginRequired({ Platform.center, Platform.school })
+//    public void importVocationalProject(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
+//        projectService.importVocationalProject(importVocationalProjectDTO);
+//    }
 
     @PostMapping(value = "importProjectByGroup")
     @ApiOperation("中心端/院校端 ---excel 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别")

src/main/java/com/zhongzhi/controller/ProjectJudgeController.java

@@ -41,14 +41,14 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/getProjectJudgePage")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数")
+    @ApiOperation("####中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数")
     public ResponseVO getProjectJudgePage(@RequestBody ProjectJudgePageDTO projectJudgePageDTO) {
         return ResponseData.generateCreatedResponse(0, projectJudgeService.getProjectJudgePage(projectJudgePageDTO));
     }
 
     @PostMapping(value = "/createProjectJudge")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---添加评委：username/姓名、telephone/手机号、 position/职位、unit/单位")
+    @ApiOperation("####中心端 ---添加评委：username/姓名、telephone/手机号、 position/职位、unit/单位")
     public ResponseVO createProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
         projectJudgeService.createProjectJudge(projectJudgeDO);
         return ResponseData.generateCreatedResponse(0);
@@ -56,7 +56,7 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/updateProjectJudge")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---编辑评委：id/ID、username/姓名、telephone/手机号、 position/职位、unit/单位, status/状态（1：启用，0：禁用）")
+    @ApiOperation("####中心端 ---编辑评委：id/ID、username/姓名、telephone/手机号、 position/职位、unit/单位, status/状态（1：启用，0：禁用）")
     public ResponseVO updateProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
         projectJudgeService.updateProjectJudge(projectJudgeDO);
         return ResponseData.generateCreatedResponse(0);
@@ -64,7 +64,7 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/delete")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---删除评委：id/ID")
+    @ApiOperation("####中心端 ---删除评委：id/ID")
     public ResponseVO delete(@RequestBody ProjectJudgeDO projectJudgeDO) {
         projectJudgeService.removeById(projectJudgeDO.getId());
         return ResponseData.generateCreatedResponse(0);
@@ -79,7 +79,7 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/downloadJudgeTemplate")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---下载导入评委模板")
+    @ApiOperation("####中心端 ---下载导入评委模板")
     public ResponseVO downloadJudgeTemplate() {
         projectJudgeService.downloadTemplate();
         return ResponseData.generateCreatedResponse(0);
@@ -87,7 +87,7 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/importJudge")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---导入评委：file/文件（数据格式：Form-Data）")
+    @ApiOperation("####中心端 ---导入评委：file/文件（数据格式：Form-Data）")
     public ResponseVO importJudge(MultipartFile file) {
         projectJudgeService.importJudge(file);
         return ResponseData.generateCreatedResponse(0);
@@ -95,7 +95,7 @@ public class ProjectJudgeController {
 
     @PostMapping(value = "/exportProjectJudge")
     @LoginRequired({Platform.center})
-    @ApiOperation("中心端 ---导出评委")
+    @ApiOperation("####中心端 ---导出评委")
     public void exportProjectJudge() {
         projectJudgeService.exportProjectJudge();
     }

src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java

@@ -33,7 +33,7 @@ public class ProjectReviewPeriodController {
 
     @PostMapping(value = "/getProjectReviewPeriod")
     @LoginRequired({Platform.center, Platform.school, Platform.review})
-    @ApiOperation("中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
+    @ApiOperation("####中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
     public ResponseVO getProjectReviewPeriod(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) {
         return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO));
     }

src/main/java/com/zhongzhi/controller/SmsCodeController.java

@@ -32,14 +32,14 @@ public class SmsCodeController {
     private SmsCodeService smsCodeService;
 
     @PostMapping(value = "/sendRegisterCode")
-    @ApiOperation("学生端 ---注册验证码：telephone/手机号")
+    @ApiOperation("####学生端 ---注册验证码：telephone/手机号")
     public ResponseVO sendRegisterCode(@RequestBody SmsCodeDO smsCodeDO) {
         smsCodeService.sendRegisterCode(smsCodeDO);
         return ResponseData.generateCreatedResponse(0);
     }
 
     @PostMapping(value = "/sendStudentLoginCode")
-    @ApiOperation("学生端 ---登陆验证码：telephone/手机号")
+    @ApiOperation("####学生端 ---登陆验证码：telephone/手机号")
     public ResponseVO sendStudentLoginCode(@RequestBody SmsCodeDO smsCodeDO) {
         smsCodeService.sendStudentLoginCode(smsCodeDO);
         return ResponseData.generateCreatedResponse(0);

src/main/java/com/zhongzhi/controller/SmsNoticeController.java

@@ -35,7 +35,7 @@ public class SmsNoticeController {
 
     @PostMapping(value = "batchSend")
     @LoginRequired({Platform.center})
-    @ApiOperation("管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称")
+    @ApiOperation("####管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称")
     public ResponseVO batchSend(@RequestBody SmsNoticeDTO smsNoticeDTO) {
         smsNoticeService.batchSend(smsNoticeDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -43,7 +43,7 @@ public class SmsNoticeController {
 
     @PostMapping(value = "send")
     @LoginRequired({Platform.center})
-    @ApiOperation("管理端 -- 发送短信：ids/项目ID（数组）")
+    @ApiOperation("####管理端 -- 发送短信：ids/项目ID（数组）")
     public ResponseVO send(@RequestBody SmsNoticeDTO smsNoticeDTO) {
         smsNoticeService.send(smsNoticeDTO);
         return ResponseData.generateCreatedResponse(0);
@@ -51,7 +51,7 @@ public class SmsNoticeController {
 
     @PostMapping(value = "getListByPage")
     @LoginRequired({Platform.center})
-    @ApiOperation("管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize")
+    @ApiOperation("####管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize")
     public ResponseVO getListByPage(@RequestBody SmsNoticePageDTO smsNoticePageDTO) {
         return ResponseData.generateCreatedResponse(0, smsNoticeService.getListByPage(smsNoticePageDTO));
     }

src/main/java/com/zhongzhi/controller/StudentController.java

@@ -33,14 +33,14 @@ public class StudentController {
     private StudentService studentService;
 
     @PostMapping(value = "/register")
-    @ApiOperation("注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " +
+    @ApiOperation("####注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " +
             "education/学历层次, school/就读院校, major/就读专业, enrollmentDate/入学年份, graduateDate/毕业年份")
     public ResponseVO register(@RequestBody RegisterDTO registerDTO) {
         return ResponseData.generateCreatedResponse(0, studentService.register(registerDTO));
     }
 
     @PostMapping(value = "/login")
-    @ApiOperation("登陆：telephone/手机号, code/验证码")
+    @ApiOperation("####登陆：telephone/手机号, code/验证码")
     public ResponseVO login(@RequestBody LoginDTO loginDTO) {
         return ResponseData.generateCreatedResponse(0, studentService.login(loginDTO));
     }

src/main/java/com/zhongzhi/controller/YearDictController.java

@@ -31,7 +31,7 @@ public class YearDictController {
     private YearDictService yearDictService;
 
     @PostMapping("queryYears")
-    @ApiOperation("查询年份")
+    @ApiOperation("####查询年份")
     public ResponseVO queryYears(){
         return ResponseData.generateCreatedResponse(0,yearDictService.queryYears());
     }

src/main/java/com/zhongzhi/dao/MatchDictDAO.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Repository
 public interface MatchDictDAO extends BaseMapper<MatchDictDO> {
 
-    IPage<MatchDictVO> getSeedTrackMatchPage(Page page, String matchType);
+    IPage<MatchDictVO> getSeedTrackMatchPage(Page page);
 
     List<MatchDictDO> getList(@Param("projectType") String projectType, @Param("projectGroup") String projectGroup);
 }

src/main/java/com/zhongzhi/dao/ProjectDAO.java

@@ -21,13 +21,13 @@ import java.util.List;
 @Repository
 public interface ProjectDAO extends BaseMapper<ProjectDO> {
 
-    IPage<ProjectPageVO> getListPage(Page page, Long matchId, Long proposerId, String projectType);
+    IPage<ProjectPageVO> getListPage(Page page, Long matchId, Long proposerId);
 
     IPage<MainTrackProjectPageVO> getMainTrackProjectPage(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
     String projectSchedule,
     String projectStatus, String itemField, @Param("name") String name);
 
-    IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
+    IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage(Page page, Long matchId, String projectGroup,String projectTrack, @Param("type") String type,
     @Param("school") String school, String projectSchedule,
     String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress);
 
@@ -52,4 +52,6 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> {
     List<ProjectDO> getProjectById(@Param("ids") Long[] ids);
 
     List<ProjectDO> projects(Long matchId,Long collegeId,String college);
+
+    Integer collegeNum();
 }

src/main/java/com/zhongzhi/dto/project/CreateVocationalProjectDTO.java

 package com.zhongzhi.dto.project;
 
-import com.zhongzhi.model.ProjectAwardDO;
-import com.zhongzhi.model.ProjectCopyrightDO;
-import com.zhongzhi.model.ProjectOwnershipStructureDO;
-import com.zhongzhi.model.ProjectPaperDO;
-import com.zhongzhi.model.ProjectPatentDO;
-import com.zhongzhi.model.ProjectTrademarkDO;
-import com.zhongzhi.model.ProjectWorksDO;
+import com.zhongzhi.model.*;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class CreateVocationalProjectDTO {
+public class CreateVocationalProjectDTO extends ProjectDO {
 
     private Long id;
 
     /**
-     * 所属领域
-     */
-    private String itemField;
-
-    /**
-     * 项目LOGO
-     */
-    private String logoUri;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-    /**
-     * 项目概述
-     */
-    private String projectIntro;
-
-    /**
-     * 国家级重大、重点科研项目的科研成果转化项目
-     */
-    private String projectTransform;
-
-    /**
-     * 学校科技成果转化
-     */
-    private String resultTransfer;
-
-    /**
-     * 参赛申报人为科技成果的完成人或所有人
-     */
-    private String competitionOwner;
-
-    /**
-     * 参赛申报人为科技成果的第一完成人或所有人
-     */
-    private String competitionFirst;
-
-    /**
-     * 师生共创
-     */
-    private String bothInvention;
-
-    /**
-     * 项目进展
-     */
-    private String projectProgress;
-
-    /**
-     * 隐私设置
-     */
-    private String privacySetting;
-
-    /**
-     * 类型
-     */
-    private String materialsType;
-
-    /**
-     * 大小
-     */
-    private String materialsSize;
-
-    /**
-     * 名称
-     */
-    private String materialsName;
-
-    /**
-     * 地址
-     */
-    private String materialsUrl;
-
-    /**
-     * 项目PPT地址
-     */
-    private String projectPptUrl;
-
-    /**
-     * 项目PPT类型
-     */
-    private String projectPptType;
-
-    /**
-     * 项目PPT名称
-     */
-    private String projectPptName;
-
-    private String projectStage;
-
-    // 公司信息
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 法人姓名
-     */
-    private String legalPersonName;
-
-    /**
-     * 职务
-     */
-    private String position;
-
-    /**
-     * 注册资金
-     */
-    private String registerFund;
-
-    /**
-     * 注册时间
-     */
-    private String registerDate;
-
-    /**
-     * 注册省份
-     */
-    private String registerProvince;
-
-    /**
-     * 注册地址
-     */
-    private String registerAddress;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String unifyCode;
-
-    /**
-     * 财务报表
-     */
-    private String financialStatement;
-
-    /**
-     * 项目是否获得投资
-     */
-    private String investment;
-
-    private String vodUrl;
-
-    /**
      * 股权结构
      */
     private List<ProjectOwnershipStructureDO> ownership;

src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java

@@ -8,4 +8,6 @@ public class DataOverviewDTO {
     private String projectGroup;
 
     private String projectType;
+
+    private Long matchId;
 }

src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java

@@ -11,6 +11,8 @@ public class ProjectListPageDTO {
 
     private String projectGroup;
 
+    private String projectTrack;
+
     private String itemField;
 
     private String name;

src/main/java/com/zhongzhi/model/ProjectDO.java

@@ -34,19 +34,24 @@ public class ProjectDO extends BaseModel {
     private Long proposerId;
 
     /**
-     * 所属领域
+     * 项目名称
      */
-    private String itemField;
+    private String projectName;
 
     /**
-     * 项目LOGO
+     * 项目概述
      */
-    private String logoUri;
+    private String projectIntro;
 
     /**
-     * 项目名称
+     * 参赛赛道
      */
-    private String projectName;
+    private String projectTrack;
+
+    /**
+     * 单元赛道
+     */
+    private String unitTrack;
 
     /**
      * 组别
@@ -59,74 +64,62 @@ public class ProjectDO extends BaseModel {
     private Long matchId;
 
     /**
-     * 申报项目时所在院校
+     * 公司名称
      */
-    private String college;
+    private String companyName;
 
     /**
-     * 类别
+     * 注册时间
      */
-    private String classification;
+    private String registerDate;
 
     /**
-     * 所在地址
+     * 注册地址
      */
-    private String address;
+    private String registerAddress;
 
     /**
-     * 项目概述
+     * 注册资金
      */
-    private String projectIntro;
+    private String registerFund;
 
     /**
-     * 设计背景
+     * 营业执照
      */
-    private String projectCreativity;
+    private String businessLicense;
 
-    /**
-     * 科学设计
-     */
-    private String scientificPrinciple;
+    private String projectAttachment;
 
-    /**
-     * 应用前景
-     */
-    private String applicationProspect;
+    private String projectAttachmentName;
 
-    /**
-     * 路演形式
-     */
-    private String roadShowForm;
+    private String projectAttachmentType;
 
     /**
-     * 创意实施或实验所受条件的限制
+     * 项目PPT
      */
-    private String restriction;
+    private String projectPptUrl;
 
     /**
-     * 国家级重大、重点科研项目的科研成果转化项目
+     * 项目PPT类型
      */
-    private String projectTransform;
+    private String projectPptType;
 
     /**
-     * 学校科技成果转化
+     * 项目PPT名称
      */
-    private String resultTransfer;
+    private String projectPptName;
 
-    /**
-     * 参赛申报人为科技成果的完成人或所有人
-     */
-    private String competitionOwner;
+    private String identityCertificate;
 
     /**
-     * 参赛申报人为科技成果的第一完成人或所有人
+     * 承诺书
      */
-    private String competitionFirst;
+    private String commitmentLetter;
 
     /**
-     * 师生共创
+     * 参赛证明书
      */
-    private String bothInvention;
+    private String participationCertificate;
 
     /**
      * 项目进展
@@ -139,61 +132,6 @@ public class ProjectDO extends BaseModel {
     private String projectStage;
 
     /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 法人身份
-     */
-    private String legalPersonStatus;
-
-    /**
-     * 法人姓名
-     */
-    private String legalPersonName;
-
-    /**
-     * 职务
-     */
-    private String position;
-
-    /**
-     * 注册资金
-     */
-    private String registerFund;
-
-    /**
-     * 注册时间
-     */
-    private String registerDate;
-
-    /**
-     * 注册省份
-     */
-    private String registerProvince;
-
-    /**
-     * 注册地址
-     */
-    private String registerAddress;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String unifyCode;
-
-    /**
-     * 财务报表
-     */
-    private String financialStatement;
-
-    /**
-     * 隐私设置
-     */
-    private String privacySetting;
-
-    /**
      * 项目状态
      */
     private String projectStatus;
@@ -209,41 +147,6 @@ public class ProjectDO extends BaseModel {
     private String projectType;
 
     /**
-     * 上传加盖公章的附件
-     */
-    private String printAttachment;
-
-    /**
-     * 上传加盖公章的附件类型
-     */
-    private String printAttachmentType;
-
-    /**
-     * 上传加盖公章的附件名称
-     */
-    private String printAttachmentName;
-
-    /**
-     * 项目是否获得投资
-     */
-    private String investment;
-
-    /**
-     * 项目PPT
-     */
-    private String projectPptUrl;
-
-    /**
-     * 项目PPT类型
-     */
-    private String projectPptType;
-
-    /**
-     * 项目PPT名称
-     */
-    private String projectPptName;
-
-    /**
      * 评审状态
      */
     private String projectReview;
@@ -255,8 +158,5 @@ public class ProjectDO extends BaseModel {
 
     private Integer editStatus;
 
-    private String vodUrl;
-
-    private Integer orderNo;
 
 }

src/main/java/com/zhongzhi/service/ProjectService.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 public interface ProjectService extends IService<ProjectDO> {
 
-    IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO);
+//    IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO);
 
     void createMainTrackProject(CreateMainTrackProjectDTO createMainTrackProjectDTO);
 
@@ -33,7 +33,7 @@ public interface ProjectService extends IService<ProjectDO> {
 
     void withdrawn(ProjectDO projectDO);
 
-    IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO);
+//    IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO);
 
     void createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
 
@@ -49,9 +49,9 @@ public interface ProjectService extends IService<ProjectDO> {
 
     MainTrackProjectDetailVO getMainTrackProjectDetail(Long id);
 
-    IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO);
+//    IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO);
 
-    IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO);
+//    IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO);
 
     void downloadPDF(String projectGroup);
 
@@ -85,7 +85,7 @@ public interface ProjectService extends IService<ProjectDO> {
 
     void submitted(ProjectReviewScoreDTO projectReviewScoreDTO);
 
-    ProjectMemberVO getProjectMember(String projectGroup);
+    ProjectMemberVO getProjectMember();
 
     ProjectDataOverview getCollegeDataOverview(DataOverviewDTO dataOverviewDTO);
 
@@ -125,6 +125,8 @@ public interface ProjectService extends IService<ProjectDO> {
 
     void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
 
+    void confirm(ProjectDO projectDO);
+
     void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
 
     ProjectDataOverview getVocationalDataOverview(DataOverviewDTO dataOverviewDTO);
@@ -141,7 +143,7 @@ public interface ProjectService extends IService<ProjectDO> {
 
     IPage getVocationalProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO);
 
-    void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO);
+//    void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO);
 
     VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
 

src/main/java/com/zhongzhi/service/impl/MatchDictServiceImpl.java

@@ -107,7 +107,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     @Override
     public IPage<MatchDictVO> getSeedTrackMatchPage(SelectListPageDTO selectListPageDTO) {
         Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize());
-        IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page, ProjectType.SEED_TRACK);
+        IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page);
         for (MatchDictVO record : iPage.getRecords()) {
             List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>()
                     .lambda()
@@ -145,8 +145,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     public MatchDictDO getVocationalMatch() {
         return this.baseMapper.selectOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                .eq(MatchDictDO::getStatus, 1)
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL));
+                .eq(MatchDictDO::getStatus, 1));
     }
 
     public void updateMatchDate(MatchDictDO matchDictDO) {
@@ -165,7 +164,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     @Override
     public IPage getVocationalPage(SelectListPageDTO selectListPageDTO) {
         Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize());
-        IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page, ProjectType.VOCATIONAL);
+        IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page);
         for (MatchDictVO record : iPage.getRecords()) {
             List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>()
                     .lambda()

src/main/java/com/zhongzhi/service/impl/ProjectServiceImpl.java

@@ -97,24 +97,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Autowired
     private CollegesDictDAO collegesDictDAO;
 
-    @Override
-    public IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO) {
-        StudentDO studentDO = (StudentDO) Localstorage.getUser();
-        if (studentDO == null) {
-            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
-        }
-
-        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
-        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(page, projectListPageDTO.getMatchId(), studentDO.getId(), ProjectType.MAIN_TRACK);
-        for (ProjectPageVO record : iPage.getRecords()) {
-            if (record.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
-                record.setStatus(0);
-            } else {
-                record.setStatus(1);
-            }
-        }
-        return iPage;
-    }
+//    @Override
+//    public IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO) {
+//        StudentDO studentDO = (StudentDO) Localstorage.getUser();
+//        if (studentDO == null) {
+//            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
+//        }
+//
+//        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
+//        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(page, projectListPageDTO.getMatchId(), studentDO.getId(), ProjectType.MAIN_TRACK);
+//        for (ProjectPageVO record : iPage.getRecords()) {
+//            if (record.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
+//                record.setStatus(0);
+//            } else {
+//                record.setStatus(1);
+//            }
+//        }
+//        return iPage;
+//    }
 
     @Override
     public IPage getVocationalProject(ProjectListPageDTO projectListPageDTO) {
@@ -124,7 +124,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         }
 
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
-        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(page, projectListPageDTO.getMatchId(), studentDO.getId(), ProjectType.VOCATIONAL);
+        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(page, projectListPageDTO.getMatchId(), studentDO.getId());
         for (ProjectPageVO record : iPage.getRecords()) {
             MatchDictDO matchDictDO = matchDictService.getById(record.getMatchId());
             if (matchDictDO != null) {
@@ -309,61 +309,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     seedTrackProjectDetailVO.setReviewOpinion(projectReviewDO.getReviewOpinion());
                 }
             }
-
-
-            // 股权结构
-            List<ProjectOwnershipStructureDO> ownershipStructureDOList = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
-                    .lambda()
-                    .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setOwnership(ownershipStructureDOList);
-
-            /**
-             * 专利
-             */
-            List<ProjectPatentDO> patentDOList = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
-                    .lambda()
-                    .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setPatent(patentDOList);
-
-            /**
-             * 论文
-             */
-            List<ProjectPaperDO> paperDOList = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
-                    .lambda()
-                    .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setPaper(paperDOList);
-
-            /**
-             * 奖项
-             */
-            List<ProjectAwardDO> awardDOList = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
-                    .lambda()
-                    .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setAward(awardDOList);
-
-            /**
-             * 软件著作权
-             */
-            List<ProjectCopyrightDO> copyrightDOList = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
-                    .lambda()
-                    .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setCopyright(copyrightDOList);
-
-            /**
-             * 作品著作
-             */
-            List<ProjectWorksDO> worksDOList = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
-                    .lambda()
-                    .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setWorks(worksDOList);
-
-            /**
-             * 商标
-             */
-            List<ProjectTrademarkDO> trademarkDOList = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
-                    .lambda()
-                    .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setTrademark(trademarkDOList);
         }
         return seedTrackProjectDetailVO;
     }
@@ -375,8 +320,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         if (projectListPageDTO.getMatchId() == null) {
             MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                     .lambda()
-                    .eq(MatchDictDO::getStatus, 1)
-                    .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL));
+                    .eq(MatchDictDO::getStatus, 1));
             if (matchDictDO != null) {
                 matchId = matchDictDO.getId();
             }
@@ -384,7 +328,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             matchId = projectListPageDTO.getMatchId();
         }
 
-        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, matchId, projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.VOCATIONAL, null,
+        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, matchId, projectListPageDTO.getProjectGroup(), projectListPageDTO.getProjectTrack(), MemberType.PRINCIPAL, null,
                 projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
@@ -403,7 +347,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         }
 
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
-        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.VOCATIONAL, collegesDictDO.getName(),
+        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), null, MemberType.PRINCIPAL, collegesDictDO.getName(),
                 projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
@@ -472,47 +416,47 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         return null;
     }
 
-    @Override
-    public void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO) {
-        List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
-                .lambda()
-                .eq(ProjectDO::getProjectType, ProjectType.VOCATIONAL));
-        List<Map> data = new ArrayList<>();
-        if (list.size() > 0) {
-            for (ProjectDO projectDO : list) {
-                VocationalProjectVO vocationalProjectVO = new VocationalProjectVO();
-                vocationalProjectVO.setId(projectDO.getId());
-                vocationalProjectVO.setProjectName(projectDO.getProjectName());
-                vocationalProjectVO.setProjectProgress(projectDO.getProjectProgress());
-
-                List<ProjectMemberDO> memberDOList = projectMemberService.list(new QueryWrapper<ProjectMemberDO>()
-                        .lambda()
-                        .eq(ProjectMemberDO::getProjectId, projectDO.getId()));
-                String teamMember = "";
-                String mentor = "";
-                for (ProjectMemberDO projectMemberDO : memberDOList) {
-                    if (projectMemberDO.getType().equals(MemberType.PRINCIPAL)) {
-                        vocationalProjectVO.setName(projectMemberDO.getName());
-                        if (projectMemberDO.getTelephone() == null) {
-                            StudentDO studentDO = studentService.getById(projectDO.getProposerId());
-                            vocationalProjectVO.setTelephone(studentDO.getTelephone());
-                        } else {
-                            vocationalProjectVO.setTelephone(projectMemberDO.getTelephone());
-                        }
-                    } else if (projectMemberDO.getType().equals(MemberType.TEAM_MEMBER)) {
-                        teamMember += projectMemberDO.getName() + "、";
-                    } else if (projectMemberDO.getType().equals(MemberType.MENTOR)) {
-                        mentor += projectMemberDO.getName() + "、";
-                    }
-                }
-                vocationalProjectVO.setTeamMember(teamMember);
-                vocationalProjectVO.setMentor(mentor);
-                data.add(JSON.parseObject(JSON.toJSONString(vocationalProjectVO), Map.class));
-            }
-        }
-        String title = "上海市" + importVocationalProjectDTO.getProjectGroup() + "高专大学生创新创业大赛暨中国国际“互联网+”大学生创新创业大赛上海赛区职教赛道选拔赛参赛作品";
-        ExcelUtil.writeExcel(title, ExcelUtil.getField(VocationalProjectVO.class), data);
-    }
+//    @Override
+//    public void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO) {
+//        List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
+//                .lambda()
+//                .eq(ProjectDO::getProjectType, ProjectType.VOCATIONAL));
+//        List<Map> data = new ArrayList<>();
+//        if (list.size() > 0) {
+//            for (ProjectDO projectDO : list) {
+//                VocationalProjectVO vocationalProjectVO = new VocationalProjectVO();
+//                vocationalProjectVO.setId(projectDO.getId());
+//                vocationalProjectVO.setProjectName(projectDO.getProjectName());
+//                vocationalProjectVO.setProjectProgress(projectDO.getProjectProgress());
+//
+//                List<ProjectMemberDO> memberDOList = projectMemberService.list(new QueryWrapper<ProjectMemberDO>()
+//                        .lambda()
+//                        .eq(ProjectMemberDO::getProjectId, projectDO.getId()));
+//                String teamMember = "";
+//                String mentor = "";
+//                for (ProjectMemberDO projectMemberDO : memberDOList) {
+//                    if (projectMemberDO.getType().equals(MemberType.PRINCIPAL)) {
+//                        vocationalProjectVO.setName(projectMemberDO.getName());
+//                        if (projectMemberDO.getTelephone() == null) {
+//                            StudentDO studentDO = studentService.getById(projectDO.getProposerId());
+//                            vocationalProjectVO.setTelephone(studentDO.getTelephone());
+//                        } else {
+//                            vocationalProjectVO.setTelephone(projectMemberDO.getTelephone());
+//                        }
+//                    } else if (projectMemberDO.getType().equals(MemberType.TEAM_MEMBER)) {
+//                        teamMember += projectMemberDO.getName() + "、";
+//                    } else if (projectMemberDO.getType().equals(MemberType.MENTOR)) {
+//                        mentor += projectMemberDO.getName() + "、";
+//                    }
+//                }
+//                vocationalProjectVO.setTeamMember(teamMember);
+//                vocationalProjectVO.setMentor(mentor);
+//                data.add(JSON.parseObject(JSON.toJSONString(vocationalProjectVO), Map.class));
+//            }
+//        }
+//        String title = "上海市" + importVocationalProjectDTO.getProjectGroup() + "高专大学生创新创业大赛暨中国国际“互联网+”大学生创新创业大赛上海赛区职教赛道选拔赛参赛作品";
+//        ExcelUtil.writeExcel(title, ExcelUtil.getField(VocationalProjectVO.class), data);
+//    }
 
     @Override
     public void importProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO) {
@@ -532,7 +476,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 .lambda()
                 .eq(ProjectDO::getProjectSchedule, projectSchedule)
                 .eq(ProjectDO::getProjectType, importVocationalProjectDTO.getProjectType())
-                .eq(ProjectDO::getCollege, importVocationalProjectDTO.getCollege())
                 .eq(ProjectDO::getMatchId, matchDictDO.getId()));
         List<Map> data = new ArrayList<>();
         if (list.size() > 0) {
@@ -586,7 +529,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 .lambda()
                 .eq(ProjectDO::getProjectSchedule, projectSchedule)
                 .eq(ProjectDO::getProjectType, importVocationalProjectDTO.getProjectType())
-                .eq(ProjectDO::getCollege, importVocationalProjectDTO.getCollege())
                 .eq(ProjectDO::getMatchId, importVocationalProjectDTO.getMatchId()));
 //        List<Map> data = new ArrayList<>();
         List<VocationalProjectVO> result = new ArrayList<>();
@@ -688,7 +630,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
         }
         vocationalNumVO.setRegisterNum(registerNum);
-        vocationalNumVO.setSchoolProjectNum(schoolProjectNum);
+        vocationalNumVO.setPreliminaryProjectNum(schoolProjectNum);
         vocationalNumVO.setRematchNum(rematchProjectNum);
         vocationalNumVO.setFinalNum(finalProjectNum);
         return vocationalNumVO;
@@ -738,7 +680,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
-                projectJudgeVO.setCollege(projectDO.getCollege());
 
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                 if (matchDictDO != null) {
@@ -1014,7 +955,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
             ProjectDO projectDO = new ProjectDO();
             BeanUtils.copyProperties(createMainTrackProjectDTO, projectDO);
-            projectDO.setCollege(studentDO.getCollege());
             projectDO.setProposerId(studentDO.getId());
             projectDO.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
@@ -1273,7 +1213,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
         MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
                 .eq(MatchDictDO::getStatus, 1));
         if (matchDictDO == null) {
             throw new HttpException(10054);
@@ -1282,20 +1221,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectDO project = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
                 .lambda()
                 .eq(ProjectDO::getMatchId, matchDictDO.getId())
-                .eq(ProjectDO::getProposerId, studentDO.getId())
-                .eq(ProjectDO::getProjectType, ProjectType.VOCATIONAL));
+                .eq(ProjectDO::getProposerId, studentDO.getId()));
         if (project == null) {
             throw new HttpException(10046);
         }
 
-        //five? 否 不变   是 学生 grade 123 中职
-        if ("是".equals(createProjectMemberDTO.getFiveYears()) && ("一年级".equals(createProjectMemberDTO.getGrade()) || "二年级".equals(createProjectMemberDTO.getGrade()) || "三年级".equals(createProjectMemberDTO.getGrade()))) {
-            project.setProjectGroup("中职");
-            this.baseMapper.updateById(project);
-        } else {
-            project.setProjectGroup("高职");
-            this.baseMapper.updateById(project);
-        }
+        project.setProjectGroup(createProjectMemberDTO.getProjectGroup());
 
         /**
          * 根据学号和姓名查询本项目下的负责人，如果有的则进行修改没有则新增
@@ -1329,57 +1260,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             for (TeamMemberDTO teamMemberDTO : createProjectMemberDTO.getTeamMember()) {
                 if (list != null) {
                     for (ProjectMemberDO memberDO : list) {
-//                        if (createProjectMemberDTO.getTeamMember().stream().filter(pm -> pm.getStudentNo().equals(memberDO.getStudentNo())).findAny().isPresent()) {
-//                            continue;
-//                        } else {
                         projectMemberService.removeById(memberDO.getId());
-//                        }
-                    }
-
-                    //判断成员的手机号和负责人的手机号是不是一致
-                    StudentDO studentDO1 = studentService.getById(studentDO.getId());
-                    if (teamMemberDTO.getTeamTelephone().equals(studentDO1.getTelephone())) {
-                        throw new HttpException(10068);
                     }
 
-                    /**
-                     * 判断团队成员是不是存在数据库，如果存在进行修改不存在新增
-                     */
-//                    if (list.stream().filter(pm -> pm.getStudentNo().equals(teamMemberDTO.getStudentNo())).findAny().isPresent()) {
-//                        ProjectMemberDO pm = projectMemberService.getOne(new QueryWrapper<ProjectMemberDO>()
-//                                .lambda()
-//                                .eq(ProjectMemberDO::getProjectId, project.getId())
-//                                .eq(ProjectMemberDO::getName, teamMemberDTO.getTeamName())
-//                                .eq(ProjectMemberDO::getStudentNo, teamMemberDTO.getStudentNo())
-//                                .eq(ProjectMemberDO::getType, MemberType.TEAM_MEMBER));
-//                        if (pm != null) {
-//                            ProjectMemberDO teamMember = new ProjectMemberDO();
-//                            BeanUtils.copyProperties(teamMemberDTO, teamMember);
-//                            teamMember.setTelephone(teamMemberDTO.getTeamTelephone());
-//                            teamMember.setName(teamMemberDTO.getTeamName());
-//                            teamMember.setId(pm.getId());
-//                            projectMemberService.updateById(teamMember);
-//                        }
-//                    } else {
                     ProjectMemberDO teamMember = new ProjectMemberDO();
                     BeanUtils.copyProperties(teamMemberDTO, teamMember);
-                    teamMember.setTelephone(teamMemberDTO.getTeamTelephone());
                     teamMember.setName(teamMemberDTO.getTeamName());
                     teamMember.setProjectId(project.getId());
                     teamMember.setType(MemberType.TEAM_MEMBER);
                     teamMember.setIdCard(teamMember.getIdCard());
                     projectMemberService.save(teamMember);
-//                    }
                 }
-//                else {
-//                    ProjectMemberDO teamMember = new ProjectMemberDO();
-//                    BeanUtils.copyProperties(teamMemberDTO, teamMember);
-//                    teamMember.setTelephone(teamMemberDTO.getTeamTelephone());
-//                    teamMember.setName(teamMemberDTO.getTeamName());
-//                    teamMember.setProjectId(project.getId());
-//                    teamMember.setType(MemberType.TEAM_MEMBER);
-//                    projectMemberService.save(teamMember);
-//                }
             }
         }
 
@@ -1399,29 +1290,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             for (MentorDTO mentorDTO : createProjectMemberDTO.getMentor()) {
                 if (list.size() > 0) {
                     for (ProjectMemberDO memberDO : list) {
-//                        if (createProjectMemberDTO.getMentor().stream().filter(pm -> pm.getTelephone().equals(memberDO.getTelephone()) && pm.getTeacherName().equals(memberDO.getName())).findAny().isPresent()) {
-//                            continue;
-//                        } else {
                         projectMemberService.removeById(memberDO.getId());
-//                        }
                     }
                 }
 
-//                if (list.stream().filter(pm -> pm.getTelephone().equals(mentorDTO.getTelephone()) && pm.getName().equals(mentorDTO.getTeacherName())).findAny().isPresent()) {
-//                    ProjectMemberDO pmDO = projectMemberService.getOne(new QueryWrapper<ProjectMemberDO>()
-//                            .lambda()
-//                            .eq(ProjectMemberDO::getProjectId, project.getId())
-//                            .eq(ProjectMemberDO::getName, mentorDTO.getTeacherName())
-//                            .eq(ProjectMemberDO::getTelephone, mentorDTO.getTelephone())
-//                            .eq(ProjectMemberDO::getType, MemberType.MENTOR));
-//                    if (pmDO != null) {
-//                        ProjectMemberDO mentor = new ProjectMemberDO();
-//                        BeanUtils.copyProperties(mentorDTO, mentor);
-//                        mentor.setName(mentorDTO.getTeacherName());
-//                        mentor.setId(pmDO.getId());
-//                        projectMemberService.updateById(mentor);
-//                    }
-//                } else {
                 if (mentorDTO != null && StringUtils.isNotBlank(mentorDTO.getTelephone())) {
                     ProjectMemberDO mentor = new ProjectMemberDO();
                     BeanUtils.copyProperties(mentorDTO, mentor);
@@ -1430,32 +1302,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     mentor.setType(MemberType.MENTOR);
                     projectMemberService.save(mentor);
                 }
-//                }
             }
         }
 
         if (project.getEditStatus() == 0) {
             ProjectDO projectDO = new ProjectDO();
             projectDO.setId(project.getId());
-            projectDO.setProjectStatus(ProjectReview.TO_REVIEWED);
+//            projectDO.setProjectStatus(ProjectReview.TO_REVIEWED);
             this.baseMapper.updateById(projectDO);
-
-            ProjectScheduleRecordDO psr = projectScheduleRecordService.getOne(new QueryWrapper<ProjectScheduleRecordDO>()
-                    .lambda()
-                    .eq(ProjectScheduleRecordDO::getProjectId, projectDO.getId())
-                    .eq(ProjectScheduleRecordDO::getProposerId, studentDO.getId()));
-            ProjectScheduleRecordDO scheduleRecordDO = new ProjectScheduleRecordDO();
-            if (psr == null) {
-                scheduleRecordDO.setProjectId(project.getId());
-                scheduleRecordDO.setProposerId(studentDO.getId());
-                scheduleRecordDO.setMatchId(project.getMatchId());
-                scheduleRecordDO.setCollege(studentDO.getCollege());
-                scheduleRecordDO.setProjectType(project.getProjectType());
-                scheduleRecordDO.setProjectSchedule(project.getProjectSchedule());
-                scheduleRecordDO.setProjectStatus(ProjectReview.TO_REVIEWED);
-                projectScheduleRecordService.save(scheduleRecordDO);
         }
     }
+
+    public void confirm(ProjectDO projectDO) {
+
+        ProjectDO projectDO1 = this.baseMapper.selectById(projectDO.getId());
+        projectDO1.setProjectStatus(ProjectReview.TO_REVIEWED);
+        this.baseMapper.updateById(projectDO1);
     }
 
     @Override
@@ -1464,8 +1326,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         if (studentDO == null) {
             throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
         }
-        createProjectMemberDTO.setProjectType(ProjectType.VOCATIONAL);
-        createProjectMemberDTO.setProjectGroup(studentDO.getEducation());
+        createProjectMemberDTO.setProjectGroup(createProjectMemberDTO.getProjectGroup());
 
         MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
@@ -1604,7 +1465,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Transactional(rollbackFor = Exception.class)
     public void withdrawn(ProjectDO projectDO) {
         StudentDO studentDO = (StudentDO) Localstorage.getUser();
-//        StudentDO studentDO = studentService.getById(7228);
+//        StudentDO studentDO = studentService.getById(7362);
         if (studentDO == null) {
             throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
         }
@@ -1617,17 +1478,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             throw new HttpException(10044);
         }
 
-        if (project.getProjectType().equals(ProjectType.VOCATIONAL)) {
         //职教
         if (!project.getProjectSchedule().equals(ProjectSchedule.REGISTER)) {
             throw new HttpException(10045);
         }
-        } else {
-            //种子
-            if (!project.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)) {
-                throw new HttpException(10045);
-            }
-        }
 
         if (project.getProjectStatus().equals(ProjectStatus.SCHOOL_NOT_PASSED)) {
             throw new HttpException(10045);
@@ -1638,42 +1492,34 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             throw new HttpException(10078);
         }
 
-        ProjectScheduleRecordDO projectScheduleRecordDO = projectScheduleRecordService.getOne(new QueryWrapper<ProjectScheduleRecordDO>()
-                .lambda()
-                .eq(ProjectScheduleRecordDO::getProjectId, project.getId())
-                .eq(ProjectScheduleRecordDO::getProjectSchedule, project.getProjectSchedule()));
-        if (projectScheduleRecordDO != null) {
-            projectScheduleRecordService.removeById(projectScheduleRecordDO.getId());
-        }
-
         ProjectDO pd = new ProjectDO();
         pd.setId(project.getId());
         pd.setProjectStatus(ProjectStatus.UN_SUBMITTED);
         this.baseMapper.updateById(pd);
     }
-
-    @Override
-    public IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO) {
-        StudentDO studentDO = (StudentDO) Localstorage.getUser();
-        if (studentDO == null) {
-            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
-        }
-
-        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize()), projectListPageDTO.getMatchId(), studentDO.getId(), ProjectType.SEED_TRACK);
-        for (ProjectPageVO record : iPage.getRecords()) {
-            MatchDictDO matchDictDO = matchDictService.getById(record.getMatchId());
-            if (matchDictDO != null) {
-                record.setMatchName(matchDictDO.getMatchName());
-            }
-
-            if (!record.getProjectStatus().equals(ProjectStatus.UN_SUBMITTED)
-                    && !record.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
-                record.setReviewResult(record.getProjectStatus());
-                record.setProjectStatus(ProjectReview.REVIEW);
-            }
-        }
-        return iPage;
-    }
+//
+//    @Override
+//    public IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO) {
+//        StudentDO studentDO = (StudentDO) Localstorage.getUser();
+//        if (studentDO == null) {
+//            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
+//        }
+//
+//        IPage<ProjectPageVO> iPage = this.baseMapper.getListPage(new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize()), projectListPageDTO.getMatchId(), studentDO.getId(), ProjectType.SEED_TRACK);
+//        for (ProjectPageVO record : iPage.getRecords()) {
+//            MatchDictDO matchDictDO = matchDictService.getById(record.getMatchId());
+//            if (matchDictDO != null) {
+//                record.setMatchName(matchDictDO.getMatchName());
+//            }
+//
+//            if (!record.getProjectStatus().equals(ProjectStatus.UN_SUBMITTED)
+//                    && !record.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
+//                record.setReviewResult(record.getProjectStatus());
+//                record.setProjectStatus(ProjectReview.REVIEW);
+//            }
+//        }
+//        return iPage;
+//    }
 
     @Override
     public void createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO) {
@@ -1695,42 +1541,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 .eq(ProjectDO::getMatchId, matchDictDO.getId())
                 .eq(ProjectDO::getProposerId, studentDO.getId())
                 .eq(ProjectDO::getProjectStatus, ProjectStatus.UN_SUBMITTED)
-//                .eq(ProjectDO::getProjectGroup, studentDO.getEducation())
                 .eq(ProjectDO::getProjectProgress, createSeedTrackProjectDTO.getProjectProgress())
         );
 
         ProjectDO projectDO = new ProjectDO();
         BeanUtils.copyProperties(createSeedTrackProjectDTO, projectDO);
-        projectDO.setCollege(studentDO.getCollege());
-
-        List<String> str = createSeedTrackProjectDTO.getClassification();
-        if (null != str && str.size() > 0) {
-            String classification = "";
-            for (String s : str) {
-                classification += s + ",";
-            }
-            projectDO.setClassification(classification.substring(0, classification.length() - 1));
-        } else if (createSeedTrackProjectDTO.getProjectProgress().equals(ProjectType.CULTURAL_CREATIVE_GROUP)) {
-            projectDO.setClassification(createSeedTrackProjectDTO.getCulClassification());
-        }
-
-//        List<String> showFormList = createSeedTrackProjectDTO.getRoadShowForm();
-//        if (showFormList != null && showFormList.size() > 0) {
-//            String showForm = "";
-//            for (String s : showFormList) {
-//                showForm += s + ",";
-//            }
-//            projectDO.setRoadShowForm(showForm.substring(0, showForm.length() - 1));
-//        }
-
-        List<String> restrictionList = createSeedTrackProjectDTO.getRestriction();
-        if (restrictionList != null && restrictionList.size() > 0) {
-            String restriction = "";
-            for (String s : restrictionList) {
-                restriction += s + ",";
-            }
-            projectDO.setRestriction(restriction.substring(0, restriction.length() - 1));
-        }
 
         projectDO.setProposerId(studentDO.getId());
         if (matchDictDO != null) {
@@ -1797,14 +1612,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Override
     public VocationalProjectInfoVO getVocationalProjectById() {
         StudentDO studentDO = (StudentDO) Localstorage.getUser();
-//        StudentDO studentDO = studentService.getById(7228);
         if (studentDO == null) {
             throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
         }
 
         MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
                 .eq(MatchDictDO::getStatus, 1));
 
         if (matchDictDO == null) {
@@ -1819,69 +1632,59 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         if (projectDO != null) {
             BeanUtils.copyProperties(projectDO, projectInfoVO);
 
-            ProjectMaterialsDO projectMaterialsDO = projectMaterialsService.getOne(new QueryWrapper<ProjectMaterialsDO>()
-                    .lambda()
-                    .eq(ProjectMaterialsDO::getProjectId, projectDO.getId()));
-            if (projectMaterialsDO != null) {
-                projectInfoVO.setMaterialsName(projectMaterialsDO.getMaterialsName());
-                projectInfoVO.setMaterialsSize(projectMaterialsDO.getMaterialsSize());
-                projectInfoVO.setMaterialsType(projectMaterialsDO.getMaterialsType());
-                projectInfoVO.setMaterialsUrl(projectMaterialsDO.getMaterialsUrl());
-            }
-
-            // 股权结构
-            List<ProjectOwnershipStructureDO> ownershipStructureDOList = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
-                    .lambda()
-                    .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setOwnership(ownershipStructureDOList);
-
-            /**
-             * 专利
-             */
-            List<ProjectPatentDO> patentDOList = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
-                    .lambda()
-                    .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setPatent(patentDOList);
-
-            /**
-             * 论文
-             */
-            List<ProjectPaperDO> paperDOList = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
-                    .lambda()
-                    .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setPaper(paperDOList);
-
-            /**
-             * 奖项
-             */
-            List<ProjectAwardDO> awardDOList = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
-                    .lambda()
-                    .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setAward(awardDOList);
-
-            /**
-             * 软件著作权
-             */
-            List<ProjectCopyrightDO> copyrightDOList = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
-                    .lambda()
-                    .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setCopyright(copyrightDOList);
-
-            /**
-             * 作品著作
-             */
-            List<ProjectWorksDO> worksDOList = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
-                    .lambda()
-                    .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setWorks(worksDOList);
-
-            /**
-             * 商标
-             */
-            List<ProjectTrademarkDO> trademarkDOList = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
-                    .lambda()
-                    .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
-            projectInfoVO.setTrademark(trademarkDOList);
+//            // 股权结构
+//            List<ProjectOwnershipStructureDO> ownershipStructureDOList = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
+//                    .lambda()
+//                    .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setOwnership(ownershipStructureDOList);
+//
+//            /**
+//             * 专利
+//             */
+//            List<ProjectPatentDO> patentDOList = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
+//                    .lambda()
+//                    .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setPatent(patentDOList);
+//
+//            /**
+//             * 论文
+//             */
+//            List<ProjectPaperDO> paperDOList = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
+//                    .lambda()
+//                    .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setPaper(paperDOList);
+//
+//            /**
+//             * 奖项
+//             */
+//            List<ProjectAwardDO> awardDOList = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
+//                    .lambda()
+//                    .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setAward(awardDOList);
+//
+//            /**
+//             * 软件著作权
+//             */
+//            List<ProjectCopyrightDO> copyrightDOList = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
+//                    .lambda()
+//                    .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setCopyright(copyrightDOList);
+//
+//            /**
+//             * 作品著作
+//             */
+//            List<ProjectWorksDO> worksDOList = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
+//                    .lambda()
+//                    .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setWorks(worksDOList);
+//
+//            /**
+//             * 商标
+//             */
+//            List<ProjectTrademarkDO> trademarkDOList = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
+//                    .lambda()
+//                    .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
+//            projectInfoVO.setTrademark(trademarkDOList);
         }
         return projectInfoVO;
     }
@@ -1896,7 +1699,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
         MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
                 .eq(MatchDictDO::getStatus, 1));
         if (matchDictDO == null) {
             throw new HttpException(10054);
@@ -1909,8 +1711,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectDO po = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
                 .lambda()
                 .eq(ProjectDO::getMatchId, matchDictDO.getId())
-                .eq(ProjectDO::getProposerId, studentDO.getId())
-                .eq(ProjectDO::getProjectType, ProjectType.VOCATIONAL));
+                .eq(ProjectDO::getProposerId, studentDO.getId()));
         /**
          * 验证是否存在过项目，决赛开启编辑不需要进行验证，填写中的项目也不需要进行验证
          */
@@ -1920,7 +1721,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
         ProjectDO projectDO = new ProjectDO();
         BeanUtils.copyProperties(createVocationalProjectDTO, projectDO);
-        projectDO.setCollege(studentDO.getCollege());
 
         /**
          * 第一次创建项目设置基础状态，开启编辑不需要进行设置
@@ -1932,8 +1732,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
             projectDO.setProjectSchedule(ProjectSchedule.REGISTER);
-            projectDO.setProjectType(ProjectType.VOCATIONAL);
-            projectDO.setProjectGroup(studentDO.getEducation());
+            projectDO.setProjectGroup(createVocationalProjectDTO.getProjectGroup());
         }
 
         if (po == null) {
@@ -1942,337 +1741,30 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             projectDO.setId(po.getId());
             this.baseMapper.updateById(projectDO);
         }
-
-        /**
-         * 项目材料
-         */
-        ProjectMaterialsDO projectMaterialsDO = projectMaterialsService.getOne(new QueryWrapper<ProjectMaterialsDO>()
-                .lambda()
-                .eq(ProjectMaterialsDO::getProjectId, projectDO.getId()));
-
-        ProjectMaterialsDO materialsDO = new ProjectMaterialsDO();
-        materialsDO.setMaterialsName(createVocationalProjectDTO.getMaterialsName());
-        materialsDO.setMaterialsSize(createVocationalProjectDTO.getMaterialsSize());
-        materialsDO.setMaterialsType(createVocationalProjectDTO.getMaterialsType());
-        materialsDO.setMaterialsUrl(createVocationalProjectDTO.getMaterialsUrl());
-        materialsDO.setProjectId(projectDO.getId());
-        if (projectMaterialsDO == null) {
-            projectMaterialsService.save(materialsDO);
-        } else {
-            materialsDO.setId(projectMaterialsDO.getId());
-            projectMaterialsService.updateById(materialsDO);
-        }
-
-        /**
-         * 项目股权
-         */
-        if (createVocationalProjectDTO.getOwnership() != null && createVocationalProjectDTO.getOwnership().size() > 0) {
-            List<ProjectOwnershipStructureDO> list = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
-                    .lambda()
-                    .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
-            if (list != null) {
-                projectOwnershipStructureService.removeByIds(list.stream().map(ProjectOwnershipStructureDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectOwnershipStructureDO projectOwnershipStructureDO : createVocationalProjectDTO.getOwnership()) {
-                projectOwnershipStructureDO.setProjectId(projectDO.getId());
-                projectOwnershipStructureService.save(projectOwnershipStructureDO);
-            }
-        }
-
-        /**
-         * 专利
-         */
-        if (createVocationalProjectDTO.getPatent() != null && createVocationalProjectDTO.getPatent().size() > 0) {
-            List<ProjectPatentDO> list = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
-                    .lambda()
-                    .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                patentMapper.deleteBatchIds(list.stream().map(ProjectPatentDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectPatentDO patentDO : createVocationalProjectDTO.getPatent()) {
-                patentDO.setProjectId(projectDO.getId());
-                patentMapper.insert(patentDO);
-            }
-        }
-
-        /**
-         * 论文
-         */
-        if (createVocationalProjectDTO.getPaper() != null && createVocationalProjectDTO.getPaper().size() > 0) {
-            List<ProjectPaperDO> list = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
-                    .lambda()
-                    .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                paperMapper.deleteBatchIds(list.stream().map(ProjectPaperDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectPaperDO projectPaperDO : createVocationalProjectDTO.getPaper()) {
-                projectPaperDO.setProjectId(projectDO.getId());
-                paperMapper.insert(projectPaperDO);
-            }
-        }
-
-        /**
-         * 奖项
-         */
-        if (createVocationalProjectDTO.getAward() != null && createVocationalProjectDTO.getAward().size() > 0) {
-            List<ProjectAwardDO> list = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
-                    .lambda()
-                    .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                awardMapper.deleteBatchIds(list.stream().map(ProjectAwardDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectAwardDO projectAwardDO : createVocationalProjectDTO.getAward()) {
-                projectAwardDO.setProjectId(projectDO.getId());
-                awardMapper.insert(projectAwardDO);
-            }
-        }
-
-        /**
-         * 软件著作权
-         */
-        if (createVocationalProjectDTO.getCopyright() != null && createVocationalProjectDTO.getCopyright().size() > 0) {
-            List<ProjectCopyrightDO> list = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
-                    .lambda()
-                    .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                copyrightMapper.deleteBatchIds(list.stream().map(ProjectCopyrightDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectCopyrightDO projectCopyrightDO : createVocationalProjectDTO.getCopyright()) {
-                projectCopyrightDO.setProjectId(projectDO.getId());
-                copyrightMapper.insert(projectCopyrightDO);
-            }
-        }
-
-        /**
-         * 作品著作
-         */
-        if (createVocationalProjectDTO.getWorks() != null && createVocationalProjectDTO.getWorks().size() > 0) {
-            List<ProjectWorksDO> list = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
-                    .lambda()
-                    .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                worksMapper.deleteBatchIds(list.stream().map(ProjectWorksDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectWorksDO work : createVocationalProjectDTO.getWorks()) {
-                work.setProjectId(projectDO.getId());
-                worksMapper.insert(work);
-            }
-        }
-
-        /**
-         * 商标
-         */
-        if (createVocationalProjectDTO.getTrademark() != null && createVocationalProjectDTO.getTrademark().size() > 0) {
-            List<ProjectTrademarkDO> list = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
-                    .lambda()
-                    .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
-            if (list != null && list.size() > 0) {
-                trademarkMapper.deleteBatchIds(list.stream().map(ProjectTrademarkDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectTrademarkDO projectTrademarkDO : createVocationalProjectDTO.getTrademark()) {
-                projectTrademarkDO.setProjectId(projectDO.getId());
-                trademarkMapper.insert(projectTrademarkDO);
-            }
-        }
     }
 
     @Override
     public void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO) {
-        StudentDO studentDO = (StudentDO) Localstorage.getUser();
-        if (studentDO == null) {
-            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
-        }
-
-        MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
-                .lambda()
-                .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
-                .eq(MatchDictDO::getStatus, 1));
-        if (matchDictDO == null) {
-            throw new HttpException(10054);
-        }
-
-        ProjectDO po = this.baseMapper.selectById(createVocationalProjectDTO.getId());
-        if (po == null) {
-            throw new HttpException(10046);
-        }
-
-        ProjectDO projectDO = new ProjectDO();
-        BeanUtils.copyProperties(createVocationalProjectDTO, projectDO);
-        this.baseMapper.updateById(projectDO);
-
-        /**
-         * 项目材料
-         */
-        ProjectMaterialsDO projectMaterialsDO = projectMaterialsService.getOne(new QueryWrapper<ProjectMaterialsDO>()
-                .lambda()
-                .eq(ProjectMaterialsDO::getProjectId, projectDO.getId()));
-
-        ProjectMaterialsDO materialsDO = new ProjectMaterialsDO();
-        materialsDO.setMaterialsName(createVocationalProjectDTO.getMaterialsName());
-        materialsDO.setMaterialsSize(createVocationalProjectDTO.getMaterialsSize());
-        materialsDO.setMaterialsType(createVocationalProjectDTO.getMaterialsType());
-        materialsDO.setMaterialsUrl(createVocationalProjectDTO.getMaterialsUrl());
-        materialsDO.setProjectId(projectDO.getId());
-        if (projectMaterialsDO == null) {
-            projectMaterialsService.save(materialsDO);
-        } else {
-            materialsDO.setId(projectMaterialsDO.getId());
-            projectMaterialsService.updateById(materialsDO);
-        }
-
-        /**
-         * 项目股权
-         */
-        List<ProjectOwnershipStructureDO> owList = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
-                .lambda()
-                .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getOwnership() != null && createVocationalProjectDTO.getOwnership().size() > 0) {
-            if (owList != null) {
-                projectOwnershipStructureService.removeByIds(owList.stream().map(ProjectOwnershipStructureDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectOwnershipStructureDO projectOwnershipStructureDO : createVocationalProjectDTO.getOwnership()) {
-                projectOwnershipStructureDO.setProjectId(projectDO.getId());
-                projectOwnershipStructureService.save(projectOwnershipStructureDO);
-            }
-        } else {
-            if (owList != null) {
-                projectOwnershipStructureService.removeByIds(owList.stream().map(ProjectOwnershipStructureDO::getId).collect(Collectors.toList()));
-            }
-        }
-
-        /**
-         * 专利
-         */
-        List<ProjectPatentDO> patentList = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
-                .lambda()
-                .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getPatent() != null && createVocationalProjectDTO.getPatent().size() > 0) {
-            if (patentList != null && patentList.size() > 0) {
-                patentMapper.deleteBatchIds(patentList.stream().map(ProjectPatentDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectPatentDO patentDO : createVocationalProjectDTO.getPatent()) {
-                patentDO.setProjectId(projectDO.getId());
-                patentMapper.insert(patentDO);
-            }
-        } else {
-            if (patentList != null && patentList.size() > 0) {
-                patentMapper.deleteBatchIds(patentList.stream().map(ProjectPatentDO::getId).collect(Collectors.toList()));
-            }
-        }
-
-        /**
-         * 论文
-         */
-        List<ProjectPaperDO> paperList = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
-                .lambda()
-                .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getPaper() != null && createVocationalProjectDTO.getPaper().size() > 0) {
-            if (paperList != null && paperList.size() > 0) {
-                paperMapper.deleteBatchIds(paperList.stream().map(ProjectPaperDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectPaperDO projectPaperDO : createVocationalProjectDTO.getPaper()) {
-                projectPaperDO.setProjectId(projectDO.getId());
-                paperMapper.insert(projectPaperDO);
-            }
-        } else {
-            if (paperList != null && paperList.size() > 0) {
-                paperMapper.deleteBatchIds(paperList.stream().map(ProjectPaperDO::getId).collect(Collectors.toList()));
-            }
-        }
-
-        /**
-         * 奖项
-         */
-        List<ProjectAwardDO> awardList = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
-                .lambda()
-                .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getAward() != null && createVocationalProjectDTO.getAward().size() > 0) {
-            if (awardList != null && awardList.size() > 0) {
-                awardMapper.deleteBatchIds(awardList.stream().map(ProjectAwardDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectAwardDO projectAwardDO : createVocationalProjectDTO.getAward()) {
-                projectAwardDO.setProjectId(projectDO.getId());
-                awardMapper.insert(projectAwardDO);
-            }
-        } else {
-            if (awardList != null && awardList.size() > 0) {
-                awardMapper.deleteBatchIds(awardList.stream().map(ProjectAwardDO::getId).collect(Collectors.toList()));
-            }
-        }
-
-        /**
-         * 软件著作权
-         */
-        List<ProjectCopyrightDO> copyrightList = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
-                .lambda()
-                .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getCopyright() != null && createVocationalProjectDTO.getCopyright().size() > 0) {
-            if (copyrightList != null && copyrightList.size() > 0) {
-                copyrightMapper.deleteBatchIds(copyrightList.stream().map(ProjectCopyrightDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectCopyrightDO projectCopyrightDO : createVocationalProjectDTO.getCopyright()) {
-                projectCopyrightDO.setProjectId(projectDO.getId());
-                copyrightMapper.insert(projectCopyrightDO);
-            }
-        } else {
-            if (copyrightList != null && copyrightList.size() > 0) {
-                copyrightMapper.deleteBatchIds(copyrightList.stream().map(ProjectCopyrightDO::getId).collect(Collectors.toList()));
-            }
-        }
-
-        /**
-         * 作品著作
-         */
-        List<ProjectWorksDO> worksDOList = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
-                .lambda()
-                .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getWorks() != null && createVocationalProjectDTO.getWorks().size() > 0) {
-            if (worksDOList != null && worksDOList.size() > 0) {
-                worksMapper.deleteBatchIds(worksDOList.stream().map(ProjectWorksDO::getId).collect(Collectors.toList()));
-            }
-
-            for (ProjectWorksDO work : createVocationalProjectDTO.getWorks()) {
-                work.setProjectId(projectDO.getId());
-                worksMapper.insert(work);
-            }
-        } else {
-            if (worksDOList != null && worksDOList.size() > 0) {
-                worksMapper.deleteBatchIds(worksDOList.stream().map(ProjectWorksDO::getId).collect(Collectors.toList()));
-            }
+        StudentDO studentDO = (StudentDO) Localstorage.getUser();
+        if (studentDO == null) {
+            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
         }
 
-        /**
-         * 商标
-         */
-        List<ProjectTrademarkDO> trademarkDOList = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
+        MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
-        if (createVocationalProjectDTO.getTrademark() != null && createVocationalProjectDTO.getTrademark().size() > 0) {
-            if (trademarkDOList != null && trademarkDOList.size() > 0) {
-                trademarkMapper.deleteBatchIds(trademarkDOList.stream().map(ProjectTrademarkDO::getId).collect(Collectors.toList()));
+                .eq(MatchDictDO::getStatus, 1));
+        if (matchDictDO == null) {
+            throw new HttpException(10054);
         }
 
-            for (ProjectTrademarkDO projectTrademarkDO : createVocationalProjectDTO.getTrademark()) {
-                projectTrademarkDO.setProjectId(projectDO.getId());
-                trademarkMapper.insert(projectTrademarkDO);
-            }
-        } else {
-            if (trademarkDOList != null && trademarkDOList.size() > 0) {
-                trademarkMapper.deleteBatchIds(trademarkDOList.stream().map(ProjectTrademarkDO::getId).collect(Collectors.toList()));
-            }
+        ProjectDO po = this.baseMapper.selectById(createVocationalProjectDTO.getId());
+        if (po == null) {
+            throw new HttpException(10046);
         }
+
+        ProjectDO projectDO = new ProjectDO();
+        BeanUtils.copyProperties(createVocationalProjectDTO, projectDO);
+        this.baseMapper.updateById(projectDO);
     }
 
     @Override
@@ -2388,8 +1880,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         if (projectDO != null) {
             BeanUtils.copyProperties(projectDO, projectInfoVO);
 //            projectInfoVO.setRoadShowForm(Arrays.stream(projectDO.getRoadShowForm().split(",")).collect(Collectors.toList()));
-            projectInfoVO.setClassification(Arrays.stream(projectDO.getClassification().split(",")).collect(Collectors.toList()));
-            projectInfoVO.setRestriction(Arrays.stream(projectDO.getRestriction().split(",")).collect(Collectors.toList()));
+//            projectInfoVO.setClassification(Arrays.stream(projectDO.getClassification().split(",")).collect(Collectors.toList()));
+//            projectInfoVO.setRestriction(Arrays.stream(projectDO.getRestriction().split(",")).collect(Collectors.toList()));
 
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
                     .lambda()
@@ -2403,9 +1895,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 projectInfoVO.setFillInProgress(2);
             }
 
-            if (projectDO.getPrintAttachment() != null) {
-                projectInfoVO.setFillInProgress(3);
-            }
+//            if (projectDO.getPrintAttachment() != null) {
+//                projectInfoVO.setFillInProgress(3);
+//            }
         }
         return projectInfoVO;
     }
@@ -2437,7 +1929,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         if (projectDO != null) {
             BeanUtils.copyProperties(projectDO, projectInfoVO);
 //            projectInfoVO.setRoadShowForm(Arrays.stream(projectDO.getRoadShowForm().split(",")).collect(Collectors.toList()));
-            projectInfoVO.setCulClassification(projectDO.getClassification());
+//            projectInfoVO.setCulClassification(projectDO.getClassification());
 
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
                     .lambda()
@@ -2451,9 +1943,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 projectInfoVO.setFillInProgress(2);
             }
 
-            if (projectDO.getPrintAttachment() != null) {
-                projectInfoVO.setFillInProgress(3);
-            }
+//            if (projectDO.getPrintAttachment() != null) {
+//                projectInfoVO.setFillInProgress(3);
+//            }
         }
 
         return projectInfoVO;
@@ -2538,51 +2030,51 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         return mainTrackProjectDetailVO;
     }
 
-    @Override
-    public IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO) {
-        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
-        Long matchId = null;
-        if (projectListPageDTO.getMatchId() == null) {
-            MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
-                    .lambda()
-                    .eq(MatchDictDO::getStatus, 1)
-                    .eq(MatchDictDO::getMatchType, ProjectType.SEED_TRACK));
-            if (matchDictDO != null) {
-                matchId = matchDictDO.getId();
-            }
-        } else {
-            matchId = projectListPageDTO.getMatchId();
-        }
-
-        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, matchId, projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.SEED_TRACK, null,
-                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
-        for (SeedTrackProjectPageVO record : iPage.getRecords()) {
-            List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
-                    .lambda()
-                    .eq(ProjectMaterialsDO::getProjectId, record.getId()));
-            record.setMaterials(list);
-        }
-        return iPage;
-    }
-
-    @Override
-    public IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO) {
-        CollegesDictDO collegesDictDO = (CollegesDictDO) Localstorage.getUser();
-        if (collegesDictDO == null) {
-            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
-        }
+//    @Override
+//    public IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO) {
+//        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
+//        Long matchId = null;
+//        if (projectListPageDTO.getMatchId() == null) {
+//            MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
+//                    .lambda()
+//                    .eq(MatchDictDO::getStatus, 1)
+//                    .eq(MatchDictDO::getMatchType, ProjectType.SEED_TRACK));
+//            if (matchDictDO != null) {
+//                matchId = matchDictDO.getId();
+//            }
+//        } else {
+//            matchId = projectListPageDTO.getMatchId();
+//        }
+//
+//        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, matchId, projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.SEED_TRACK, null,
+//                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
+//        for (SeedTrackProjectPageVO record : iPage.getRecords()) {
+//            List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
+//                    .lambda()
+//                    .eq(ProjectMaterialsDO::getProjectId, record.getId()));
+//            record.setMaterials(list);
+//        }
+//        return iPage;
+//    }
 
-        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
-        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.SEED_TRACK, collegesDictDO.getName(),
-                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
-        for (SeedTrackProjectPageVO record : iPage.getRecords()) {
-            List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
-                    .lambda()
-                    .eq(ProjectMaterialsDO::getProjectId, record.getId()));
-            record.setMaterials(list);
-        }
-        return iPage;
-    }
+//    @Override
+//    public IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO) {
+//        CollegesDictDO collegesDictDO = (CollegesDictDO) Localstorage.getUser();
+//        if (collegesDictDO == null) {
+//            throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
+//        }
+//
+//        Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
+//        IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), MemberType.PRINCIPAL, ProjectType.SEED_TRACK, collegesDictDO.getName(),
+//                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress());
+//        for (SeedTrackProjectPageVO record : iPage.getRecords()) {
+//            List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
+//                    .lambda()
+//                    .eq(ProjectMaterialsDO::getProjectId, record.getId()));
+//            record.setMaterials(list);
+//        }
+//        return iPage;
+//    }
 
     @Override
     public void downloadPDF(String projectGroup) {
@@ -2774,116 +2266,67 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             ProjectDO project = new ProjectDO();
             project.setId(projectDO.getId());
 
-            if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
-                project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
-            } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-                    && ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())) {
-                /**
-                 * 校内赛通过  ---> 复赛审核
-                 *
-                 * 校内赛上报规则：按组别每十个项目中可以进行一个项目申报
-                 */
-                Map<String, Object> map = Localstorage.getMap();
-
-                if (map.get("type").equals(Platform.school)) {
-                    CollegesDictDO collegesDictDO = (CollegesDictDO) map.get("user");
-                    if (collegesDictDO == null) {
-                        throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
-                    }
-
-                    List<ProjectDO> list = this.baseMapper.getProjectByCollege(projectDO.getMatchId(), collegesDictDO.getName(), projectDO.getProjectProgress());
-                    if (list != null && list.size() > 0) {
 
-                        // 十进一
-                        Integer r = list.size() / 10;
-                        Integer s = list.size() % 10;
-                        if (s > 0) {
-                            r = r + 1;
+            if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule()) ){
+                if ( approveDTO.getProjectStatus() == 7) {
+                    project.setProjectStatus(ProjectStatus.ABANDON);
+                } else {
+                    project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
+                    project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 }
 
-//                        Long count = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) || p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)
-//                                && p.getProjectProgress().equals(projectDO.getProjectProgress())).count();
-//                        if (count >= 10) {
-//                            throw new HttpException(10058);
-//                        }
             }
 
+            if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())){
+                if (approveDTO.getProjectStatus() == 7) {
+                    project.setProjectStatus(ProjectStatus.ABANDON);
+                } else {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
-
                     project.setProjectStatus(ProjectReview.TO_REVIEWED);
-                    project.setProjectReview(ProjectReview.TO_SCORE);
-                    project.setProjectAssigned(ProjectReview.UNASSIGNED);
                 }
-            } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-                    && ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
+            }
+
+            if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
                 /**
                  * 复赛通过  ---> 决赛审核
                  */
                 if (approveDTO.getProjectStatus() == 1) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
-                    project.setProjectStatus(ProjectReview.TO_REVIEWED);
                     project.setProjectReview(ProjectReview.TO_SCORE);
                     project.setProjectAssigned(ProjectReview.UNASSIGNED);
                 } else if (approveDTO.getProjectStatus() == 2) {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
-                } else if (approveDTO.getProjectStatus() == 3 || approveDTO.getProjectStatus() == 6) {
+                } else if (approveDTO.getProjectStatus() == 3) {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
                 } else if (approveDTO.getProjectStatus() == 4) {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
+                }else if (approveDTO.getProjectStatus() == 7){
+                    project.setProjectStatus(ProjectStatus.ABANDON);
                 }
-            } else {
+            }
+
+            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
                 /**
                  * 决赛通过  ---> 决赛通过
                  */
                 if (approveDTO.getProjectStatus() == 5) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_FINALS_GOLD_AWARD);
-                } else if (approveDTO.getProjectStatus() == 6 || approveDTO.getProjectStatus() == 3) {
+                } else if (approveDTO.getProjectStatus() == 6) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
+                }else if (approveDTO.getProjectStatus() == 2){
+                    project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
+                    project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
+                }else if (approveDTO.getProjectStatus() == 4){
+                    project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
+                    project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                 }
             }
             this.baseMapper.updateById(project);
-
-//            StudentDO studentDO = studentService.getById(projectDO.getProposerId());
-//
-//            if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-//                    && ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
-//                ProjectScheduleRecordDO ps = projectScheduleRecordService.getOne(new QueryWrapper<ProjectScheduleRecordDO>().lambda()
-//                        .eq(ProjectScheduleRecordDO::getProjectSchedule, projectDO.getProjectSchedule())
-//                        .eq(ProjectScheduleRecordDO::getProjectId, projectDO.getId())
-//                        .eq(ProjectScheduleRecordDO::getMatchId, projectDO.getMatchId()));
-//                if (ps != null) {
-//                    ProjectScheduleRecordDO p = new ProjectScheduleRecordDO();
-//                    p.setId(ps.getId());
-//                    p.setProjectStatus("通过");
-//                    projectScheduleRecordService.updateById(p);
-//                }
-//            } else {
-//                ProjectScheduleRecordDO projectScheduleRecordDO = new ProjectScheduleRecordDO();
-//                projectScheduleRecordDO.setProposerId(studentDO.getId());
-//                projectScheduleRecordDO.setProjectId(projectDO.getId());
-//                projectScheduleRecordDO.setMatchId(projectDO.getMatchId());
-//                projectScheduleRecordDO.setProjectSchedule(projectDO.getProjectSchedule());
-//                projectScheduleRecordDO.setProjectType(projectDO.getProjectType());
-//
-//                if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule()) || ProjectReview.TO_REVIEWED.equals(project.getProjectStatus())) {
-//                    projectScheduleRecordDO.setProjectStatus("通过");
-//                } else {
-//                    projectScheduleRecordDO.setProjectStatus(project.getProjectStatus());
-//                }
-//
-//                if (studentDO != null) {
-//                    projectScheduleRecordDO.setCollege(studentDO.getCollege());
-//                }
-//                projectScheduleRecordService.save(projectScheduleRecordDO);
-//            }
-
-//            String msg = project.getProjectSchedule() + "," + project.getProjectStatus();
-//            aliyunSmsUtil.sendTemplateMsg(msg, studentDO.getTelephone(), SMSTemplate.PROJECT_PROGRESS);
         }
     }
 
@@ -2946,62 +2389,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
             seedTrackProjectDetailVO.setMentor(mentor);
             seedTrackProjectDetailVO.setTeamMember(teamMember);
-
-            /**
-             * 项目股权
-             */
-            List<ProjectOwnershipStructureDO> osList = projectOwnershipStructureService.list(new QueryWrapper<ProjectOwnershipStructureDO>()
-                    .lambda()
-                    .eq(ProjectOwnershipStructureDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setOwnership(osList);
-
-            /**
-             * 专利
-             */
-            List<ProjectPatentDO> patentDOList = patentMapper.selectList(new QueryWrapper<ProjectPatentDO>()
-                    .lambda()
-                    .eq(ProjectPatentDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setPatent(patentDOList);
-
-            /**
-             * 论文
-             */
-            List<ProjectPaperDO> paperDOList = paperMapper.selectList(new QueryWrapper<ProjectPaperDO>()
-                    .lambda()
-                    .eq(ProjectPaperDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setPaper(paperDOList);
-
-            /**
-             * 奖项
-             */
-            List<ProjectAwardDO> awardDOList = awardMapper.selectList(new QueryWrapper<ProjectAwardDO>()
-                    .lambda()
-                    .eq(ProjectAwardDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setAward(awardDOList);
-
-            /**
-             * 软件著作权
-             */
-            List<ProjectCopyrightDO> copyrightDOList = copyrightMapper.selectList(new QueryWrapper<ProjectCopyrightDO>()
-                    .lambda()
-                    .eq(ProjectCopyrightDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setCopyright(copyrightDOList);
-
-            /**
-             * 作品著作
-             */
-            List<ProjectWorksDO> worksDOList = worksMapper.selectList(new QueryWrapper<ProjectWorksDO>()
-                    .lambda()
-                    .eq(ProjectWorksDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setWorks(worksDOList);
-
-            /**
-             * 商标
-             */
-            List<ProjectTrademarkDO> trademarkDOList = trademarkMapper.selectList(new QueryWrapper<ProjectTrademarkDO>()
-                    .lambda()
-                    .eq(ProjectTrademarkDO::getProjectId, projectDO.getId()));
-            seedTrackProjectDetailVO.setTrademark(trademarkDOList);
         }
         return seedTrackProjectDetailVO;
     }
@@ -3123,7 +2510,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
         }
         ExcelUtil.writeExcel(ExcelUtil.getField(ExportProjectDTO.class), data);
-
     }
 
 
@@ -3138,74 +2524,31 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectDO project = new ProjectDO();
         project.setId(projectDO.getId());
 
-        if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
-            projectDO.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
-        } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-                && ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())) {
-            /**
-             * 种子赛道： 校内赛通过  ---> 复赛审核
-             * 职教赛道： 校内赛通过 ---> 初赛审核
-             *
-             * 校内赛上报规则：按组别每十个项目中可以进行一个项目申报
-             */
-            Map<String, Object> map = Localstorage.getMap();
-            if (map.get("type").equals(Platform.school)) {
-                CollegesDictDO collegesDictDO = (CollegesDictDO) map.get("user");
-                if (collegesDictDO == null) {
-                    throw new HttpException(Code.TOKEN_EXPIRED.getCode(), Code.TOKEN_EXPIRED.getMessage());
+        if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule()) ){
+            if ( approveDTO.getProjectStatus() == 7) {
+                project.setProjectStatus(ProjectStatus.ABANDON);
+            } else {
+                project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
+                project.setProjectStatus(ProjectReview.TO_REVIEWED);
             }
 
-                List<ProjectDO> list = this.baseMapper.getProjectByCollege(projectDO.getMatchId(), collegesDictDO.getName(), projectDO.getProjectProgress());
-
-                if (list != null && list.size() > 0) {
-                    // count 已经上报的项目数量
-//                 Long count = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) || p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)).count();
-
-                    // 十进一
-                    Integer r = list.size() / 10;
-                    Integer s = list.size() % 10;
-                    if (s > 0) {
-                        r = r + 1;
-                    }
-//                    Long count = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) || p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)
-//                            && p.getProjectProgress().equals(projectDO.getProjectProgress())).count();
-//                    if (count >= 10) {
-//                        throw new HttpException(10058);
-//                    }
         }
 
+        if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())){
+            if (approveDTO.getProjectStatus() == 7) {
+                project.setProjectStatus(ProjectStatus.ABANDON);
+            } else {
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectStatus(ProjectReview.TO_REVIEWED);
-                project.setProjectReview(ProjectReview.TO_SCORE);
-                project.setProjectAssigned(ProjectReview.UNASSIGNED);
             }
-        } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-                && projectDO.getProjectType().equals(ProjectType.VOCATIONAL)
-                && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)
-//                && ProjectSchedule.PRELIMINARY_REVIEW.equals(projectDO.getProjectSchedule())
-        ) {
-            /**
-             * 职教赛道市级初赛审批  市级初赛 ---> 市级复赛
-             */
-            if (approveDTO.getProjectStatus() == 1) {
-                project.setProjectStatus(ProjectReview.TO_REVIEWED);
-                project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
-            } else if (approveDTO.getProjectStatus() == 2) {
-                project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
-            } else if (approveDTO.getProjectStatus() == 4) {
-                project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
         }
 
-            project.setProjectReview(ProjectReview.TO_SCORE);
-            project.setProjectAssigned(ProjectReview.UNASSIGNED);
-        } else if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-                && ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
+        if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
             /**
              * 复赛通过  ---> 决赛审核
              */
             if (approveDTO.getProjectStatus() == 1) {
                 project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
-                project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 project.setProjectReview(ProjectReview.TO_SCORE);
                 project.setProjectAssigned(ProjectReview.UNASSIGNED);
             } else if (approveDTO.getProjectStatus() == 2) {
@@ -3217,8 +2560,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             } else if (approveDTO.getProjectStatus() == 4) {
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
+            }else if (approveDTO.getProjectStatus() == 7){
+                project.setProjectStatus(ProjectStatus.ABANDON);
             }
-        } else {
+        }
+
+        if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
+            /**
+             * 决赛通过  ---> 决赛通过
+             */
+            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
                 /**
                  * 决赛通过  ---> 决赛通过
                  */
@@ -3228,44 +2579,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 } else if (approveDTO.getProjectStatus() == 6) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
+                }else if (approveDTO.getProjectStatus() == 2){
+                    project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
+                    project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
+                }else if (approveDTO.getProjectStatus() == 4){
+                    project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
+                    project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
+                }
             }
         }
         this.baseMapper.updateById(project);
-
-//        StudentDO studentDO = studentService.getById(projectDO.getProposerId());
-//        if (ProjectReview.TO_REVIEWED.equals(projectDO.getProjectStatus())
-//                && ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())) {
-//            ProjectScheduleRecordDO ps = projectScheduleRecordService.getOne(new QueryWrapper<ProjectScheduleRecordDO>().lambda()
-//                    .eq(ProjectScheduleRecordDO::getProjectSchedule, projectDO.getProjectSchedule())
-//                    .eq(ProjectScheduleRecordDO::getProjectId, projectDO.getId())
-//                    .eq(ProjectScheduleRecordDO::getMatchId, projectDO.getMatchId()));
-//            if (ps != null) {
-//                ProjectScheduleRecordDO p = new ProjectScheduleRecordDO();
-//                p.setId(ps.getId());
-//                p.setProjectStatus("通过");
-//                projectScheduleRecordService.updateById(p);
-//            }
-//        } else {
-//            ProjectScheduleRecordDO projectScheduleRecordDO = new ProjectScheduleRecordDO();
-//            projectScheduleRecordDO.setProposerId(studentDO.getId());
-//            projectScheduleRecordDO.setProjectId(projectDO.getId());
-//            projectScheduleRecordDO.setMatchId(projectDO.getMatchId());
-//            projectScheduleRecordDO.setProjectSchedule(project.getProjectSchedule());
-//            projectScheduleRecordDO.setProjectType(projectDO.getProjectType());
-//            if (project.getProjectStatus().equals(ProjectReview.TO_REVIEWED)) {
-//                projectScheduleRecordDO.setProjectStatus("通过");
-//            } else {
-//                projectScheduleRecordDO.setProjectStatus(project.getProjectStatus());
-//            }
-//
-//            if (studentDO != null) {
-//                projectScheduleRecordDO.setCollege(studentDO.getCollege());
-//            }
-//            projectScheduleRecordService.save(projectScheduleRecordDO);
-//        }
-
-//        String msg = project.getProjectSchedule() + "," + project.getProjectStatus();
-//        aliyunSmsUtil.sendTemplateMsg(msg, studentDO.getTelephone(), SMSTemplate.PROJECT_PROGRESS);
     }
 
     @Override
@@ -3454,9 +2777,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
         ProjectDO projectDO = new ProjectDO();
         projectDO.setId(project.getId());
-        projectDO.setPrintAttachment(printAttachmentDTO.getPrintAttachment());
-        projectDO.setPrintAttachmentName(printAttachmentDTO.getPrintAttachmentName());
-        projectDO.setPrintAttachmentType(printAttachmentDTO.getPrintAttachmentType());
         projectDO.setProjectStatus(ProjectReview.TO_REVIEWED);
         this.baseMapper.updateById(projectDO);
 
@@ -3904,7 +3224,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         .eq(ProjectReviewDO::getProjectId, project.getId())
                         .eq(ProjectReviewDO::getProjectSchedule, project.getProjectSchedule())
                         .eq(ProjectReviewDO::getJudgeId, projectJudgeDO.getId()));
-                if (projectReviewDO.getReviewScore() == null ) {
+                if (projectReviewDO.getReviewScore() == null) {
                     throw new HttpException(10077);
                 }
 
@@ -3961,7 +3281,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     .eq(ProjectReviewDO::getProjectSchedule, project.getProjectSchedule())
                     .eq(ProjectReviewDO::getProjectId, projectReviewScoreDTO.getId())
                     .eq(ProjectReviewDO::getJudgeId, projectJudgeDO.getId()));
-            if (projectReviewDO.getReviewScore() == null ) {
+            if (projectReviewDO.getReviewScore() == null) {
                 throw new HttpException(10077);
             }
 
@@ -3995,7 +3315,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     }
 
     @Override
-    public ProjectMemberVO getProjectMember(String projectGroup) {
+    public ProjectMemberVO getProjectMember() {
         ProjectMemberVO projectMemberVO = new ProjectMemberVO();
         StudentDO studentDO = (StudentDO) Localstorage.getUser();
         if (studentDO == null) {
@@ -4004,24 +3324,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
         MatchDictDO matchDictDO = new MatchDictDO();
 
-        if (projectGroup.equals(ProjectType.VOCATIONAL)) {
-            projectGroup = studentDO.getEducation();
-            matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
-                    .lambda()
-                    .eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
-                    .eq(MatchDictDO::getStatus, 1));
-        } else {
         matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
                 .lambda()
-                    .eq(MatchDictDO::getMatchType, ProjectType.SEED_TRACK)
                 .eq(MatchDictDO::getStatus, 1));
-        }
 
         ProjectDO projectDO = this.baseMapper.selectOne(new QueryWrapper<ProjectDO>()
                 .lambda()
-                .eq(ProjectDO::getProjectProgress, projectGroup)
                 .eq(ProjectDO::getProposerId, studentDO.getId())
                 .eq(ProjectDO::getMatchId, matchDictDO.getId()));
+        projectMemberVO.setProjectId(projectDO.getId());
         if (projectDO != null) {
             projectMemberVO.setEditStatus(projectDO.getEditStatus());
             List<ProjectMemberDO> list = projectMemberService.list(new QueryWrapper<ProjectMemberDO>()
@@ -4249,17 +3560,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         Integer registeredNum = studentService.count();
         projectDataOverview.setRegisteredNum(registeredNum);
 
-        List<MatchDictDO> matchList = matchDictService.getList(dataOverviewDTO.getProjectType(), dataOverviewDTO.getProjectGroup());
-
         List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
                 .lambda()
                 .ne(ProjectDO::getProjectStatus, ProjectStatus.UN_SUBMITTED)
-                .eq(ProjectDO::getProjectGroup, dataOverviewDTO.getProjectGroup())
-                .eq(ProjectDO::getProjectType, dataOverviewDTO.getProjectType()));
+                .eq(ProjectDO::getMatchId, dataOverviewDTO.getMatchId()));
         /*
             全部项目数量
          */
         projectDataOverview.setProjectNum(list.size());
+        Integer registeringNum = 0;
         Integer schoolProjectNum = 0;
         Integer rematchProjectNum = 0;
         Integer finalProjectNum = 0;
@@ -4273,17 +3582,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         for (ProjectDO projectDO : list) {
             if (projectDO.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)) {
                 /*
-                    校内赛项目数
+                    市级初赛项目
                  */
-                schoolProjectNum++;
-            }
-//            else if(projectDO.getProjectSchedule().equals(ProjectSchedule.PRELIMINARY_REVIEW)) {
-//               /*
-//                初赛项目数量
-//                */
-//                preliminaryProjectNum ++;
-//            }
-            else if (projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)) {
+                preliminaryProjectNum++;
+            } else if (projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)) {
                 /*
                     复赛项目数
                  */
@@ -4293,6 +3595,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     决赛项目数
                  */
                 finalProjectNum++;
+            } else {
+                registeringNum++;
             }
 
             if (projectDO.getProjectStatus().equals(ProjectStatus.REMATCH_BRONZE_AWARD)) {
@@ -4306,7 +3610,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
         }
 
-        projectDataOverview.setMatchNum(matchList.size());
+//        projectDataOverview.setMatchNum(matchList.size());
         projectDataOverview.setRematchBronzeAwardNum(rematchBronzeAwardNum);
         projectDataOverview.setRematchSilverAwardNum(rematchSilverAwardNum);
         projectDataOverview.setRematchWinningAwardNum(rematchWinningAwardNum);
@@ -4314,6 +3618,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         projectDataOverview.setFinalsGoldAwardNum(finalsGoldAwardNum);
         projectDataOverview.setSchoolProjectNum(schoolProjectNum + preliminaryProjectNum + rematchProjectNum + finalProjectNum);
         projectDataOverview.setRematchProjectNum(rematchProjectNum + finalProjectNum);
+        projectDataOverview.setPreliminaryProjectNum(preliminaryProjectNum);
+        projectDataOverview.setRegisteringNum(registeringNum++);
+
+        /*
+            初赛比例
+         */
+        if (preliminaryProjectNum > 0) {
+            Double preliminaryProportion = new BigDecimal(preliminaryProjectNum).divide(new BigDecimal(preliminaryProjectNum + rematchProjectNum + finalProjectNum), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+            projectDataOverview.setPreliminaryProportion(preliminaryProportion);
+        } else {
+            projectDataOverview.setRematchProportion(0.0);
+        }
+
         /*
             复赛比例
          */
@@ -4335,6 +3652,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             projectDataOverview.setFinalProportion(0.0);
         }
 
+//        //学校数量
+//        Integer matchNum = this.baseMapper.collegeNum();
+//        projectDataOverview.setMatchNum(matchNum);
+
         return projectDataOverview;
     }
 
@@ -4392,7 +3713,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
-                projectJudgeVO.setCollege(projectDO.getCollege());
+//                projectJudgeVO.setCollege(projectDO.getCollege());
 
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                 if (matchDictDO != null) {
@@ -4448,7 +3769,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
-                projectJudgeVO.setCollege(projectDO.getCollege());
+//                projectJudgeVO.setCollege(projectDO.getCollege());
 
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                 if (matchDictDO != null) {
@@ -4594,7 +3915,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         collegeProjectVO.setTelephone(studentDO.getTelephone());
                     }
 
-                    collegeProjectVO.setCollege(projectDO.getCollege());
+//                    collegeProjectVO.setCollege(projectDO.getCollege());
                     collegeProjectVO.setProjectName(projectDO.getProjectName());
                     collegeProjectVO.setProjectGroup(projectDO.getProjectGroup());
                     collegeProjectVO.setApplicationTime(DateFormatUtil.format(DateFormatUtil.localDateTimeToDate(projectDO.getCreateTime()), DateFormatUtil.FMT_sdf_yMd));

src/main/java/com/zhongzhi/service/impl/SmsCodeServiceImpl.java

@@ -84,12 +84,12 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDAO, SmsCodeDO> imple
             throw new HttpException(10024);
         }
 
-        CollegesDictDO collegesDictDO = collegesDictService.getOne(new QueryWrapper<CollegesDictDO>()
-                .lambda()
-                .eq(CollegesDictDO::getName, studentDO.getCollege()));
-        if (collegesDictDO.getLoginStatus() == 0) {
-            throw new HttpException(10067);
-        }
+//        CollegesDictDO collegesDictDO = collegesDictService.getOne(new QueryWrapper<CollegesDictDO>()
+//                .lambda()
+//                .eq(CollegesDictDO::getName, studentDO.getCollege()));
+//        if (collegesDictDO.getLoginStatus() == 0) {
+//            throw new HttpException(10067);
+//        }
 
         int code = RandomUtil.getCode();
         SendSmsResponse sendSmsResponse = aliyunSmsUtil.send(smsCodeDO.getTelephone(), code);

src/main/java/com/zhongzhi/vo/member/ProjectMemberVO.java

@@ -11,6 +11,8 @@ public class ProjectMemberVO {
 
     private Long id;
 
+    private Long projectId;
+
     /**
      * 姓名
      */

src/main/java/com/zhongzhi/vo/project/ProjectDataOverview.java

@@ -20,6 +20,7 @@ public class ProjectDataOverview {
      */
     private Integer projectNum;
 
+    private Integer registeringNum;
     /*
         校级项目申请数量
      */
@@ -30,6 +31,8 @@ public class ProjectDataOverview {
      */
     private Integer preliminaryProjectNum;
 
+    private Double preliminaryProportion;
+
     /*
         复赛项目数量
      */

src/main/java/com/zhongzhi/vo/project/ProjectPageVO.java

@@ -22,6 +22,10 @@ public class ProjectPageVO {
 
     private String projectGroup;
 
+    private String unitTrack;
+
+    private String projectTrack;
+
     private String college;
 
     private String name;

src/main/java/com/zhongzhi/vo/project/SeedTrackProjectDetailVO.java

@@ -136,19 +136,24 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
     private String companyName;
 
     /**
-     * 法人身份
+     * 参赛赛道
      */
-    private String legalPersonStatus;
+    private String projectTrack;
 
     /**
-     * 法人姓名
+     * 单元赛道
      */
-    private String legalPersonName;
+    private String unitTrack;
 
     /**
-     * 职务
+     * 注册时间
      */
-    private String position;
+    private String registerDate;
+
+    /**
+     * 注册地址
+     */
+    private String registerAddress;
 
     /**
      * 注册资金
@@ -156,19 +161,62 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
     private String registerFund;
 
     /**
-     * 注册时间
+     * 营业执照
      */
-    private String registerDate;
+    private String businessLicense;
+
+    private String projectAttachment;
+
+    private String projectAttachmentName;
+
+    private String projectAttachmentType;
 
     /**
-     * 注册省份
+     * 项目PPT
      */
-    private String registerProvince;
+    private String projectPptUrl;
 
     /**
-     * 注册地址
+     * 项目PPT类型
      */
-    private String registerAddress;
+    private String projectPptType;
+
+    /**
+     * 项目PPT名称
+     */
+    private String projectPptName;
+
+    private String identityCertificate;
+
+    /**
+     * 承诺书
+     */
+    private String commitmentLetter;
+
+    /**
+     * 参赛证明书
+     */
+    private String participationCertificate;
+
+    /**
+     * 法人身份
+     */
+    private String legalPersonStatus;
+
+    /**
+     * 法人姓名
+     */
+    private String legalPersonName;
+
+    /**
+     * 职务
+     */
+    private String position;
+
+    /**
+     * 注册省份
+     */
+    private String registerProvince;
 
     /**
      * 统一社会信用代码
@@ -220,21 +268,6 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
      */
     private String investment;
 
-    /**
-     * 项目PPT
-     */
-    private String projectPptUrl;
-
-    /**
-     * 项目PPT类型
-     */
-    private String projectPptType;
-
-    /**
-     * 项目PPT名称
-     */
-    private String projectPptName;
-
     private String email;
 
     private String reviewStatus;

src/main/java/com/zhongzhi/vo/project/SeedTrackProjectPageVO.java

@@ -20,6 +20,10 @@ public class SeedTrackProjectPageVO {
 
     private String major;
 
+    private String projectTrack;
+
+    private String unitTrack;
+
     private String telephone;
 
     private String projectStatus;

src/main/java/com/zhongzhi/vo/project/VocationalNumVO.java

@@ -16,6 +16,12 @@ public class VocationalNumVO {
     private Integer rematchNum;
 
     /**
+     *
+     */
+    private Integer preliminaryProjectNum;
+
+
+    /**
      * 报名阶段
      */
     private Integer registerNum;

src/main/java/com/zhongzhi/vo/project/VocationalProjectInfoVO.java

 package com.zhongzhi.vo.project;
 
-import com.zhongzhi.model.ProjectAwardDO;
-import com.zhongzhi.model.ProjectCopyrightDO;
-import com.zhongzhi.model.ProjectOwnershipStructureDO;
-import com.zhongzhi.model.ProjectPaperDO;
-import com.zhongzhi.model.ProjectPatentDO;
-import com.zhongzhi.model.ProjectTrademarkDO;
-import com.zhongzhi.model.ProjectWorksDO;
+import com.zhongzhi.model.*;
 import lombok.Data;
 import java.util.List;
 
 @Data
-public class VocationalProjectInfoVO {
-
-    private Long id;
-
-    /**
-     * 所属领域
-     */
-    private String itemField;
-
-    /**
-     * 项目LOGO
-     */
-    private String logoUri;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-    /**
-     * 组别
-     */
-    private String projectGroup;
-
-    /**
-     * 赛事年份
-     */
-    private Long matchId;
-
-    /**
-     * 类别
-     */
-    private String classification;
-
-    /**
-     * 所在地址
-     */
-    private String address;
-
-    /**
-     * 项目概述
-     */
-    private String projectIntro;
-
-    /**
-     * 设计背景
-     */
-    private String projectCreativity;
-
-    /**
-     * 科学设计
-     */
-    private String scientificPrinciple;
-
-    /**
-     * 应用前景
-     */
-    private String applicationProspect;
-
-    /**
-     * 路演形式
-     */
-    private String roadShowForm;
-
-    /**
-     * 创意实施或实验所受条件的限制
-     */
-    private String restriction;
-
-    /**
-     * 国家级重大、重点科研项目的科研成果转化项目
-     */
-    private String projectTransform;
-
-    /**
-     * 学校科技成果转化
-     */
-    private String resultTransfer;
-
-    /**
-     * 参赛申报人为科技成果的完成人或所有人
-     */
-    private String competitionOwner;
-
-    /**
-     * 参赛申报人为科技成果的第一完成人或所有人
-     */
-    private String competitionFirst;
-
-    /**
-     * 师生共创
-     */
-    private String bothInvention;
-
-    /**
-     * 项目进展
-     */
-    private String projectProgress;
-
-    /**
-     * 项目阶段
-     */
-    private String projectStage;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 法人身份
-     */
-    private String legalPersonStatus;
-
-    /**
-     * 法人姓名
-     */
-    private String legalPersonName;
-
-    /**
-     * 职务
-     */
-    private String position;
-
-    /**
-     * 注册资金
-     */
-    private String registerFund;
-
-    /**
-     * 注册时间
-     */
-    private String registerDate;
-
-    /**
-     * 注册省份
-     */
-    private String registerProvince;
-
-    /**
-     * 注册地址
-     */
-    private String registerAddress;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String unifyCode;
-
-    /**
-     * 财务报表
-     */
-    private String financialStatement;
-
-    /**
-     * 隐私设置
-     */
-    private String privacySetting;
-
-    /**
-     * 项目状态
-     */
-    private String projectStatus;
-
-    /**
-     * 项目进度
-     */
-    private String projectSchedule;
-
-    /**
-     * 项目类型
-     */
-    private String projectType;
-
-    /**
-     * 上传加盖公章的附件
-     */
-    private String printAttachment;
-
-    /**
-     * 上传加盖公章的附件类型
-     */
-    private String printAttachmentType;
-
-    /**
-     * 上传加盖公章的附件名称
-     */
-    private String printAttachmentName;
-
-    /**
-     * 项目是否获得投资
-     */
-    private String investment;
-
-    /**
-     * 项目PPT
-     */
-    private String projectPptUrl;
-
-    /**
-     * 项目PPT类型
-     */
-    private String projectPptType;
-
-    /**
-     * 项目PPT名称
-     */
-    private String projectPptName;
-
-    /**
-     * 项目材料名称
-     */
-    private String materialsName;
-
-    /**
-     * 项目材料大小
-     */
-    private String materialsSize;
-
-    /**
-     * 项目材料类型
-     */
-    private String materialsType;
-
-    /**
-     * 视频地址
-     */
-    private String vodUrl;
-
-    /**
-     * 项目材料地址
-     */
-    private String materialsUrl;
+public class VocationalProjectInfoVO extends ProjectDO {
 
     private List<ProjectOwnershipStructureDO> Ownership;
 

src/main/resources/application-dev.properties

 # 本地环境配置
 # 端口号
-server.port=11210
+server.port=23503
 # 数据源配置
-spring.datasource.url=jdbc:mysql://116.62.57.92:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+# 数据源配置
+spring.datasource.url=jdbc:mysql://139.224.253.21:3306/gtja?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=devloper
-spring.datasource.password=dev@1553$
+spring.datasource.username=root
+spring.datasource.password=ykhladmin302
 spring.datasource.druid.initialSize=5
 spring.datasource.druid.minIdle=5
 spring.datasource.druid.maxActive=20

src/main/resources/application-prod.properties

 # 生产环境配置
 # 端口号
-server.port=11210
+server.port=23503
 # 数据源配置
-spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/gtja?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.username=ykadmin
+spring.datasource.username=ykadmin_new
 spring.datasource.password=youkedb608@good
 spring.datasource.druid.initialSize=5
 spring.datasource.druid.minIdle=5

src/main/resources/application.properties

 # 环境配置
-spring.profiles.active=prod
+spring.profiles.active=dev
 # 文件编码 UTF8
 spring.mandatory-file-encoding=UTF-8
 spring.jackson.time-zone=GMT+8

src/main/resources/mapper/MatchDictDAO.xml

@@ -26,8 +26,7 @@
         select
         *
         from match_dict
-        where match_type = #{matchType}
-        and delete_time is null
+        where  delete_time is null
     </select>
 
     <select id="getList" resultType="com.zhongzhi.model.MatchDictDO">

src/main/resources/mapper/ProjectDAO.xml

@@ -73,16 +73,18 @@
         p.project_schedule,
         p.project_status,
         p.project_progress,
-        p.college,
         p.edit_status,
-        s.name
+        s.name,
+        p.project_group,
+        s.college,
+        p.project_track,
+        p.unit_track
         from project p
         left join student s on s.id = p.proposer_id
         <where>
             <if test="matchId != null and matchId != ''">
                 and match_id = #{matchId}
             </if>
-            and p.project_type = #{projectType}
             and proposer_id = #{proposerId}
             and s.delete_time is null
             and p.delete_time is null
@@ -124,19 +126,23 @@
         s.name,
         s.major,
         s.telephone,
-        DATE_FORMAT(p.create_time, '%Y-%m-%d') as applicationTime
+        DATE_FORMAT(p.create_time, '%Y-%m-%d') as applicationTime,
+        p.unit_track,
+        p.project_track
         from project p
         left join student s ON s.id = p.proposer_id
         <where>
             and p.match_id = #{matchId}
-            and p.project_type = #{projectType}
             and p.project_status != '填写中'
             <if test="school != null and school != ''">
                 and s.college = #{school}
             </if>
-            <if test="projectGroup != null and projectGroup != '' and projectGroup !='中职/高职'">
+            <if test="projectGroup != null and projectGroup != ''">
                 and p.project_group = #{projectGroup}
             </if>
+            <if test="projectTrack != null and projectTrack != ''">
+                and p.project_track = #{projectTrack}
+            </if>
             <if test="projectSchedule != null and projectSchedule != ''">
                 and p.project_schedule = #{projectSchedule}
             </if>
@@ -421,4 +427,15 @@
             )
     </select>
 
+    <select id="collegeNum" resultType="integer">
+        SELECT
+            count( DISTINCT t2.college )
+        FROM
+            project t
+            LEFT JOIN student t2 ON t.proposer_id = t2.id
+        WHERE
+            t.delete_time IS NULL
+            AND t2.delete_time IS NULL
+    </select>
+
 </mapper>