电子信息第一次上线

electron.iml

@@ -122,5 +122,6 @@
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.13" level="project" />
+    <orderEntry type="library" name="Maven: com.dameng:DmJdbcDriver18:8.1.2.192" level="project" />
   </component>
 </module>
\ No newline at end of file

pom.xml

@@ -189,6 +189,13 @@
             <version>4.5.13</version>
         </dependency>
 
+        <!-- DM8 达梦驱动 -->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.2.192</version>
+        </dependency>
+
     </dependencies>
 
     <repositories>

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

@@ -18,7 +18,7 @@ public class ProjectSchedule {
 
 //    public static final String PRELIMINARY_REVIEW = "市级初赛项目";
 
-    public static final String SEMI_FINAL_REVIEW = "市级复赛项目";
+    public static final String SEMI_FINAL_REVIEW = "校级复赛项目";
 
-    public static final String FINAL_REVIEW = "市级决赛项目";
+    public static final String FINAL_REVIEW = "校级决赛项目";
 }

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

@@ -21,6 +21,8 @@ public class ProjectType {
 
     public static final String HONGLV = "红旅赛道";
 
+    public static final String CHANYE = "产业赛道";
+
     public static final String INTERNATIONAL = "国际合作";
 
     /**

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

@@ -136,6 +136,15 @@ public class MatchDictController {
         return ResponseData.generateCreatedResponse(0);
     }
 
+    @PostMapping(value = "/createHonglvMatch")
+    @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
+            "schedule:[{ scheduleTime/时间安排、explains/说明 }]")
+    public ResponseVO createHonglvMatch(@RequestBody MatchDictDTO matchDictDTO) {
+        matchDictDTO.setMatchType(ProjectType.HONGLV);
+        matchDictService.createMatch(matchDictDTO);
+        return ResponseData.generateCreatedResponse(0);
+    }
+
     @PostMapping(value = "/createInternationalMatch")
     @LoginRequired({Platform.center})
     @ApiOperation("中心端 ---创建职教赛道赛事年份：matchName/名称、matchDate/年份、startTime/报名起始时间、endTime/报名结束时间、" +
@@ -186,6 +195,20 @@ public class MatchDictController {
         return ResponseData.generateCreatedResponse(0, matchDictService.getVocationalMatchAll());
     }
 
+    @PostMapping(value = "/getHonglvMatchAll")
+    @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
+    @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
+    public ResponseVO getHonglvMatchAll() {
+        return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvMatchAll());
+    }
+
+    @PostMapping(value = "/getChanYeMatchAll")
+    @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
+    @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
+    public ResponseVO getChanYeMatchAll() {
+        return ResponseData.generateCreatedResponse(0, matchDictService.getChanYeMatchAll());
+    }
+
     @PostMapping(value = "/getInternationalMatchAll")
     @LoginRequired({Platform.center, Platform.school, Platform.student, Platform.review})
     @ApiOperation("中心端/学生端/院校端/审批端 ---查询全部职教赛道赛事年份")
@@ -204,6 +227,22 @@ public class MatchDictController {
     }
 
     /* 职教管理端 */
+    @PostMapping(value = "/getHonglvPage")
+    @LoginRequired({Platform.center, Platform.school, Platform.review})
+    @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
+    public ResponseVO getHonglvPage(@RequestBody SelectListPageDTO selectListPageDTO) {
+        return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvPage(selectListPageDTO));
+    }
+
+    /* 职教管理端 */
+    @PostMapping(value = "/getChanYePage")
+    @LoginRequired({Platform.center, Platform.school, Platform.review})
+    @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
+    public ResponseVO getChanYePage(@RequestBody SelectListPageDTO selectListPageDTO) {
+        return ResponseData.generateCreatedResponse(0, matchDictService.getChanYePage(selectListPageDTO));
+    }
+
+    /* 职教管理端 */
     @PostMapping(value = "/getVocationalPageCity")
     @LoginRequired({Platform.center, Platform.school, Platform.review})
     @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
@@ -219,12 +258,4 @@ public class MatchDictController {
         return ResponseData.generateCreatedResponse(0, matchDictService.getInternationalPage(selectListPageDTO));
     }
 
-    /* 职教管理端 */
-    @PostMapping(value = "/getHonglvlPage")
-    @LoginRequired({Platform.center, Platform.school, Platform.review})
-    @ApiOperation("中心端/院校端 ---分页查询职教赛道赛事年份：pageNo、pageSize")
-    public ResponseVO getHonglvlPage(@RequestBody SelectListPageDTO selectListPageDTO) {
-        return ResponseData.generateCreatedResponse(0, matchDictService.getHonglvlPage(selectListPageDTO));
-    }
-
 }
\ No newline at end of file

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

@@ -55,6 +55,20 @@ public class MatchScheduleController {
         return ResponseData.generateCreatedResponse(0, matchScheduleService.getVocationalMatchSchedule(matchScheduleDO));
     }
 
+    @PostMapping(value = "getHonglvMatchSchedule")
+    @LoginRequired({Platform.student})
+    @ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
+    public ResponseVO getHonglvMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
+        return ResponseData.generateCreatedResponse(0, matchScheduleService.getHonglvMatchSchedule(matchScheduleDO));
+    }
+
+    @PostMapping(value = "getChanYeMatchSchedule")
+    @LoginRequired({Platform.student})
+    @ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")
+    public ResponseVO getChanYeMatchSchedule(@RequestBody MatchScheduleDO matchScheduleDO) {
+        return ResponseData.generateCreatedResponse(0, matchScheduleService.getChanYeMatchSchedule(matchScheduleDO));
+    }
+
     @PostMapping(value = "getInternationalMatchSchedule")
     @LoginRequired({Platform.student})
     @ApiOperation("学生端 ---职教赛道查看时间安排：matchId/赛事年份ID")

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

@@ -46,7 +46,6 @@ public class ProjectReviewPeriodController {
     }
 
     @PostMapping(value = "/updateProjectReviewPeriod")
-    @LoginRequired(Platform.center)
     @ApiOperation("中心端  --- 修改评审时间：id/ID、matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、startTime/开始时间、endTime/结束时间")
     public ResponseVO updateProjectReviewPeriod(@RequestBody ProjectReviewPeriodDO projectReviewPeriodDO) {
         projectReviewPeriodService.updateProjectReviewPeriod(projectReviewPeriodDO);

src/main/java/com/zhongzhi/dto/administer/LoginDTO.java

@@ -8,4 +8,8 @@ public class LoginDTO {
     private String telephone;
 
     private String code;
+
+    private String accountName;
+
+    private String password;
 }

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

@@ -6,39 +6,47 @@ import lombok.Data;
 @Data
 public class ExportProjectDTO {
 
-    @ExcelColumn(col = 1, value = "届数")
+
+
+    @ExcelColumn(col = 1, value = "序号")
+    private String id;
+
+    @ExcelColumn(col = 2, value = "届数")
     private String matchName;
 
-    @ExcelColumn(col = 2, value = "项目名称")
+    @ExcelColumn(col = 3, value = "项目名称")
     private String projectName;
 
-    @ExcelColumn(col = 3, value = "组别")
+    @ExcelColumn(col = 4, value = "组别")
     private String projectProgress;
 
-    @ExcelColumn(col = 4, value = "负责人")
+    @ExcelColumn(col = 5, value = "负责人")
     private String name;
 
-    @ExcelColumn(col = 5, value = "院校")
+    @ExcelColumn(col = 6, value = "院校")
     private String college;
 
-    @ExcelColumn(col = 6, value = "学籍号")
+    @ExcelColumn(col = 7, value = "学院")
+    private String xueyuan;
+
+    @ExcelColumn(col = 8, value = "学籍号")
     private String studentNo;
 
-    @ExcelColumn(col = 7, value = "专业")
+    @ExcelColumn(col = 9, value = "专业")
     private String major;
 
-    @ExcelColumn(col = 8, value = "手机号")
+    @ExcelColumn(col = 10, value = "手机号")
     private String telephone;
 
-    @ExcelColumn(col = 9, value = "团队成员")
+    @ExcelColumn(col = 11, value = "团队成员")
     private String teamMembers;
 
-    @ExcelColumn(col = 10, value = "指导老师")
+    @ExcelColumn(col = 12, value = "指导老师")
     private String teachers;
 
-    @ExcelColumn(col = 11, value = "项目阶段")
+    @ExcelColumn(col = 13, value = "项目阶段")
     private String projectSchedule;
 
-    @ExcelColumn(col = 12, value = "项目状态")
+    @ExcelColumn(col = 14, value = "项目状态")
     private String projectStatus;
 }

src/main/java/com/zhongzhi/dto/student/RegisterDTO.java

@@ -28,4 +28,6 @@ public class RegisterDTO {
     private String sex;
 
     private String className;
+
+    private String xueyuan;
 }

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

@@ -33,6 +33,10 @@ public class ProjectJudgeDO extends BaseModel {
      */
     private String username;
 
+    private String accountName;
+
+    private String password;
+
     /**
      * 手机号
      */

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

@@ -68,6 +68,11 @@ public class StudentDO extends BaseModel {
     private String college;
 
     /**
+     * 学院
+     */
+    private String xueyuan;
+
+    /**
      * 就读专业
      */
     private String major;

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

@@ -32,13 +32,17 @@ public interface MatchDictService extends IService<MatchDictDO> {
 
     void createMatch(MatchDictDTO matchDictDTO);
 
+    void createHonglvMatch(MatchDictDTO matchDictDTO);
+
     List<MatchDictDO> getMatch();
 
     List<MatchDictDO> getList(String projectType, String projectGroup);
 
     IPage getVocationalPage(SelectListPageDTO selectListPageDTO);
 
-    IPage getHonglvlPage(SelectListPageDTO selectListPageDTO);
+    IPage getHonglvPage(SelectListPageDTO selectListPageDTO);
+
+    IPage getChanYePage(SelectListPageDTO selectListPageDTO);
 
     IPage getVocationalPageCity(SelectListPageDTO selectListPageDTO);
 
@@ -53,4 +57,7 @@ public interface MatchDictService extends IService<MatchDictDO> {
     List<MatchDictDO> getSeedTrackMatchAll();
 
     List<MatchDictDO> getVocationalMatchAll();
+
+    List<MatchDictDO> getHonglvMatchAll();
+    List<MatchDictDO> getChanYeMatchAll();
 }

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

@@ -19,4 +19,8 @@ public interface MatchScheduleService extends IService<MatchScheduleDO> {
 
     List<MatchScheduleDO> getVocationalMatchSchedule(MatchScheduleDO matchScheduleDO);
 
+    List<MatchScheduleDO> getHonglvMatchSchedule(MatchScheduleDO matchScheduleDO);
+
+    List<MatchScheduleDO> getChanYeMatchSchedule(MatchScheduleDO matchScheduleDO);
+
 }

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

+package com.zhongzhi.service;
+
+import com.zhongzhi.dto.project.CreateVocationalProjectDTO;
+import com.zhongzhi.model.StudentDO;
+
+public interface ProjectChildUtilsService {
+
+    void createVocationalProject(StudentDO studentDO ,CreateVocationalProjectDTO createVocationalProjectDTO);
+
+}

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

@@ -136,18 +136,26 @@ public interface ProjectService extends IService<ProjectDO> {
 
     void createVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
 
-    void createInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
+    void createHonglvProject(CreateVocationalProjectDTO createVocationalProjectDTO);
 
-    void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
+    void createChanYeProject(CreateVocationalProjectDTO createVocationalProjectDTO);
 
-    void updateInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
+    void updateVocationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
 
     VocationalProjectInfoVO getVocationalProjectById();
 
+    VocationalProjectInfoVO getHonglvProjectById();
+
+    VocationalProjectInfoVO getChanYeProjectById();
+
     VocationalProjectInfoVO getInternationalProjectById();
 
     void createVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
 
+    void createHonglvMember(CreateProjectMemberDTO createProjectMemberDTO);
+
+    void createChanYeMember(CreateProjectMemberDTO createProjectMemberDTO);
+
     void updateVocationalMember(CreateProjectMemberDTO createProjectMemberDTO);
 
     void createInternationalMember(CreateProjectMemberDTO createProjectMemberDTO);
@@ -158,14 +166,24 @@ public interface ProjectService extends IService<ProjectDO> {
 
     IPage getVocationalProject(ProjectListPageDTO projectListPageDTO);
 
+    IPage getHonglvProject(ProjectListPageDTO projectListPageDTO);
+
+    IPage getChanYeProject(ProjectListPageDTO projectListPageDTO);
+
     IPage getInternationalProject(ProjectListPageDTO projectListPageDTO);
 
     IPage getVocationalReviewList(ReviewListDTO reviewListDTO);
 
+    IPage getHonglvReviewList(ReviewListDTO reviewListDTO);
+
+    IPage getChanYeReviewList(ReviewListDTO reviewListDTO);
+
     SeedTrackProjectDetailVO getVocationalProjectDetail(Long id);
 
     SeedTrackProjectDetailVO getHonglvProjectDetail(Long id);
 
+    SeedTrackProjectDetailVO getChanYeProjectDetail(Long id);
+
     SeedTrackProjectDetailVO getVocationalProjectDetailCity(Long id);
 
     SeedTrackProjectDetailVO getInternationalProjectDetail(Long id);
@@ -174,6 +192,8 @@ public interface ProjectService extends IService<ProjectDO> {
 
     IPage getHonglvProjectPage(ProjectListPageDTO projectListPageDTO);
 
+    IPage getChanYeProjectPage(ProjectListPageDTO projectListPageDTO);
+
     IPage getVocationalProjectPageCity(ProjectListPageDTO projectListPageDTO);
 
     IPage getInternationalProjectPage(ProjectListPageDTO projectListPageDTO);
@@ -192,12 +212,18 @@ public interface ProjectService extends IService<ProjectDO> {
 
     VocationalNumVO getHonglvProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
 
+    VocationalNumVO getChanYeProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
+
     VocationalNumVO getVocationalProjectNumCity(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
 
     VocationalNumVO getInternationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO);
 
     VocationalReviewNumVO getVocationalReviewNum(ReviewListDTO reviewListDTO);
 
+    VocationalReviewNumVO getHonglvReviewNum(ReviewListDTO reviewListDTO);
+
+    VocationalReviewNumVO getChanYeReviewNum(ReviewListDTO reviewListDTO);
+
     VocationalReviewNumVO getInternationalReviewNum(ReviewListDTO reviewListDTO);
 
     void exportProjectById(ReviewListDTO reviewListDTO);
@@ -214,6 +240,10 @@ public interface ProjectService extends IService<ProjectDO> {
 
     ProjectAssignNumVO getVocationalAssignNum(ReviewListDTO reviewListDTO);
 
+    ProjectAssignNumVO getHonglvAssignNum(ReviewListDTO reviewListDTO);
+
+    ProjectAssignNumVO getChanYeAssignNum(ReviewListDTO reviewListDTO);
+
     ProjectAssignNumVO getInternationalAssignNum(ReviewListDTO reviewListDTO);
 
     void importProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
@@ -226,5 +256,7 @@ public interface ProjectService extends IService<ProjectDO> {
 
     List<JudgeThemeDoneVO> judgeThemeDone(CreateSeedTrackProjectDTO createSeedTrackProjectDTO);
 
+    void createInternationalProject(CreateVocationalProjectDTO createVocationalProjectDTO);
+
     // ProjectDataOverview getCollegeVocationalDataOverview();
 }

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

@@ -179,6 +179,26 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     }
 
   @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createHonglvMatch(MatchDictDTO matchDictDTO) {
+
+        DbContextHolder.setDbType(DBTypeEnum.db2);
+
+        MatchDictDO matchDictDO = new MatchDictDO();
+        BeanUtils.copyProperties(matchDictDTO, matchDictDO);
+        this.baseMapper.insert(matchDictDO);
+
+        if (matchDictDTO.getSchedule().size() > 0) {
+            for (MatchScheduleDO matchScheduleDO : matchDictDTO.getSchedule()) {
+                MatchScheduleDO matchSchedule = new MatchScheduleDO();
+                BeanUtils.copyProperties(matchScheduleDO, matchSchedule);
+                matchSchedule.setMatchId(matchDictDO.getId());
+                matchScheduleDAO.insert(matchSchedule);
+            }
+        }
+    }
+
+    @Override
     public List<MatchDictDO> getMatch() {
 
         DbContextHolder.setDbType(DBTypeEnum.db2);
@@ -231,6 +251,25 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     }
 
     @Override
+    public List<MatchDictDO> getHonglvMatchAll() {
+
+        DbContextHolder.setDbType(DBTypeEnum.db2);
+
+        return this.baseMapper.selectList(new QueryWrapper<MatchDictDO>()
+                .lambda()
+                .eq(MatchDictDO::getMatchType, ProjectType.HONGLV));
+    }
+ @Override
+    public List<MatchDictDO> getChanYeMatchAll() {
+
+        DbContextHolder.setDbType(DBTypeEnum.db2);
+
+        return this.baseMapper.selectList(new QueryWrapper<MatchDictDO>()
+                .lambda()
+                .eq(MatchDictDO::getMatchType, ProjectType.CHANYE));
+    }
+
+    @Override
     public List<MatchDictDO> getList(String projectType, String projectGroup) {
         DbContextHolder.setDbType(DBTypeEnum.db2);
 
@@ -254,7 +293,7 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     }
 
     @Override
-    public IPage getHonglvlPage(SelectListPageDTO selectListPageDTO) {
+    public IPage getHonglvPage(SelectListPageDTO selectListPageDTO) {
 
         DbContextHolder.setDbType(DBTypeEnum.db2);
 
@@ -270,6 +309,22 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
     }
 
     @Override
+    public IPage getChanYePage(SelectListPageDTO selectListPageDTO) {
+
+        DbContextHolder.setDbType(DBTypeEnum.db2);
+
+        Page page = new Page(selectListPageDTO.getPageNo(), selectListPageDTO.getPageSize());
+        IPage<MatchDictVO> iPage = this.baseMapper.getSeedTrackMatchPage(page, ProjectType.CHANYE);
+        for (MatchDictVO record : iPage.getRecords()) {
+            List<MatchScheduleDO> list = matchScheduleDAO.selectList(new QueryWrapper<MatchScheduleDO>()
+                    .lambda()
+                    .eq(MatchScheduleDO::getMatchId, record.getId()));
+            record.setSchedule(list);
+        }
+        return iPage;
+    }
+
+    @Override
     public IPage getVocationalPageCity(SelectListPageDTO selectListPageDTO) {
 
         DbContextHolder.setDbType(DBTypeEnum.db1);

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

@@ -66,4 +66,37 @@ public class MatchScheduleServiceImpl extends ServiceImpl<MatchScheduleDAO, Matc
         }
         return list;
     }
+    @Override
+    public List<MatchScheduleDO> getHonglvMatchSchedule(MatchScheduleDO matchScheduleDO) {
+
+        MatchDictDO matchDictDO = matchDictDAO.selectOne(new QueryWrapper<MatchDictDO>()
+                .lambda()
+                .eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
+                .eq(MatchDictDO::getMatchType, ProjectType.HONGLV)
+                .eq(MatchDictDO::getStatus, 1));
+        List<MatchScheduleDO> list = new ArrayList<>();
+        if (matchDictDO != null) {
+            list = this.baseMapper.selectList(new QueryWrapper<MatchScheduleDO>()
+                    .lambda()
+                    .eq(MatchScheduleDO::getMatchId, matchDictDO.getId()));
+        }
+        return list;
+    }
+
+    @Override
+    public List<MatchScheduleDO> getChanYeMatchSchedule(MatchScheduleDO matchScheduleDO) {
+
+        MatchDictDO matchDictDO = matchDictDAO.selectOne(new QueryWrapper<MatchDictDO>()
+                .lambda()
+                .eq(MatchDictDO::getId, matchScheduleDO.getMatchId())
+                .eq(MatchDictDO::getMatchType, ProjectType.CHANYE)
+                .eq(MatchDictDO::getStatus, 1));
+        List<MatchScheduleDO> list = new ArrayList<>();
+        if (matchDictDO != null) {
+            list = this.baseMapper.selectList(new QueryWrapper<MatchScheduleDO>()
+                    .lambda()
+                    .eq(MatchScheduleDO::getMatchId, matchDictDO.getId()));
+        }
+        return list;
+    }
 }

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

@@ -46,10 +46,6 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
     @Autowired
     private ProjectReviewDAO projectReviewDAO;
 
-    @Autowired
-    private SmsCodeDAO smsCodeDAO;
-
-
     @Override
     public IPage<ProjectJudgePageVO> getProjectJudgePage(ProjectJudgePageDTO projectJudgePageDTO) {
 
@@ -116,32 +112,31 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
 
         ProjectJudgeDO projectJudgeDO = this.baseMapper.selectOne(new QueryWrapper<ProjectJudgeDO>()
                 .lambda()
-                .eq(ProjectJudgeDO::getTelephone, loginDTO.getTelephone()));
+                .eq(ProjectJudgeDO::getAccountName, loginDTO.getAccountName()));
 
-        if (null != projectJudgeDO){
+        if (null != projectJudgeDO) {
 
-            if (null != projectJudgeDO.getPasswordFree() && projectJudgeDO.getPasswordFree() != 1){
-                SmsCodeDO smsCodeDO = smsCodeDAO.getOneByTelePhone(loginDTO.getTelephone(), SmsCode.login, SmsCode.review);
-                if (smsCodeDO == null) {
-                    throw new HttpException(10025);
-                }
-
-                if (!smsCodeDO.getCode().equals(loginDTO.getCode())) {
-                    throw new HttpException(10021);
-                }
-
-                smsCodeDAO.deleteById(smsCodeDO.getId());
+            if (null != projectJudgeDO.getPasswordFree() && 1 == projectJudgeDO.getPasswordFree()) {
+                String token = JwtUtil.generateToken(projectJudgeDO.getId(), SmsCode.review);
+                judgeInfoVO.setTelephone(projectJudgeDO.getTelephone());
+                judgeInfoVO.setPosition(projectJudgeDO.getPosition());
+                judgeInfoVO.setUnit(projectJudgeDO.getUnit());
+                judgeInfoVO.setUsername(projectJudgeDO.getUsername());
+                judgeInfoVO.setToken(token);
+                return judgeInfoVO;
+            }else {
+                ProjectJudgeDO projectJudgeDO2 = this.baseMapper.selectOne(new QueryWrapper<ProjectJudgeDO>()
+                        .lambda()
+                        .eq(ProjectJudgeDO::getAccountName, loginDTO.getAccountName())
+                        .eq(ProjectJudgeDO::getPassword, loginDTO.getPassword()));
 
-                if (projectJudgeDO == null) {
-                    throw new HttpException(10024);
+                if (null == projectJudgeDO2 ) {
+                    throw new HttpException(10027);
                 }
 
                 if (projectJudgeDO.getStatus() == 0) {
-                    throw new HttpException(10024);
-                }
+                    throw new HttpException(10028);
                 }
-        }
-
                 String token = JwtUtil.generateToken(projectJudgeDO.getId(), SmsCode.review);
                 judgeInfoVO.setTelephone(projectJudgeDO.getTelephone());
                 judgeInfoVO.setPosition(projectJudgeDO.getPosition());
@@ -150,6 +145,10 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
                 judgeInfoVO.setToken(token);
                 return judgeInfoVO;
             }
+        } else {
+            throw new HttpException(10028);
+        }
+    }
 
     @Override
     public IPage<ProjectJudgePageVO> projectJudgesAssigned(ProjectJudgePageDTO projectJudgePageDTO) {

src/main/java/com/zhongzhi/vo/judge/ProjectJudgePageVO.java

@@ -12,6 +12,10 @@ public class ProjectJudgePageVO {
      */
     private String username;
 
+    private String accountName;
+
+    private String password;
+
     /**
      * 手机号
      */

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

@@ -25,7 +25,7 @@ public class VocationalProjectNum {
     /**
      * 高职初赛项目数量
      */
-//    private Long secPreliminaryNUm;
+    private Long secPreliminaryNUm;
 
     /**
      * 已评审项目数量

src/main/java/com/zhongzhi/vo/student/StudentInfoVO.java

@@ -38,4 +38,6 @@ public class StudentInfoVO {
     private String graduateDate;
 
     private String className;
+
+    private String xueyuan;
 }

src/main/resources/application-dm.properties

+# 本地环境配置
+# 端口号
+server.port=23508
+
+spring.datasource.dynamic.strict=false
+spring.datasource.dynamic.primary=master
+spring.datasource.dynamic.hikari.min-idle=5
+spring.datasource.dynamic.hikari.max-pool-size=20
+spring.datasource.dynamic.hikari.connection-timeout=30000
+spring.datasource.dynamic.hikari.idle-timeout=600000
+
+# db1  中职库
+spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://116.62.57.92:3306/zhongzhi?connectTimeout=3000&socketTimeout=6000
+spring.datasource.dynamic.datasource.db1.username=devloper
+spring.datasource.dynamic.datasource.db1.password=dev@1553$
+spring.datasource.dynamic.datasource.db1.driver-class-name=com.mysql.cj.jdbc.Driver
+
+
+# db2 校内数据库
+spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://localhost:5236/electron?connectTimeout=3000&socketTimeout=6000
+spring.datasource.dynamic.datasource.db2.username=SYSDBA
+spring.datasource.dynamic.datasource.db2.password=Ykhl1800
+spring.datasource.dynamic.datasource.db2.driver-class-name=dm.jdbc.driver.DmDriver
+
+# 控制台日志打印
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file

src/main/resources/application-prod.properties

@@ -3,14 +3,14 @@
 server.port=23508
 
 # db1
-spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.dynamic.datasource.db1.username=ykadmin
+spring.datasource.dynamic.datasource.db1.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.dynamic.datasource.db1.username=ykadmin_new
 spring.datasource.dynamic.datasource.db1.password=youkedb608@good
 spring.datasource.dynamic.datasource.db1.driver-class-name=com.mysql.cj.jdbc.Driver
 
 # db2
-spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/electron?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.dynamic.datasource.db2.username=ykadmin
+spring.datasource.dynamic.datasource.db2.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/electron?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.dynamic.datasource.db2.username=ykadmin_new
 spring.datasource.dynamic.datasource.db2.password=youkedb608@good
 spring.datasource.dynamic.datasource.db2.driver-class-name=com.mysql.cj.jdbc.Driver
 

src/main/resources/code.properties

@@ -9,6 +9,8 @@ c.code-message[10022]=输入的手机号和接收验证码手机号不一致
 c.code-message[10023]=该身份证号已注册
 c.code-message[10024]=手机号未注册
 c.code-message[10026]=请稍后再试
+c.code-message[10027]=密码不正确
+c.code-message[10028]=账号不存在
 # 项目
 c.code-message[10040]=项目已申请
 c.code-message[10041]=项目负责人已存在

src/main/resources/mapper/MatchDictDAO.xml

@@ -32,7 +32,8 @@
 
     <select id="getList" resultType="com.zhongzhi.model.MatchDictDO">
         SELECT
-            p.*
+            c.id,
+            count(1)
         FROM project p
         LEFT JOIN student s ON s.id = p.proposer_id
         LEFT JOIN colleges_dict c ON c.`name` = s.college
@@ -62,7 +63,9 @@
             and t2.delete_time is null
             and t2.`status` = 1
             and t.proposer_id = #{memberId}
+            <if test="progress != null and progress != ''">
                 and t.project_type = #{progress}
+            </if>
     </select>
 
     <select id="getSeedCurrentMatch" resultType="com.zhongzhi.model.MatchDictDO">

src/main/resources/mapper/ProjectDAO.xml

@@ -249,7 +249,7 @@
             pr.score as score,
             pr.review_opinion
         from project p
-        left join project_school_review pr on pr.project_id = p.id
+        left join project_review pr on pr.project_id = p.id
         <where>
             <if test="judgeId != null and judgeId != ''">
                 and pr.judge_id = #{judgeId}
@@ -286,7 +286,7 @@
         pr.project_schedule as projectSchedule,
         pr.review_status as projectReview
         from project p
-        left join project_school_review pr on p.id = pr.project_id
+        left join project_review pr on p.id = pr.project_id
         where
         p.match_id = #{matchId}
         and pr.judge_id = #{id}

src/main/resources/mapper/ProjectJudgeDAO.xml

@@ -40,7 +40,7 @@
 
     <select id="projectJudgesAssigned" resultType="com.zhongzhi.vo.judge.ProjectJudgePageVO">
         select
-        pj.*
+        distinct pj.*
         from project_school_judge pj
         left join project_school_review pr on pr.judge_id = pj.id
         left join project p on p.id = pr.project_id
@@ -58,7 +58,6 @@
             and pj.delete_time is null
             and pr.delete_time is null
         </where>
-        group by pj.id
     </select>
 
 </mapper>

src/main/resources/mapper/ProjectScheduleRecordDAO.xml

@@ -27,7 +27,7 @@
 
     <select id="getProjectScheduleRecord" resultType="com.zhongzhi.vo.scheduleRecord.ProjectScheduleRecordVO">
         select
-        p.id,
+        min(p.id) id,
         s.college as collegeName
         from project p
         left join student s on s.id = p.proposer_id