Skip to content

涂亚平 / guotaijunan

Go to a project
Commit aa064409 by 涂亚平
Options

回家代码同步

1 parent 7fb36d2f
Expand all
Inline Side-by-side
Showing with 226 additions and 641 deletions
pom.xml
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
</repositories> </repositories>
<build> <build>
<finalName>zhongzhi</finalName> <finalName>gtja</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
src/main/java/com/zhongzhi/common/configure/SwaggerConfig.java
...@@ -30,7 +30,7 @@ public class SwaggerConfig { ...@@ -30,7 +30,7 @@ public class SwaggerConfig {
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build() .build()
.apiInfo(new ApiInfoBuilder() .apiInfo(new ApiInfoBuilder()
.title("中职双创系统") .title("国泰君安")
.description("接口文档") .description("接口文档")
.version("1.0") .version("1.0")
.build()); .build());
......
src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java
...@@ -14,7 +14,7 @@ public class ProjectSchedule { ...@@ -14,7 +14,7 @@ public class ProjectSchedule {
public static final String REGISTER = "报名阶段"; public static final String REGISTER = "报名阶段";
// 校内赛 // 校内赛
public static final String SCHOOL_REVIEW = "校级申请项目"; public static final String SCHOOL_REVIEW = "市级初赛项目";
// public static final String PRELIMINARY_REVIEW = "市级初赛项目"; // public static final String PRELIMINARY_REVIEW = "市级初赛项目";
......
src/main/java/com/zhongzhi/common/constant/ProjectStatus.java
...@@ -22,11 +22,13 @@ public class ProjectStatus { ...@@ -22,11 +22,13 @@ public class ProjectStatus {
public static final String PRELIMINARY_NOT_PASSED = "不予提交市级初赛"; 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 { ...@@ -17,7 +17,7 @@ public class ProjectType {
public static final String SEED_TRACK = "种子赛道"; 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 { ...@@ -40,14 +40,14 @@ public class AdministerController {
@PostMapping(value = "/getAdministerPage") @PostMapping(value = "/getAdministerPage")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数") @ApiOperation("####中心端 --- 成员管理分页查询：listItem/角色、 username/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
public ResponseVO getAdministerPage(@RequestBody AdministerPageDTO administerPageDTO) { public ResponseVO getAdministerPage(@RequestBody AdministerPageDTO administerPageDTO) {
return ResponseData.generateCreatedResponse(0, administerService.getAdministerPage(administerPageDTO)); return ResponseData.generateCreatedResponse(0, administerService.getAdministerPage(administerPageDTO));
} }
@PostMapping(value = "/createAdminister") @PostMapping(value = "/createAdminister")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色") @ApiOperation("####中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色")
public ResponseVO createAdminister(@RequestBody AdministerDO administerDO) { public ResponseVO createAdminister(@RequestBody AdministerDO administerDO) {
administerService.save(administerDO); administerService.save(administerDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -55,7 +55,7 @@ public class AdministerController { ...@@ -55,7 +55,7 @@ public class AdministerController {
@PostMapping(value = "/updateAdminister") @PostMapping(value = "/updateAdminister")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色") @ApiOperation("####中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色")
public ResponseVO updateAdminister(@RequestBody AdministerDO administerDO) { public ResponseVO updateAdminister(@RequestBody AdministerDO administerDO) {
administerService.updateById(administerDO); administerService.updateById(administerDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -63,7 +63,7 @@ public class AdministerController { ...@@ -63,7 +63,7 @@ public class AdministerController {
@PostMapping(value = "/deleteById") @PostMapping(value = "/deleteById")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 --- 删除成员：id/成员ID") @ApiOperation("####中心端 --- 删除成员：id/成员ID")
public ResponseVO delete(@RequestBody AdministerDO administerDO) { public ResponseVO delete(@RequestBody AdministerDO administerDO) {
administerService.removeById(administerDO.getId()); administerService.removeById(administerDO.getId());
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
......
src/main/java/com/zhongzhi/controller/CollegesDictController.java
...@@ -40,7 +40,7 @@ public class CollegesDictController { ...@@ -40,7 +40,7 @@ public class CollegesDictController {
public CollegesDictService collegesDictService; public CollegesDictService collegesDictService;
@PostMapping(value = "/getCollegesList") @PostMapping(value = "/getCollegesList")
@ApiOperation("查询所有就读院校: name/院校名称, education/学历") @ApiOperation("####查询所有就读院校: name/院校名称, education/学历")
public ResponseVO getCollegesList(@RequestBody CollegesDictDTO collegesDictDTO) { public ResponseVO getCollegesList(@RequestBody CollegesDictDTO collegesDictDTO) {
QueryWrapper<CollegesDictDO> queryWrapper = new QueryWrapper(); QueryWrapper<CollegesDictDO> queryWrapper = new QueryWrapper();
if (StringUtils.isNotBlank(collegesDictDTO.getEducation())) { if (StringUtils.isNotBlank(collegesDictDTO.getEducation())) {
...@@ -65,8 +65,8 @@ public class CollegesDictController { ...@@ -65,8 +65,8 @@ public class CollegesDictController {
} }
@PostMapping(value = "updateCollegeById") @PostMapping(value = "updateCollegeById")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center,Platform.school})
@ApiOperation("院校端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码") @ApiOperation("####院校端，中心端 --- 更新院校信息: id/ID, account/账户,code/代码, name/名称, password/密码")
public ResponseVO updateCollegeById(@RequestBody CollegesDictDO collegesDictDO) { public ResponseVO updateCollegeById(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.updateById(collegesDictDO); collegesDictService.updateById(collegesDictDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -194,14 +194,14 @@ public class CollegesDictController { ...@@ -194,14 +194,14 @@ public class CollegesDictController {
@PostMapping(value = "/getCollegesPage") @PostMapping(value = "/getCollegesPage")
@LoginRequired(Platform.center) @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数") @ApiOperation("####中心端 --- 院校名录分页查询: name/搜索名称, pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getCollegesPage(@RequestBody CollegesPageDTO collegesPageDTO) { public ResponseVO getCollegesPage(@RequestBody CollegesPageDTO collegesPageDTO) {
return ResponseData.generateCreatedResponse(0, collegesDictService.getCollegesPage(collegesPageDTO)); return ResponseData.generateCreatedResponse(0, collegesDictService.getCollegesPage(collegesPageDTO));
} }
@PostMapping(value = "/createColleges") @PostMapping(value = "/createColleges")
@LoginRequired(Platform.center) @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号") @ApiOperation("####中心端 --- 新建院校: name/搜索名称, code/院校代码、 phone/手机号")
public ResponseVO createColleges(@RequestBody CollegesDictDO collegesDictDO) { public ResponseVO createColleges(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.createColleges(collegesDictDO); collegesDictService.createColleges(collegesDictDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -209,7 +209,7 @@ public class CollegesDictController { ...@@ -209,7 +209,7 @@ public class CollegesDictController {
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@LoginRequired(Platform.center) @LoginRequired(Platform.center)
@ApiOperation("中心端 --- 删除院校: id/院校ID") @ApiOperation("####中心端 --- 删除院校: id/院校ID")
public ResponseVO delete(@RequestBody CollegesDictDO collegesDictDO) { public ResponseVO delete(@RequestBody CollegesDictDO collegesDictDO) {
collegesDictService.removeById(collegesDictDO.getId()); collegesDictService.removeById(collegesDictDO.getId());
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -246,7 +246,7 @@ public class CollegesDictController { ...@@ -246,7 +246,7 @@ public class CollegesDictController {
@PostMapping(value = "/exportCollege") @PostMapping(value = "/exportCollege")
@LoginRequired(Platform.center) @LoginRequired(Platform.center)
@ApiOperation("导出院校名录") @ApiOperation("####导出院校名录")
public ResponseVO exportCollege() { public ResponseVO exportCollege() {
collegesDictService.exportCollege(); collegesDictService.exportCollege();
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
......
src/main/java/com/zhongzhi/controller/MajorDictController.java
...@@ -33,7 +33,7 @@ public class MajorDictController { ...@@ -33,7 +33,7 @@ public class MajorDictController {
private MajorDictService majorDictService; private MajorDictService majorDictService;
@PostMapping(value = "/getMajorList") @PostMapping(value = "/getMajorList")
@ApiOperation("查询全部就读专业: major/专业名称、education/学历、code/院校代码") @ApiOperation("####查询全部就读专业: major/专业名称、education/学历、code/院校代码")
public ResponseVO getMajorList(@RequestBody MajorDictDO majorDictDO) { public ResponseVO getMajorList(@RequestBody MajorDictDO majorDictDO) {
return ResponseData.generateCreatedResponse(0, majorDictService.list(new QueryWrapper<MajorDictDO>() return ResponseData.generateCreatedResponse(0, majorDictService.list(new QueryWrapper<MajorDictDO>()
.lambda() .lambda()
......
src/main/java/com/zhongzhi/controller/MatchDictController.java
...@@ -114,17 +114,16 @@ public class MatchDictController { ...@@ -114,17 +114,16 @@ public class MatchDictController {
@PostMapping(value = "/createVocationalMatch") @PostMapping(value = "/createVocationalMatch")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" + @ApiOperation("####中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
"schedule:[{ scheduleTime/时间安排、explains/说明 }]") "schedule:[{ scheduleTime/时间安排、explains/说明 }]")
public ResponseVO createVocationalMatch(@RequestBody MatchDictDTO matchDictDTO) { public ResponseVO createVocationalMatch(@RequestBody MatchDictDTO matchDictDTO) {
matchDictDTO.setMatchType(ProjectType.VOCATIONAL);
matchDictService.createMatch(matchDictDTO); matchDictService.createMatch(matchDictDTO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
} }
@PostMapping(value = "/updateMatch") @PostMapping(value = "/updateMatch")
@LoginRequired({Platform.center}) @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/说明 }]") "schedule:[{ id/时间安排ID、scheduleTime/时间安排、explains/说明 }]")
public ResponseVO updateMatch(@RequestBody MatchDictDTO matchDictDTO) { public ResponseVO updateMatch(@RequestBody MatchDictDTO matchDictDTO) {
matchDictService.updateMatch(matchDictDTO); matchDictService.updateMatch(matchDictDTO);
...@@ -133,7 +132,7 @@ public class MatchDictController { ...@@ -133,7 +132,7 @@ public class MatchDictController {
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---删除赛事年份：id/ID") @ApiOperation("####中心端 ---删除赛事年份：id/ID")
public ResponseVO delete(@RequestBody MatchDictDO matchDictDO) { public ResponseVO delete(@RequestBody MatchDictDO matchDictDO) {
matchDictService.removeById(matchDictDO.getId()); matchDictService.removeById(matchDictDO.getId());
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -159,17 +158,15 @@ public class MatchDictController { ...@@ -159,17 +158,15 @@ public class MatchDictController {
@PostMapping(value = "/getVocationalMatchAll") @PostMapping(value = "/getVocationalMatchAll")
@LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review}) @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
@ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份") @ApiOperation("####中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
public ResponseVO getVocationalMatchAll() { public ResponseVO getVocationalMatchAll() {
return ResponseData.generateCreatedResponse(0, matchDictService.list(new QueryWrapper<MatchDictDO>() return ResponseData.generateCreatedResponse(0, matchDictService.list(null));
.lambda()
.eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)));
} }
/* 职教管理端 */ /* 职教管理端 */
@PostMapping(value = "/getVocationalPage") @PostMapping(value = "/getVocationalPage")
@LoginRequired({Platform.center, Platform.school, Platform.review}) @LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize") @ApiOperation("####中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
public ResponseVO getVocationalPage(@RequestBody SelectListPageDTO selectListPageDTO) { public ResponseVO getVocationalPage(@RequestBody SelectListPageDTO selectListPageDTO) {
return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalPage(selectListPageDTO)); return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalPage(selectListPageDTO));
} }
......
src/main/java/com/zhongzhi/controller/MatchScheduleController.java
...@@ -66,7 +66,6 @@ public class MatchScheduleController { ...@@ -66,7 +66,6 @@ public class MatchScheduleController {
MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>() MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
.lambda() .lambda()
.eq(MatchDictDO::getId, matchScheduleDO.getMatchId()) .eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
.eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL)
.eq(MatchDictDO::getStatus, 1)); .eq(MatchDictDO::getStatus, 1));
List<MatchScheduleDO> list = new ArrayList<>(); List<MatchScheduleDO> list = new ArrayList<>();
if (matchDictDO != null) { if (matchDictDO != null) {
......
src/main/java/com/zhongzhi/controller/MessageController.java
...@@ -43,7 +43,7 @@ public class MessageController { ...@@ -43,7 +43,7 @@ public class MessageController {
private MessageService messageService; private MessageService messageService;
@PostMapping(value = "/getMessage") @PostMapping(value = "/getMessage")
@ApiOperation("查询通知") @ApiOperation("####查询通知")
public ResponseVO getMessage() { public ResponseVO getMessage() {
List<MessageVO> messages = new ArrayList(); List<MessageVO> messages = new ArrayList();
...@@ -68,14 +68,14 @@ public class MessageController { ...@@ -68,14 +68,14 @@ public class MessageController {
@PostMapping(value = "/getMessagePage") @PostMapping(value = "/getMessagePage")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数") @ApiOperation("####中心端 ---分页查询通知: pageNo/当前页数, pageSize/每页显示条数")
public ResponseVO getMessagePage(@RequestBody MessagePageDTO messagePageDTO) { public ResponseVO getMessagePage(@RequestBody MessagePageDTO messagePageDTO) {
return ResponseData.generateCreatedResponse(0, messageService.getMessagePage(messagePageDTO)); return ResponseData.generateCreatedResponse(0, messageService.getMessagePage(messagePageDTO));
} }
@PostMapping(value = "/createMessage") @PostMapping(value = "/createMessage")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型") @ApiOperation("####中心端 ---创建通知: title/标题, content/内容, attachmentUrl/附件地址, releaseTime/发布时间, attachmentName/附件名称, attachmentType/附件类型")
public ResponseVO createMessage(@RequestBody MessageDO messageDO) { public ResponseVO createMessage(@RequestBody MessageDO messageDO) {
messageService.createMessage(messageDO); messageService.createMessage(messageDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -83,7 +83,7 @@ public class MessageController { ...@@ -83,7 +83,7 @@ public class MessageController {
@PostMapping(value = "/updateMessage") @PostMapping(value = "/updateMessage")
@LoginRequired({Platform.center}) @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) { public ResponseVO updateMessage(@RequestBody MessageDO messageDO) {
messageService.updateById(messageDO); messageService.updateById(messageDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -91,7 +91,7 @@ public class MessageController { ...@@ -91,7 +91,7 @@ public class MessageController {
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---删除通知: id/ID, ") @ApiOperation("####中心端 ---删除通知: id/ID, ")
public ResponseVO delete(@RequestBody MessageDO messageDO) { public ResponseVO delete(@RequestBody MessageDO messageDO) {
messageService.removeById(messageDO.getId()); messageService.removeById(messageDO.getId());
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
......
src/main/java/com/zhongzhi/controller/ProjectJudgeController.java
...@@ -41,14 +41,14 @@ public class ProjectJudgeController { ...@@ -41,14 +41,14 @@ public class ProjectJudgeController {
@PostMapping(value = "/getProjectJudgePage") @PostMapping(value = "/getProjectJudgePage")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数") @ApiOperation("####中心端 ---评委列表：username/姓名、status/状态、pageNo/当前页数、 pageSize/每页显示条数")
public ResponseVO getProjectJudgePage(@RequestBody ProjectJudgePageDTO projectJudgePageDTO) { public ResponseVO getProjectJudgePage(@RequestBody ProjectJudgePageDTO projectJudgePageDTO) {
return ResponseData.generateCreatedResponse(0, projectJudgeService.getProjectJudgePage(projectJudgePageDTO)); return ResponseData.generateCreatedResponse(0, projectJudgeService.getProjectJudgePage(projectJudgePageDTO));
} }
@PostMapping(value = "/createProjectJudge") @PostMapping(value = "/createProjectJudge")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---添加评委：username/姓名、telephone/手机号、 position/职位、unit/单位") @ApiOperation("####中心端 ---添加评委：username/姓名、telephone/手机号、 position/职位、unit/单位")
public ResponseVO createProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) { public ResponseVO createProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
projectJudgeService.createProjectJudge(projectJudgeDO); projectJudgeService.createProjectJudge(projectJudgeDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -56,7 +56,7 @@ public class ProjectJudgeController { ...@@ -56,7 +56,7 @@ public class ProjectJudgeController {
@PostMapping(value = "/updateProjectJudge") @PostMapping(value = "/updateProjectJudge")
@LoginRequired({Platform.center}) @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) { public ResponseVO updateProjectJudge(@RequestBody ProjectJudgeDO projectJudgeDO) {
projectJudgeService.updateProjectJudge(projectJudgeDO); projectJudgeService.updateProjectJudge(projectJudgeDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -64,7 +64,7 @@ public class ProjectJudgeController { ...@@ -64,7 +64,7 @@ public class ProjectJudgeController {
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---删除评委：id/ID") @ApiOperation("####中心端 ---删除评委：id/ID")
public ResponseVO delete(@RequestBody ProjectJudgeDO projectJudgeDO) { public ResponseVO delete(@RequestBody ProjectJudgeDO projectJudgeDO) {
projectJudgeService.removeById(projectJudgeDO.getId()); projectJudgeService.removeById(projectJudgeDO.getId());
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -79,7 +79,7 @@ public class ProjectJudgeController { ...@@ -79,7 +79,7 @@ public class ProjectJudgeController {
@PostMapping(value = "/downloadJudgeTemplate") @PostMapping(value = "/downloadJudgeTemplate")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---下载导入评委模板") @ApiOperation("####中心端 ---下载导入评委模板")
public ResponseVO downloadJudgeTemplate() { public ResponseVO downloadJudgeTemplate() {
projectJudgeService.downloadTemplate(); projectJudgeService.downloadTemplate();
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -87,7 +87,7 @@ public class ProjectJudgeController { ...@@ -87,7 +87,7 @@ public class ProjectJudgeController {
@PostMapping(value = "/importJudge") @PostMapping(value = "/importJudge")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---导入评委：file/文件（数据格式：Form-Data）") @ApiOperation("####中心端 ---导入评委：file/文件（数据格式：Form-Data）")
public ResponseVO importJudge(MultipartFile file) { public ResponseVO importJudge(MultipartFile file) {
projectJudgeService.importJudge(file); projectJudgeService.importJudge(file);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -95,7 +95,7 @@ public class ProjectJudgeController { ...@@ -95,7 +95,7 @@ public class ProjectJudgeController {
@PostMapping(value = "/exportProjectJudge") @PostMapping(value = "/exportProjectJudge")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("中心端 ---导出评委") @ApiOperation("####中心端 ---导出评委")
public void exportProjectJudge() { public void exportProjectJudge() {
projectJudgeService.exportProjectJudge(); projectJudgeService.exportProjectJudge();
} }
......
src/main/java/com/zhongzhi/controller/ProjectReviewPeriodController.java
...@@ -33,7 +33,7 @@ public class ProjectReviewPeriodController { ...@@ -33,7 +33,7 @@ public class ProjectReviewPeriodController {
@PostMapping(value = "/getProjectReviewPeriod") @PostMapping(value = "/getProjectReviewPeriod")
@LoginRequired({Platform.center, Platform.school, Platform.review}) @LoginRequired({Platform.center, Platform.school, Platform.review})
@ApiOperation("中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）") @ApiOperation("####中心端（种子赛道、职教赛道） --- 查询评审时间：matchId/赛事年份ID、projectGroup/项目组别（科技创新组、红色文创组、高职、中职）、projectSchedule/项目进度（市级初赛、市级复赛、市级决赛）")
public ResponseVO getProjectReviewPeriod(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) { public ResponseVO getProjectReviewPeriod(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) {
return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO)); return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO));
} }
......
src/main/java/com/zhongzhi/controller/SmsCodeController.java
...@@ -32,14 +32,14 @@ public class SmsCodeController { ...@@ -32,14 +32,14 @@ public class SmsCodeController {
private SmsCodeService smsCodeService; private SmsCodeService smsCodeService;
@PostMapping(value = "/sendRegisterCode") @PostMapping(value = "/sendRegisterCode")
@ApiOperation("学生端 ---注册验证码：telephone/手机号") @ApiOperation("####学生端 ---注册验证码：telephone/手机号")
public ResponseVO sendRegisterCode(@RequestBody SmsCodeDO smsCodeDO) { public ResponseVO sendRegisterCode(@RequestBody SmsCodeDO smsCodeDO) {
smsCodeService.sendRegisterCode(smsCodeDO); smsCodeService.sendRegisterCode(smsCodeDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
} }
@PostMapping(value = "/sendStudentLoginCode") @PostMapping(value = "/sendStudentLoginCode")
@ApiOperation("学生端 ---登陆验证码：telephone/手机号") @ApiOperation("####学生端 ---登陆验证码：telephone/手机号")
public ResponseVO sendStudentLoginCode(@RequestBody SmsCodeDO smsCodeDO) { public ResponseVO sendStudentLoginCode(@RequestBody SmsCodeDO smsCodeDO) {
smsCodeService.sendStudentLoginCode(smsCodeDO); smsCodeService.sendStudentLoginCode(smsCodeDO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
......
src/main/java/com/zhongzhi/controller/SmsNoticeController.java
...@@ -35,7 +35,7 @@ public class SmsNoticeController { ...@@ -35,7 +35,7 @@ public class SmsNoticeController {
@PostMapping(value = "batchSend") @PostMapping(value = "batchSend")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称") @ApiOperation("####管理端 -- 批量发送短信：matchId/赛事年份ID、projectGroup/组别、projectSchedule/阶段、projectStatus/状态、name/搜索名称")
public ResponseVO batchSend(@RequestBody SmsNoticeDTO smsNoticeDTO) { public ResponseVO batchSend(@RequestBody SmsNoticeDTO smsNoticeDTO) {
smsNoticeService.batchSend(smsNoticeDTO); smsNoticeService.batchSend(smsNoticeDTO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -43,7 +43,7 @@ public class SmsNoticeController { ...@@ -43,7 +43,7 @@ public class SmsNoticeController {
@PostMapping(value = "send") @PostMapping(value = "send")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("管理端 -- 发送短信：ids/项目ID（数组）") @ApiOperation("####管理端 -- 发送短信：ids/项目ID（数组）")
public ResponseVO send(@RequestBody SmsNoticeDTO smsNoticeDTO) { public ResponseVO send(@RequestBody SmsNoticeDTO smsNoticeDTO) {
smsNoticeService.send(smsNoticeDTO); smsNoticeService.send(smsNoticeDTO);
return ResponseData.generateCreatedResponse(0); return ResponseData.generateCreatedResponse(0);
...@@ -51,7 +51,7 @@ public class SmsNoticeController { ...@@ -51,7 +51,7 @@ public class SmsNoticeController {
@PostMapping(value = "getListByPage") @PostMapping(value = "getListByPage")
@LoginRequired({Platform.center}) @LoginRequired({Platform.center})
@ApiOperation("管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize") @ApiOperation("####管理端 -- 发送短信记录：date/日期、name/搜索名称、pageNo、pageSize")
public ResponseVO getListByPage(@RequestBody SmsNoticePageDTO smsNoticePageDTO) { public ResponseVO getListByPage(@RequestBody SmsNoticePageDTO smsNoticePageDTO) {
return ResponseData.generateCreatedResponse(0, smsNoticeService.getListByPage(smsNoticePageDTO)); return ResponseData.generateCreatedResponse(0, smsNoticeService.getListByPage(smsNoticePageDTO));
} }
......
src/main/java/com/zhongzhi/controller/StudentController.java
...@@ -33,14 +33,14 @@ public class StudentController { ...@@ -33,14 +33,14 @@ public class StudentController {
private StudentService studentService; private StudentService studentService;
@PostMapping(value = "/register") @PostMapping(value = "/register")
@ApiOperation("注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " + @ApiOperation("####注册：name/真实姓名, idCard/身份证, telephone/手机号, code/验证码, " +
"education/学历层次, school/就读院校, major/就读专业, enrollmentDate/入学年份, graduateDate/毕业年份") "education/学历层次, school/就读院校, major/就读专业, enrollmentDate/入学年份, graduateDate/毕业年份")
public ResponseVO register(@RequestBody RegisterDTO registerDTO) { public ResponseVO register(@RequestBody RegisterDTO registerDTO) {
return ResponseData.generateCreatedResponse(0, studentService.register(registerDTO)); return ResponseData.generateCreatedResponse(0, studentService.register(registerDTO));
} }
@PostMapping(value = "/login") @PostMapping(value = "/login")
@ApiOperation("登陆：telephone/手机号, code/验证码") @ApiOperation("####登陆：telephone/手机号, code/验证码")
public ResponseVO login(@RequestBody LoginDTO loginDTO) { public ResponseVO login(@RequestBody LoginDTO loginDTO) {
return ResponseData.generateCreatedResponse(0, studentService.login(loginDTO)); return ResponseData.generateCreatedResponse(0, studentService.login(loginDTO));
} }
......
src/main/java/com/zhongzhi/controller/YearDictController.java
...@@ -31,7 +31,7 @@ public class YearDictController { ...@@ -31,7 +31,7 @@ public class YearDictController {
private YearDictService yearDictService; private YearDictService yearDictService;
@PostMapping("queryYears") @PostMapping("queryYears")
@ApiOperation("查询年份") @ApiOperation("####查询年份")
public ResponseVO queryYears(){ public ResponseVO queryYears(){
return ResponseData.generateCreatedResponse(0,yearDictService.queryYears()); return ResponseData.generateCreatedResponse(0,yearDictService.queryYears());
} }
......
src/main/java/com/zhongzhi/dao/MatchDictDAO.java
...@@ -21,7 +21,7 @@ import java.util.List; ...@@ -21,7 +21,7 @@ import java.util.List;
@Repository @Repository
public interface MatchDictDAO extends BaseMapper<MatchDictDO> { 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); 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; ...@@ -21,13 +21,13 @@ import java.util.List;
@Repository @Repository
public interface ProjectDAO extends BaseMapper<ProjectDO> { 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, IPage<MainTrackProjectPageVO> getMainTrackProjectPage(Page page, Long matchId, String projectGroup, @Param("type") String type, @Param("projectType") String projectType,
String projectSchedule, String projectSchedule,
String projectStatus, String itemField, @Param("name") String name); 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, @Param("school") String school, String projectSchedule,
String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress); String projectStatus, String itemField, @Param("name") String name,@Param("projectProgress") String projectProgress);
...@@ -52,4 +52,6 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> { ...@@ -52,4 +52,6 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> {
List<ProjectDO> getProjectById(@Param("ids") Long[] ids); List<ProjectDO> getProjectById(@Param("ids") Long[] ids);
List<ProjectDO> projects(Long matchId,Long collegeId,String college); 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; package com.zhongzhi.dto.project;
import com.zhongzhi.model.ProjectAwardDO; import com.zhongzhi.model.*;
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 lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class CreateVocationalProjectDTO { public class CreateVocationalProjectDTO extends ProjectDO {
private Long id; 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; private List<ProjectOwnershipStructureDO> ownership;
......
src/main/java/com/zhongzhi/dto/project/DataOverviewDTO.java
...@@ -8,4 +8,6 @@ public class DataOverviewDTO { ...@@ -8,4 +8,6 @@ public class DataOverviewDTO {
private String projectGroup; private String projectGroup;
private String projectType; private String projectType;
private Long matchId;
} }
src/main/java/com/zhongzhi/dto/project/ProjectListPageDTO.java
...@@ -11,6 +11,8 @@ public class ProjectListPageDTO { ...@@ -11,6 +11,8 @@ public class ProjectListPageDTO {
private String projectGroup; private String projectGroup;
private String projectTrack;
private String itemField; private String itemField;
private String name; private String name;
......
src/main/java/com/zhongzhi/model/ProjectDO.java
...@@ -34,19 +34,24 @@ public class ProjectDO extends BaseModel { ...@@ -34,19 +34,24 @@ public class ProjectDO extends BaseModel {
private Long proposerId; 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 { ...@@ -59,74 +64,62 @@ public class ProjectDO extends BaseModel {
private Long matchId; 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 projectAttachment;
* 科学设计
*/
private String scientificPrinciple;
/** private String projectAttachmentName;
* 应用前景
*/
private String applicationProspect;
/** private String projectAttachmentType;
* 路演形式
*/
private String roadShowForm;
/** /**
* 创意实施或实验所受条件的限制 * 项目PPT
*/ */
private String restriction; private String projectPptUrl;
/** /**
* 国家级重大、重点科研项目的科研成果转化项目 * 项目PPT类型
*/ */
private String projectTransform; private String projectPptType;
/** /**
* 学校科技成果转化 * 项目PPT名称
*/ */
private String resultTransfer; private String projectPptName;
/** private String identityCertificate;
* 参赛申报人为科技成果的完成人或所有人
*/
private String competitionOwner;
/** /**
* 参赛申报人为科技成果的第一完成人或所有人 * 承诺书
*/ */
private String competitionFirst; private String commitmentLetter;
/** /**
* 师生共创 * 参赛证明书
*/ */
private String bothInvention; private String participationCertificate;
/** /**
* 项目进展 * 项目进展
...@@ -139,61 +132,6 @@ public class ProjectDO extends BaseModel { ...@@ -139,61 +132,6 @@ public class ProjectDO extends BaseModel {
private String projectStage; 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 projectStatus;
...@@ -209,41 +147,6 @@ public class ProjectDO extends BaseModel { ...@@ -209,41 +147,6 @@ public class ProjectDO extends BaseModel {
private String projectType; 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; private String projectReview;
...@@ -255,8 +158,5 @@ public class ProjectDO extends BaseModel { ...@@ -255,8 +158,5 @@ public class ProjectDO extends BaseModel {
private Integer editStatus; 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; ...@@ -25,7 +25,7 @@ import java.util.List;
*/ */
public interface ProjectService extends IService<ProjectDO> { public interface ProjectService extends IService<ProjectDO> {
IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO); // IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO);
void createMainTrackProject(CreateMainTrackProjectDTO createMainTrackProjectDTO); void createMainTrackProject(CreateMainTrackProjectDTO createMainTrackProjectDTO);
...@@ -33,7 +33,7 @@ public interface ProjectService extends IService<ProjectDO> { ...@@ -33,7 +33,7 @@ public interface ProjectService extends IService<ProjectDO> {
void withdrawn(ProjectDO projectDO); void withdrawn(ProjectDO projectDO);
IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO); // IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO);
void createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO); void createSeedTrackProject(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
...@@ -49,9 +49,9 @@ public interface ProjectService extends IService<ProjectDO> { ...@@ -49,9 +49,9 @@ public interface ProjectService extends IService<ProjectDO> {
MainTrackProjectDetailVO getMainTrackProjectDetail(Long id); MainTrackProjectDetailVO getMainTrackProjectDetail(Long id);
IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO); // IPage getSeedTrackProjectPage(ProjectListPageDTO projectListPageDTO);
IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO); // IPage getSeedTrackProjectList(ProjectListPageDTO projectListPageDTO);
void downloadPDF(String projectGroup); void downloadPDF(String projectGroup);
...@@ -85,7 +85,7 @@ public interface ProjectService extends IService<ProjectDO> { ...@@ -85,7 +85,7 @@ public interface ProjectService extends IService<ProjectDO> {
void submitted(ProjectReviewScoreDTO projectReviewScoreDTO); void submitted(ProjectReviewScoreDTO projectReviewScoreDTO);
ProjectMemberVO getProjectMember(String projectGroup); ProjectMemberVO getProjectMember();
ProjectDataOverview getCollegeDataOverview(DataOverviewDTO dataOverviewDTO); ProjectDataOverview getCollegeDataOverview(DataOverviewDTO dataOverviewDTO);
...@@ -125,6 +125,8 @@ public interface ProjectService extends IService<ProjectDO> { ...@@ -125,6 +125,8 @@ public interface ProjectService extends IService<ProjectDO> {
void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO); void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
void confirm(ProjectDO projectDO);
void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO); void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
ProjectDataOverview getVocationalDataOverview(DataOverviewDTO dataOverviewDTO); ProjectDataOverview getVocationalDataOverview(DataOverviewDTO dataOverviewDTO);
...@@ -141,7 +143,7 @@ public interface ProjectService extends IService<ProjectDO> { ...@@ -141,7 +143,7 @@ public interface ProjectService extends IService<ProjectDO> {
IPage getVocationalProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO); IPage getVocationalProjectReviewPage(ProjectReviewPageDTO projectReviewPageDTO);
void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO); // void importVocationalProject(ImportVocationalProjectDTO importVocationalProjectDTO);
VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO); VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
......
src/main/java/com/zhongzhi/service/impl/MatchDictServiceImpl.java
...@@ -107,7 +107,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO> ...@@ -107,7 +107,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
@Override @Override
public IPage<MatchDictVO> getSeedTrackMatchPage(SelectListPageDTO selectListPageDTO) { public IPage<MatchDictVO> getSeedTrackMatchPage(SelectListPageDTO selectListPageDTO) {
Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize()); 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()) { for (MatchDictVO record : iPage.getRecords()) {
List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>() List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>()
.lambda() .lambda()
...@@ -145,8 +145,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO> ...@@ -145,8 +145,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
public MatchDictDO getVocationalMatch() { public MatchDictDO getVocationalMatch() {
return this.baseMapper.selectOne(new QueryWrapper<MatchDictDO>() return this.baseMapper.selectOne(new QueryWrapper<MatchDictDO>()
.lambda() .lambda()
.eq(MatchDictDO::getStatus, 1) .eq(MatchDictDO::getStatus, 1));
.eq(MatchDictDO::getMatchType, ProjectType.VOCATIONAL));
} }
public void updateMatchDate(MatchDictDO matchDictDO) { public void updateMatchDate(MatchDictDO matchDictDO) {
...@@ -165,7 +164,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO> ...@@ -165,7 +164,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
@Override @Override
public IPage getVocationalPage(SelectListPageDTO selectListPageDTO) { public IPage getVocationalPage(SelectListPageDTO selectListPageDTO) {
Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize()); 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()) { for (MatchDictVO record : iPage.getRecords()) {
List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>() List<MatchScheduleDO> list = matchScheduleService.list(new QueryWrapper<MatchScheduleDO>()
.lambda() .lambda()
......
src/main/java/com/zhongzhi/service/impl/SmsCodeServiceImpl.java
...@@ -84,12 +84,12 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDAO, SmsCodeDO> imple ...@@ -84,12 +84,12 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDAO, SmsCodeDO> imple
throw new HttpException(10024); throw new HttpException(10024);
} }
CollegesDictDO collegesDictDO = collegesDictService.getOne(new QueryWrapper<CollegesDictDO>() // CollegesDictDO collegesDictDO = collegesDictService.getOne(new QueryWrapper<CollegesDictDO>()
.lambda() // .lambda()
.eq(CollegesDictDO::getName, studentDO.getCollege())); // .eq(CollegesDictDO::getName, studentDO.getCollege()));
if (collegesDictDO.getLoginStatus() == 0) { // if (collegesDictDO.getLoginStatus() == 0) {
throw new HttpException(10067); // throw new HttpException(10067);
} // }
int code = RandomUtil.getCode(); int code = RandomUtil.getCode();
SendSmsResponse sendSmsResponse = aliyunSmsUtil.send(smsCodeDO.getTelephone(), code); SendSmsResponse sendSmsResponse = aliyunSmsUtil.send(smsCodeDO.getTelephone(), code);
......
src/main/java/com/zhongzhi/vo/member/ProjectMemberVO.java
...@@ -11,6 +11,8 @@ public class ProjectMemberVO { ...@@ -11,6 +11,8 @@ public class ProjectMemberVO {
private Long id; private Long id;
private Long projectId;
/** /**
* 姓名 * 姓名
*/ */
......
src/main/java/com/zhongzhi/vo/project/ProjectDataOverview.java
...@@ -20,6 +20,7 @@ public class ProjectDataOverview { ...@@ -20,6 +20,7 @@ public class ProjectDataOverview {
*/ */
private Integer projectNum; private Integer projectNum;
private Integer registeringNum;
/* /*
校级项目申请数量 校级项目申请数量
*/ */
...@@ -30,6 +31,8 @@ public class ProjectDataOverview { ...@@ -30,6 +31,8 @@ public class ProjectDataOverview {
*/ */
private Integer preliminaryProjectNum; private Integer preliminaryProjectNum;
private Double preliminaryProportion;
/* /*
复赛项目数量 复赛项目数量
*/ */
......
src/main/java/com/zhongzhi/vo/project/ProjectPageVO.java
...@@ -22,6 +22,10 @@ public class ProjectPageVO { ...@@ -22,6 +22,10 @@ public class ProjectPageVO {
private String projectGroup; private String projectGroup;
private String unitTrack;
private String projectTrack;
private String college; private String college;
private String name; private String name;
......
src/main/java/com/zhongzhi/vo/project/SeedTrackProjectDetailVO.java
...@@ -136,19 +136,24 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO { ...@@ -136,19 +136,24 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
private String companyName; 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 { ...@@ -156,19 +161,62 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
private String registerFund; 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 { ...@@ -220,21 +268,6 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
*/ */
private String investment; private String investment;
/**
* 项目PPT
*/
private String projectPptUrl;
/**
* 项目PPT类型
*/
private String projectPptType;
/**
* 项目PPT名称
*/
private String projectPptName;
private String email; private String email;
private String reviewStatus; private String reviewStatus;
......
src/main/java/com/zhongzhi/vo/project/SeedTrackProjectPageVO.java
...@@ -20,6 +20,10 @@ public class SeedTrackProjectPageVO { ...@@ -20,6 +20,10 @@ public class SeedTrackProjectPageVO {
private String major; private String major;
private String projectTrack;
private String unitTrack;
private String telephone; private String telephone;
private String projectStatus; private String projectStatus;
......
src/main/java/com/zhongzhi/vo/project/VocationalNumVO.java
...@@ -16,6 +16,12 @@ public class VocationalNumVO { ...@@ -16,6 +16,12 @@ public class VocationalNumVO {
private Integer rematchNum; private Integer rematchNum;
/** /**
*
*/
private Integer preliminaryProjectNum;
/**
* 报名阶段 * 报名阶段
*/ */
private Integer registerNum; private Integer registerNum;
......
src/main/java/com/zhongzhi/vo/project/VocationalProjectInfoVO.java
package com.zhongzhi.vo.project; package com.zhongzhi.vo.project;
import com.zhongzhi.model.ProjectAwardDO; import com.zhongzhi.model.*;
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 lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class VocationalProjectInfoVO { public class VocationalProjectInfoVO extends ProjectDO {
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;
private List<ProjectOwnershipStructureDO> Ownership; 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.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=devloper spring.datasource.username=root
spring.datasource.password=dev@1553$ spring.datasource.password=ykhladmin302
spring.datasource.druid.initialSize=5 spring.datasource.druid.initialSize=5
spring.datasource.druid.minIdle=5 spring.datasource.druid.minIdle=5
spring.datasource.druid.maxActive=20 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.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 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.password=youkedb608@good
spring.datasource.druid.initialSize=5 spring.datasource.druid.initialSize=5
spring.datasource.druid.minIdle=5 spring.datasource.druid.minIdle=5
......
src/main/resources/application.properties
# 环境配置 # 环境配置
spring.profiles.active=prod spring.profiles.active=dev
# 文件编码 UTF8 # 文件编码 UTF8
spring.mandatory-file-encoding=UTF-8 spring.mandatory-file-encoding=UTF-8
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
......
src/main/resources/mapper/MatchDictDAO.xml
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
select select
* *
from match_dict from match_dict
where match_type = #{matchType} where delete_time is null
and delete_time is null
</select> </select>
<select id="getList" resultType="com.zhongzhi.model.MatchDictDO"> <select id="getList" resultType="com.zhongzhi.model.MatchDictDO">
......
src/main/resources/mapper/ProjectDAO.xml
...@@ -73,16 +73,18 @@ ...@@ -73,16 +73,18 @@
p.project_schedule, p.project_schedule,
p.project_status, p.project_status,
p.project_progress, p.project_progress,
p.college,
p.edit_status, p.edit_status,
s.name s.name,
p.project_group,
s.college,
p.project_track,
p.unit_track
from project p from project p
left join student s on s.id = p.proposer_id left join student s on s.id = p.proposer_id
<where> <where>
<if test="matchId != null and matchId != ''"> <if test="matchId != null and matchId != ''">
and match_id = #{matchId} and match_id = #{matchId}
</if> </if>
and p.project_type = #{projectType}
and proposer_id = #{proposerId} and proposer_id = #{proposerId}
and s.delete_time is null and s.delete_time is null
and p.delete_time is null and p.delete_time is null
...@@ -124,19 +126,23 @@ ...@@ -124,19 +126,23 @@
s.name, s.name,
s.major, s.major,
s.telephone, 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 from project p
left join student s ON s.id = p.proposer_id left join student s ON s.id = p.proposer_id
<where> <where>
and p.match_id = #{matchId} and p.match_id = #{matchId}
and p.project_type = #{projectType}
and p.project_status != '填写中' and p.project_status != '填写中'
<if test="school != null and school != ''"> <if test="school != null and school != ''">
and s.college = #{school} and s.college = #{school}
</if> </if>
<if test="projectGroup != null and projectGroup != '' and projectGroup !='中职/高职'"> <if test="projectGroup != null and projectGroup != ''">
and p.project_group = #{projectGroup} and p.project_group = #{projectGroup}
</if> </if>
<if test="projectTrack != null and projectTrack != ''">
and p.project_track = #{projectTrack}
</if>
<if test="projectSchedule != null and projectSchedule != ''"> <if test="projectSchedule != null and projectSchedule != ''">
and p.project_schedule = #{projectSchedule} and p.project_schedule = #{projectSchedule}
</if> </if>
...@@ -421,4 +427,15 @@ ...@@ -421,4 +427,15 @@
) )
</select> </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> </mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!