20260717

pom.xml

@@ -183,6 +183,12 @@
             <version>4.5.13</version>
             <version>4.5.13</version>
         </dependency>
         </dependency>
 
 
+        <!-- ZIP打包 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.24.0</version>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <repositories>
     <repositories>

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

 package com.zhongzhi.common.configure;
 package com.zhongzhi.common.configure;
 
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -21,9 +22,17 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 @EnableSwagger2
 public class SwaggerConfig {
 public class SwaggerConfig {
 
 
+    @Value("${spring.profiles.active:}")
+    private String activeProfile;
+
     @Bean
     @Bean
     public Docket createRestApi() {
     public Docket createRestApi() {
+
+        // 判断是否为生产环境
+        boolean isProd = "prod".equals(activeProfile);
+
         return new Docket(DocumentationType.SWAGGER_2)
         return new Docket(DocumentationType.SWAGGER_2)
+                .enable(!isProd)
                 .pathMapping("/")
                 .pathMapping("/")
                 .select()
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.zhongzhi.controller"))
                 .apis(RequestHandlerSelectors.basePackage("com.zhongzhi.controller"))

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

+package com.zhongzhi.common.constant;
+
+import lombok.Data;
+
+@Data
+public class ProjectAssigned {
+
+    public static final String ASSIGN_ED = "已分配";
+
+    public static final String UN_ASSIGN = "未分配";
+
+}

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

@@ -16,8 +16,6 @@ public class ProjectSchedule {
     // 校内赛
     // 校内赛
     public static final String SCHOOL_REVIEW = "市级初赛项目";
     public static final String SCHOOL_REVIEW = "市级初赛项目";
 
 
-//    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/ProjectStatus.java

@@ -10,10 +10,10 @@ package com.zhongzhi.common.constant;
  */
  */
 public class ProjectStatus {
 public class ProjectStatus {
 
 
-//    public static final String TO_REVIEW = "";
-
     public static final String UN_SUBMITTED = "填写中";
     public static final String UN_SUBMITTED = "填写中";
 
 
+    public static final String TO_CHECK = "待评审";
+
     public static final String WITHDRAWN = "已撤回";
     public static final String WITHDRAWN = "已撤回";
 
 
     public static final String SCHOOL_NOT_PASSED = "不予提交市级复赛";
     public static final String SCHOOL_NOT_PASSED = "不予提交市级复赛";

src/main/java/com/zhongzhi/common/utils/AliyunSmsUtil.java

@@ -63,9 +63,9 @@ public class AliyunSmsUtil {
             //必填:待发送手机号
             //必填:待发送手机号
             request.setPhoneNumbers(phone);
             request.setPhoneNumbers(phone);
             //必填:短信签名-可在短信控制台中找到
             //必填:短信签名-可在短信控制台中找到
-            request.setSignName("双创平台");
+            request.setSignName("有课互联");
             //必填:短信模板-可在短信控制台中找到
             //必填:短信模板-可在短信控制台中找到
-            request.setTemplateCode("SMS_229640297");
+            request.setTemplateCode("SMS_190945394");
             //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
             //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
             request.setTemplateParam("{\"code\":\"" + code + "\"}");
             request.setTemplateParam("{\"code\":\"" + code + "\"}");
 
 
@@ -82,11 +82,49 @@ public class AliyunSmsUtil {
         }
         }
     }
     }
 
 
-    public static void main(String[] args) {
-//        AliyunSmsUtil.sendNew("15201936167",000123);
+    /**
+     * 阿里云短信 -- 验证码
+     * @param phone
+     * @param code
+     * @return
+     */
+    public SendSmsResponse sendNotice(String phone) {
+        try {
+            System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
+            System.setProperty("sun.net.client.defaultReadTimeout", "10000");
+
+            //初始化acsClient,暂不支持region化
+            IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunSmsProperties.getAccessKeyId(), aliyunSmsProperties.getAccessKeySecret());
+            DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", aliyunSmsProperties.getProduct(), aliyunSmsProperties.getDomain());
+            IAcsClient acsClient = new DefaultAcsClient(profile);
+
+            //组装请求对象-具体描述见控制台-文档部分内容
+            SendSmsRequest request = new SendSmsRequest();
+            //必填:待发送手机号
+            request.setPhoneNumbers(phone);
+            //必填:短信签名-可在短信控制台中找到
+            request.setSignName("有课互联");
+            //必填:短信模板-可在短信控制台中找到
+            request.setTemplateCode("SMS_504780294");
+//            //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
+//            request.setTemplateParam("{\"code\":\"" + code + "\"}");
+
+            //hint 此处可能会抛出异常，注意catch
+            SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
+            if (sendSmsResponse != null && sendSmsResponse.getCode().equals("OK")) {
+                return sendSmsResponse;
+            }
+
+            throw new Exception(sendSmsResponse.getMessage());
+        } catch (Exception e) {
+            log.error("---短信发送失败:" + e);
+            throw new HttpException(10011);
+        }
     }
     }
 
 
 
 
+
+
     /**
     /**
      * 三网平台短信
      * 三网平台短信
      * @param msg
      * @param msg

src/main/java/com/zhongzhi/common/utils/ZipUtils.java

+package com.zhongzhi.common.utils;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.OSSObject;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ZipUtils {
+
+    // ====================== 工具方法：打包ZIP ======================
+    private static void zipPackage(String sourceDir, String zipPath) throws Exception {
+        try (FileOutputStream fos = new FileOutputStream(zipPath);
+             ZipArchiveOutputStream zos = new ZipArchiveOutputStream(fos)) {
+
+            File root = new File(sourceDir);
+            compressFile(root, root.getName(), zos);
+            zos.finish();
+        }
+    }
+
+    private static void compressFile(File file, String basePath, ZipArchiveOutputStream zos) throws Exception {
+        if (file.isDirectory()) {
+            File[] files = file.listFiles();
+            if (files != null) {
+                for (File f : files) {
+                    compressFile(f, basePath + "/" + f.getName(), zos);
+                }
+            }
+        } else {
+            try (FileInputStream fis = new FileInputStream(file)) {
+                zos.putArchiveEntry(new ZipArchiveEntry(basePath));
+                byte[] buffer = new byte[1024 * 1024];
+                int len;
+                while ((len = fis.read(buffer)) != -1) {
+                    zos.write(buffer, 0, len);
+                }
+                zos.closeArchiveEntry();
+            }
+        }
+    }
+
+    /**
+     * 你只需要调用这一个方法！
+     *
+     * @param studentImageMap 你本地查询好的数据: key=学生名, value=图片URL列表
+     */
+    public static void downloadAndZip(HashMap<String, HashMap<String,List<String>>> studentImageMap) {
+        OSS ossClient = new OSSClientBuilder().build("http://oss-cn-beijing.aliyuncs.com", "LTAI5tLUBG4B6QxhHrhddc7p", "eber38QGHZixTQ6bFfrd80kbg67jIP");
+
+        try {
+            // 1. 创建根目录
+            Files.createDirectories(new File("D:/student_images_temp/").toPath());
+
+            // 2. 遍历学生 → 创建文件夹 → 下载所有图片
+            for (Map.Entry<String, HashMap<String, List<String>>> entry : studentImageMap.entrySet()) {
+                String studentName = entry.getKey();       // 学生名
+                System.out.println("学生姓名===============>" + entry);
+                HashMap<String, List<String>> imageUrls = entry.getValue(); // 该学生所有图片
+
+                // 创建学生文件夹
+                String studentFolder = "D:/student_images_temp/" + studentName + "/";
+                Files.createDirectories(new File(studentFolder).toPath());
+
+                // 下载该学生所有图片
+                List<String> projectAttachment = imageUrls.get("projectAttachment");
+                if (projectAttachment.size() > 0){
+                    downloadImage(studentName, ossClient, projectAttachment.get(0), studentFolder, "项目计划书");
+                }
+
+                List<String> projectPptUrl = imageUrls.get("projectPptUrl");
+                if (projectPptUrl.size() > 0){
+                    downloadImage(studentName, ossClient, projectPptUrl.get(0), studentFolder, "项目PPT");
+                }
+
+               List<String> identityCertificate = imageUrls.get("identityCertificate");
+                if (identityCertificate.size() > 0){
+                    downloadImage(studentName, ossClient, identityCertificate.get(0), studentFolder, "身份证明书");
+                }
+
+               List<String> commitmentLetter = imageUrls.get("commitmentLetter");
+                if (commitmentLetter.size() > 0){
+                    downloadImage(studentName, ossClient, commitmentLetter.get(0), studentFolder, "承诺书");
+                }
+
+               List<String> participationCertificate = imageUrls.get("participationCertificate");
+                if (participationCertificate.size() > 0){
+                    downloadImage(studentName, ossClient, participationCertificate.get(0), studentFolder, "参赛证明书");
+                }
+
+                System.out.println("✅ 学生：" + studentName + " 图片下载完成");
+            }
+
+            // 3. 打包成ZIP
+//            zipPackage("D:/student_images_temp/", "D:/student_images_temp/学生图片打包.zip");
+//            System.out.println("\n🎉 全部完成！ZIP路径：" + new File("D:/student_images_temp/学生图片打包.zip").getAbsolutePath());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ossClient.shutdown();
+        }
+    }
+
+    // ====================== 工具方法：下载单张图片 ======================
+    private static void downloadImage(String studentName, OSS ossClient, String imageUrl, String studentFolder, String name) throws Exception {
+        // 从URL截取OSS文件路径
+        String ossPath = extractOssPath(imageUrl);
+        // 文件名
+        String fileName = studentName + "_" + name + "." + getFormat(ossPath);
+        // 本地保存路径
+        String localPath = studentFolder + fileName;
+
+        // 下载OSS文件
+        try {
+
+        } catch (Exception e) {
+
+        }
+        try (OSSObject ossObject = ossClient.getObject("mass-entrepreneurship", ossPath);
+             InputStream in = ossObject.getObjectContent();
+             FileOutputStream out = new FileOutputStream(localPath)) {
+
+            byte[] buffer = new byte[1024 * 1024];
+            int len;
+            while ((len = in.read(buffer)) != -1) {
+                out.write(buffer, 0, len);
+            }
+        }
+    }
+
+    /**
+     * 【终极修复】自动清理URL，只保留OSS文件路径
+     */
+    private static String extractOssPath(String imageUrl) throws Exception {
+        // 1. 移除 ? 参数
+        if (imageUrl.contains("?")) {
+            imageUrl = imageUrl.substring(0, imageUrl.indexOf("?"));
+        }
+        // 2. 移除协议头
+        imageUrl = imageUrl.replace("https://", "").replace("http://", "");
+        // 3. 移除域名部分
+        String removeDomain = "mass-entrepreneurship" + "." + "oss-cn-beijing.aliyuncs.com" + "/";
+        if (imageUrl.startsWith(removeDomain)) {
+            imageUrl = imageUrl.substring(removeDomain.length());
+        }
+        imageUrl = java.net.URLDecoder.decode(imageUrl, "UTF-8");
+        return imageUrl;
+    }
+
+
+    public static String getFormat(String imageUrl) {
+        // 获取文件后缀（不带点，直接返回 png / jpg）
+        String suffix = imageUrl.substring(imageUrl.lastIndexOf(".") + 1);
+        // 如果有?参数，再截一次
+        if (suffix.contains("?")) {
+            suffix = suffix.substring(0, suffix.indexOf("?"));
+        }
+        return suffix;
+    }
+}

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

 package com.zhongzhi.controller;
 package com.zhongzhi.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zhongzhi.common.constant.Platform;
 import com.zhongzhi.common.constant.Platform;
 import com.zhongzhi.common.utils.LoginRequired;
 import com.zhongzhi.common.utils.LoginRequired;
 import com.zhongzhi.common.utils.ResponseData;
 import com.zhongzhi.common.utils.ResponseData;
 import com.zhongzhi.dto.administer.AdministerPageDTO;
 import com.zhongzhi.dto.administer.AdministerPageDTO;
+import com.zhongzhi.dto.administer.CreateAdministerDTO;
 import com.zhongzhi.dto.administer.LoginDTO;
 import com.zhongzhi.dto.administer.LoginDTO;
 import com.zhongzhi.model.AdministerDO;
 import com.zhongzhi.model.AdministerDO;
+import com.zhongzhi.model.AdministerPermissionDO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.zhongzhi.service.AdministerPermissionService;
 import com.zhongzhi.service.AdministerService;
 import com.zhongzhi.service.AdministerService;
+import com.zhongzhi.service.AdministerTrackMappingService;
 import com.zhongzhi.vo.ResponseVO;
 import com.zhongzhi.vo.ResponseVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 中心管理账户表 前端控制器
  * 中心管理账户表 前端控制器
@@ -32,6 +40,12 @@ public class AdministerController {
     @Autowired
     @Autowired
     private AdministerService administerService;
     private AdministerService administerService;
 
 
+    @Autowired
+    private AdministerTrackMappingService administerTrackMappingService;
+
+    @Autowired
+    private AdministerPermissionService administerPermissionService;
+
     @PostMapping(value = "/login")
     @PostMapping(value = "/login")
     @ApiOperation("中心端 --- 登录：手机号/telephone， code/验证码")
     @ApiOperation("中心端 --- 登录：手机号/telephone， code/验证码")
     public ResponseVO login(@RequestBody LoginDTO loginDTO) {
     public ResponseVO login(@RequestBody LoginDTO loginDTO) {
@@ -39,33 +53,80 @@ public class AdministerController {
     }
     }
 
 
     @PostMapping(value = "/getAdministerPage")
     @PostMapping(value = "/getAdministerPage")
-    @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})
-    @ApiOperation("####中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色")
-    public ResponseVO createAdminister(@RequestBody AdministerDO administerDO) {
-        administerService.save(administerDO);
+    @ApiOperation("####中心端 --- 新增成员：username/名称、telephone/手机号、avatar/头像、role/角色  trackIds[] 赛道ids  permissionIds[] 权限ids")
+    public ResponseVO createAdminister(@RequestBody CreateAdministerDTO createAdministerDTO) {
+        administerService.save(createAdministerDTO);
+        List<Long> trackIds = createAdministerDTO.getTrackIds();
+
+        if (null != trackIds){
+            for (Long id : trackIds){
+                AdministerTrackMappingDO administerTrackMappingDO = new AdministerTrackMappingDO();
+                administerTrackMappingDO.setAdministerId(createAdministerDTO.getId());
+                administerTrackMappingDO.setTrackId(id);
+                administerTrackMappingService.save(administerTrackMappingDO);
+            }
+        }
+
+        List<Long> permissionIds = createAdministerDTO.getPermissionIds();
+        if (null != permissionIds){
+            for (Long id : permissionIds){
+                AdministerPermissionDO administerPermissionDO = new AdministerPermissionDO();
+                administerPermissionDO.setAdministerId(createAdministerDTO.getId());
+                administerPermissionDO.setPermissionId(id);
+                administerPermissionService.save(administerPermissionDO);
+            }
+        }
         return ResponseData.generateCreatedResponse(0);
         return ResponseData.generateCreatedResponse(0);
     }
     }
 
 
     @PostMapping(value = "/updateAdminister")
     @PostMapping(value = "/updateAdminister")
-    @LoginRequired({Platform.center})
-    @ApiOperation("####中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色")
-    public ResponseVO updateAdminister(@RequestBody AdministerDO administerDO) {
-        administerService.updateById(administerDO);
+    @ApiOperation("####中心端 --- 编辑成员：id/成员ID、username/名称、telephone/手机号、avatar/头像、role/角色   trackIds[] 赛道ids  permissionIds[] 权限ids")
+    public ResponseVO updateAdminister(@RequestBody CreateAdministerDTO createAdministerDTO) {
+
+        administerService.updateAdminister(createAdministerDTO);
+
+        List<Long> trackIds = createAdministerDTO.getTrackIds();
+        if (null != trackIds){
+            administerTrackMappingService.remove(new QueryWrapper<AdministerTrackMappingDO>()
+                    .lambda()
+                    .eq(AdministerTrackMappingDO::getAdministerId,createAdministerDTO.getId()));
+            for (Long id : trackIds){
+                AdministerTrackMappingDO administerTrackMappingDO = new AdministerTrackMappingDO();
+                administerTrackMappingDO.setAdministerId(createAdministerDTO.getId());
+                administerTrackMappingDO.setTrackId(id);
+                administerTrackMappingService.save(administerTrackMappingDO);
+            }
+        }
+
+        List<Long> permissionIds = createAdministerDTO.getPermissionIds();
+        if (null != permissionIds) {
+            administerPermissionService.remove(new QueryWrapper<AdministerPermissionDO>()
+                    .lambda()
+                    .eq(AdministerPermissionDO::getAdministerId,createAdministerDTO.getId()));
+            for (Long id : permissionIds){
+                AdministerPermissionDO administerPermissionDO = new AdministerPermissionDO();
+                administerPermissionDO.setAdministerId(createAdministerDTO.getId());
+                administerPermissionDO.setPermissionId(id);
+                administerPermissionService.save(administerPermissionDO);
+            }
+        }
+
         return ResponseData.generateCreatedResponse(0);
         return ResponseData.generateCreatedResponse(0);
     }
     }
 
 
     @PostMapping(value = "/deleteById")
     @PostMapping(value = "/deleteById")
-    @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());
+        administerTrackMappingService.remove(new QueryWrapper<AdministerTrackMappingDO>()
+                .lambda()
+                .eq(AdministerTrackMappingDO::getAdministerId,administerDO.getId()));
         return ResponseData.generateCreatedResponse(0);
         return ResponseData.generateCreatedResponse(0);
     }
     }
 }
 }

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

 package com.zhongzhi.controller;
 package com.zhongzhi.controller;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 

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

+package com.zhongzhi.controller;
+
+
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.service.AdministerTrackMappingService;
+import com.zhongzhi.vo.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+    import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 赛道管理员映射表 前端控制器
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@RestController
+@RequestMapping("/administerTrackMapping")
+@Api("管理员赛道")
+public class AdministerTrackMappingController {
+
+        @Autowired
+        private AdministerTrackMappingService administerTrackMappingService;
+
+        @PostMapping("administerTracks")
+        @ApiOperation("管理员的赛道  userId")
+        public ResponseVO administerTracks(@RequestBody AdministerTracksDTO administerTracksDTO){
+            return ResponseData.generateCreatedResponse(0,administerTrackMappingService.administerTracks(administerTracksDTO));
+        }
+
+
+}

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

@@ -39,7 +39,7 @@ public class CollegesDictController {
     @Autowired
     @Autowired
     public CollegesDictService collegesDictService;
     public CollegesDictService collegesDictService;
 
 
-    @PostMapping(value = "/getCollegesList")
+    @PostMapping(value = "/getCollegesListNew")
     @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();
@@ -58,6 +58,12 @@ public class CollegesDictController {
         return ResponseData.generateCreatedResponse(0, collegesDictService.list(queryWrapper));
         return ResponseData.generateCreatedResponse(0, collegesDictService.list(queryWrapper));
     }
     }
 
 
+    @PostMapping("getCollegeInfo")
+    @ApiOperation("返回院校基本信息   name")
+    public ResponseVO getCollegeInfo(@RequestBody GetCollegesListDTO getCollegesListDTO){
+        return ResponseData.generateCreatedResponse(0,collegesDictService.getCollegeInfo(getCollegesListDTO));
+    }
+
     @PostMapping(value = "/login")
     @PostMapping(value = "/login")
     @ApiOperation("院校端 --- 登录: account/账户, password/密码")
     @ApiOperation("院校端 --- 登录: account/账户, password/密码")
     public ResponseVO login(@RequestBody LoginDTO loginDTO) {
     public ResponseVO login(@RequestBody LoginDTO loginDTO) {

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

@@ -30,10 +30,10 @@ import java.util.List;
 @RequestMapping("/oss")
 @RequestMapping("/oss")
 public class OssController {
 public class OssController {
 
 
-    public static final String keyId = "LTAI5tPAH7P7WQVeowo517BE";
+    public static final String keyId = "LTAI5tLUBG4B6QxhHrhddc7p";
 
 
 
 
-    public static final String secret = "0ueqhIfdAZyw5lWlBVSLpAxTtx37RY";
+    public static final String secret = "eber38QGHZixTQ6bFfrd80kbg67jIP";
 
 
 
 
 //    @Value("${spring.profiles.active}")
 //    @Value("${spring.profiles.active}")
@@ -48,41 +48,6 @@ public class OssController {
         return ResponseData.generateCreatedResponse(0, getSecretVO);
         return ResponseData.generateCreatedResponse(0, getSecretVO);
     }
     }
 
 
-//    @PostMapping("uploadFile")
-//    @ApiOperation("上传文件  file")
-//    public ResponseVO uploadFile(@RequestParam("file") MultipartFile file) {
-//        // 创建OSSClient实例。
-//        OSS ossClient = new OSSClientBuilder().build("http://oss-cn-shanghai.aliyuncs.com", keyId, secret);
-//        UploadFileVO uploadFileVO = new UploadFileVO();
-//        try {
-////
-////            if (env.equals("test")) {
-////                env = "ykhl-bigger-test";
-////            }
-////            if (env.equals("prod")) {
-////                env = "ykhl-bigger";
-////            }
-//
-//
-//            // 创建PutObjectRequest对象。
-//            PutObjectRequest putObjectRequest = new PutObjectRequest("zhongzhi-cms", System.currentTimeMillis() + "_" + file.getOriginalFilename(), file.getInputStream());
-//            // 设置该属性可以返回response。如果不设置，则返回的response为空。
-//            putObjectRequest.setProcess("true");
-//            // 创建PutObject请求。
-//            PutObjectResult result = ossClient.putObject(putObjectRequest);
-//            // 如果上传成功，则返回200。
-////            System.out.println(result.getResponse().getUri());
-//            uploadFileVO.setUrl(result.getResponse().getUri());
-//        } catch (Exception oe) {
-//            oe.printStackTrace();
-//        } finally {
-//            if (ossClient != null) {
-//                ossClient.shutdown();
-//            }
-//        }
-//        return ResponseData.generateCreatedResponse(0, uploadFileVO);
-//    }
-
     @PostMapping("uploadFile")
     @PostMapping("uploadFile")
     @ApiOperation("分片上传")
     @ApiOperation("分片上传")
     public ResponseVO fenpian(@RequestParam("file") MultipartFile file) {
     public ResponseVO fenpian(@RequestParam("file") MultipartFile file) {
@@ -181,6 +146,7 @@ public class OssController {
             // 完成分片上传。
             // 完成分片上传。
             CompleteMultipartUploadResult completeMultipartUploadResult = ossClient.completeMultipartUpload(completeMultipartUploadRequest);
             CompleteMultipartUploadResult completeMultipartUploadResult = ossClient.completeMultipartUpload(completeMultipartUploadRequest);
             uploadFileVO.setUrl(completeMultipartUploadResult.getLocation().replace("http","https"));
             uploadFileVO.setUrl(completeMultipartUploadResult.getLocation().replace("http","https"));
+            uploadFileVO.setRequestId(completeMultipartUploadResult.getRequestId());
             System.out.println(completeMultipartUploadResult.getLocation());
             System.out.println(completeMultipartUploadResult.getLocation());
         } catch (OSSException oe) {
         } catch (OSSException oe) {
             System.out.println("Caught an OSSException, which means your request made it to OSS, "
             System.out.println("Caught an OSSException, which means your request made it to OSS, "
@@ -189,11 +155,13 @@ public class OssController {
             System.out.println("Error Code:" + oe.getErrorCode());
             System.out.println("Error Code:" + oe.getErrorCode());
             System.out.println("Request ID:" + oe.getRequestId());
             System.out.println("Request ID:" + oe.getRequestId());
             System.out.println("Host ID:" + oe.getHostId());
             System.out.println("Host ID:" + oe.getHostId());
+            oe.printStackTrace();
         } catch (ClientException ce) {
         } catch (ClientException ce) {
             System.out.println("Caught an ClientException, which means the client encountered "
             System.out.println("Caught an ClientException, which means the client encountered "
                     + "a serious internal problem while trying to communicate with OSS, "
                     + "a serious internal problem while trying to communicate with OSS, "
                     + "such as not being able to access the network.");
                     + "such as not being able to access the network.");
             System.out.println("Error Message:" + ce.getMessage());
             System.out.println("Error Message:" + ce.getMessage());
+            ce.printStackTrace();
         } catch (FileNotFoundException e) {
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             e.printStackTrace();
         } catch (IOException e) {
         } catch (IOException e) {

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

 package com.zhongzhi.controller;
 package com.zhongzhi.controller;
 
 
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.service.PermissionsService;
+import com.zhongzhi.vo.ResponseVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -17,4 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/permissions")
 @RequestMapping("/permissions")
 public class PermissionsController {
 public class PermissionsController {
 
 
+    @Autowired
+    private PermissionsService permissionsService;
+
+    @PostMapping("allPermissions")
+    @ApiOperation("所有权限")
+    public ResponseVO allPermissions(){
+        return ResponseData.generateCreatedResponse(0,permissionsService.allPermissions());
+    }
+
+
 }
 }

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

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
 /**
  * <p>
  * <p>
  * 项目表 前端控制器
  * 项目表 前端控制器
@@ -350,7 +352,6 @@ public class ProjectController {
         projectService.exportProjectAllProgress(projectCollegeListDTO);
         projectService.exportProjectAllProgress(projectCollegeListDTO);
     }
     }
 
 
-
     @PostMapping(value = "/getExportProjectField")
     @PostMapping(value = "/getExportProjectField")
     @LoginRequired({Platform.center})
     @LoginRequired({Platform.center})
     @ApiOperation("中心端 --- 评审项目字段")
     @ApiOperation("中心端 --- 评审项目字段")
@@ -360,7 +361,7 @@ public class ProjectController {
 
 
     @PostMapping(value = "/exportProject")
     @PostMapping(value = "/exportProject")
     @LoginRequired({Platform.center})
     @LoginRequired({Platform.center})
-    @ApiOperation("####中心端 --- 评审项目导出：matchId/赛事ID")
+    @ApiOperation("####中心端 --- 评审项目导出：matchId/赛事ID userId")
     public ResponseVO exportProject(@RequestBody ReviewListDTO reviewListDTO) {
     public ResponseVO exportProject(@RequestBody ReviewListDTO reviewListDTO) {
         projectService.exportProjectReview(reviewListDTO);
         projectService.exportProjectReview(reviewListDTO);
         return ResponseData.generateCreatedResponse(0);
         return ResponseData.generateCreatedResponse(0);
@@ -422,8 +423,8 @@ public class ProjectController {
 //    }
 //    }
 
 
     @PostMapping(value = "getDataOverview")
     @PostMapping(value = "getDataOverview")
-    @LoginRequired({Platform.center})
-    @ApiOperation("####中心端 --- 数据概览  matchId")
+//    @LoginRequired({Platform.center})
+    @ApiOperation("[立信]中心端 --- 数据概览  matchId")
     public ResponseVO getDataOverview(@RequestBody DataOverviewDTO dataOverviewDTO) {
     public ResponseVO getDataOverview(@RequestBody DataOverviewDTO dataOverviewDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalDataOverview(dataOverviewDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalDataOverview(dataOverviewDTO));
     }
     }
@@ -537,7 +538,6 @@ public class ProjectController {
 
 
     /* -- 管理端 -- */
     /* -- 管理端 -- */
     @PostMapping(value = "/getVocationalProjectPage")
     @PostMapping(value = "/getVocationalProjectPage")
-    @LoginRequired(Platform.center)
     @ApiOperation("####中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别、赛道  projectTrack、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
     @ApiOperation("####中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别、赛道  projectTrack、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
             "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
             "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
     public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
     public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
@@ -545,7 +545,6 @@ public class ProjectController {
     }
     }
 
 
     @PostMapping(value = "updateAllEditStatus")
     @PostMapping(value = "updateAllEditStatus")
-    @LoginRequired(Platform.center)
     @ApiOperation("中心端 --- 更新所有编辑状态：matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、editStatus/状态（0:关闭，1：开启）")
     @ApiOperation("中心端 --- 更新所有编辑状态：matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、editStatus/状态（0:关闭，1：开启）")
     public ResponseVO updateAllEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
     public ResponseVO updateAllEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
         projectService.updateAllEditStatus(editStatusDTO);
         projectService.updateAllEditStatus(editStatusDTO);
@@ -553,7 +552,6 @@ public class ProjectController {
     }
     }
 
 
     @PostMapping(value = "batchUpdateEditStatus")
     @PostMapping(value = "batchUpdateEditStatus")
-    @LoginRequired(Platform.center)
     @ApiOperation("中心端 --- 批量更新编辑状态：ids/项目ID（数组）、editStatus/状态（0:关闭，1：开启）")
     @ApiOperation("中心端 --- 批量更新编辑状态：ids/项目ID（数组）、editStatus/状态（0:关闭，1：开启）")
     public ResponseVO batchUpdateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
     public ResponseVO batchUpdateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
         projectService.batchUpdateEditStatus(editStatusDTO);
         projectService.batchUpdateEditStatus(editStatusDTO);
@@ -561,7 +559,6 @@ public class ProjectController {
     }
     }
 
 
     @PostMapping(value = "updateEditStatus")
     @PostMapping(value = "updateEditStatus")
-    @LoginRequired(Platform.center)
     @ApiOperation("中心端 --- 更新编辑状态：id/项目ID、editStatus/状态（0:关闭，1：开启）")
     @ApiOperation("中心端 --- 更新编辑状态：id/项目ID、editStatus/状态（0:关闭，1：开启）")
     public ResponseVO updateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
     public ResponseVO updateEditStatus(@RequestBody EditStatusDTO editStatusDTO) {
         projectService.updateEditStatus(editStatusDTO);
         projectService.updateEditStatus(editStatusDTO);
@@ -569,31 +566,29 @@ public class ProjectController {
     }
     }
 
 
     @PostMapping(value = "/getVocationalReviewList")
     @PostMapping(value = "/getVocationalReviewList")
-    @LoginRequired({Platform.center})
-    @ApiOperation("####中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectStatus/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
+    @ApiOperation("####中心端 --- 职教评审列表：projectGroup/组别、projectName/搜索项目或院校、 projectSchedule/项目状态（市级初赛、市级复赛、市级决赛）、projectReview/评审分配状态（已分配/未分配）、" +
             "pageNo/当前页数、pageSize/每页显示条数")
             "pageNo/当前页数、pageSize/每页显示条数")
     public ResponseVO getVocationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
     public ResponseVO getVocationalReviewList(@RequestBody ReviewListDTO reviewListDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewList(reviewListDTO));
     }
     }
 
 
     @PostMapping(value = "/getVocationalProjectDetail")
     @PostMapping(value = "/getVocationalProjectDetail")
-    @LoginRequired({Platform.center, Platform.school, Platform.review})
     @ApiOperation("####中心端/院校端 --- 职教赛道项目详情：id/项目ID")
     @ApiOperation("####中心端/院校端 --- 职教赛道项目详情：id/项目ID")
+    @LoginRequired({Platform.center,Platform.school,Platform.review})
     public ResponseVO getVocationalProjectDetail(@RequestBody ProjectDO projectDO) {
     public ResponseVO getVocationalProjectDetail(@RequestBody ProjectDO projectDO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectDetail(projectDO.getId()));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectDetail(projectDO.getId()));
     }
     }
 
 
     /* -- 院校端 -- */
     /* -- 院校端 -- */
     @PostMapping(value = "/getVocationalProjectList")
     @PostMapping(value = "/getVocationalProjectList")
-    @LoginRequired(Platform.school)
     @ApiOperation("院校端 --- 分页查询职教赛道项目：matchId/赛事ID,projectGroup/项目组别、projectSchedule/项目进度（全部项目传空字符串、校内赛、初赛、复赛、决赛）, " +
     @ApiOperation("院校端 --- 分页查询职教赛道项目：matchId/赛事ID,projectGroup/项目组别、projectSchedule/项目进度（全部项目传空字符串、校内赛、初赛、复赛、决赛）, " +
             "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
             "projectStatus/项目状态, itemField/领域, name/搜名称, pageNo/当前页数 、pageSize/每页显示条数")
+    @LoginRequired({Platform.center,Platform.school})
     public ResponseVO getVocationalProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
     public ResponseVO getVocationalProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectList(projectListPageDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectList(projectListPageDTO));
     }
     }
 
 
     @PostMapping(value = "getReviewVocationalNum")
     @PostMapping(value = "getReviewVocationalNum")
-    @LoginRequired(Platform.review)
     @ApiOperation("评审端 --- （职教）项目数量： matchId/赛事ID、projectGroup/项目组别、 projectSchedule/赛事状态  projectJudgeId")
     @ApiOperation("评审端 --- （职教）项目数量： matchId/赛事ID、projectGroup/项目组别、 projectSchedule/赛事状态  projectJudgeId")
     public ResponseVO getReviewVocationalNum(@RequestBody ReviewVocationalNumDTO reviewVocationalNumDTO) {
     public ResponseVO getReviewVocationalNum(@RequestBody ReviewVocationalNumDTO reviewVocationalNumDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getReviewVocationalNum(reviewVocationalNumDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getReviewVocationalNum(reviewVocationalNumDTO));
@@ -601,28 +596,26 @@ public class ProjectController {
 
 
     /* -- 评审端 -- */
     /* -- 评审端 -- */
     @PostMapping(value = "/getVocationalProjectReviewPage")
     @PostMapping(value = "/getVocationalProjectReviewPage")
-    @LoginRequired({Platform.review})
     @ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
     @ApiOperation("评审端 ---职教评审项目分页查询：matchId/赛事年份ID、projectSchedule/项目进度（初赛、复赛、决赛）、status/状态（待评审, 已评审）、projectGroup/项目组别、projectName/搜索名称、pageNo/当前页数、pageSize/每页显示条数")
+    @LoginRequired({Platform.center,Platform.school,Platform.review})
     public ResponseVO getVocationalProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
     public ResponseVO getVocationalProjectReviewPage(@RequestBody ProjectReviewPageDTO projectReviewPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectReviewPage(projectReviewPageDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectReviewPage(projectReviewPageDTO));
     }
     }
 
 
     @PostMapping(value = "getVocationalProjectNum")
     @PostMapping(value = "getVocationalProjectNum")
-    @LoginRequired({Platform.center, Platform.school, Platform.review})
+    @LoginRequired({Platform.school, Platform.center, Platform.student})
     @ApiOperation("####中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
     @ApiOperation("####中心端/院校端 --- (职教)项目管理数量: matchId/赛事ID、projectGroup/项目组别")
     public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
     public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
     }
     }
 
 
     @PostMapping(value = "/getVocationalReviewNum")
     @PostMapping(value = "/getVocationalReviewNum")
-    @LoginRequired({Platform.center})
-    @ApiOperation("####中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
+    @ApiOperation("####中心端 --- 职教评审列表(已评审 + 待评审)项目数量统计：matchId/赛事年份ID、, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
     public ResponseVO getVocationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
     public ResponseVO getVocationalReviewNum(@RequestBody ReviewListDTO reviewListDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewNum(reviewListDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalReviewNum(reviewListDTO));
     }
     }
 
 
     @PostMapping(value = "/getVocationalAssignNum")
     @PostMapping(value = "/getVocationalAssignNum")
-    @LoginRequired({Platform.center})
     @ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
     @ApiOperation("中心端 --- 职教评审分配(已分配 + 未分配)项目数量统计：matchId/赛事年份ID、projectGroup/组别（高职、中职）, projectStatus/项目进度（校级申请项目、市级初赛项目、市级复赛项目、市级 决赛项目）")
     public ResponseVO getVocationalAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
     public ResponseVO getVocationalAssignNum(@RequestBody ReviewListDTO reviewListDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalAssignNum(reviewListDTO));
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalAssignNum(reviewListDTO));
@@ -637,20 +630,21 @@ public class ProjectController {
 
 
     @PostMapping(value = "importProjectByGroup")
     @PostMapping(value = "importProjectByGroup")
     @ApiOperation("中心端/院校端 ---excel 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别")
     @ApiOperation("中心端/院校端 ---excel 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别")
-    @LoginRequired({ Platform.center, Platform.school })
     public void importProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
     public void importProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
         projectService.importProjectByGroup(importVocationalProjectDTO);
         projectService.importProjectByGroup(importVocationalProjectDTO);
     }
     }
 
 
     @PostMapping("exportProjectByGroup")
     @PostMapping("exportProjectByGroup")
     @ApiOperation("中心端/院校端 ---pdf 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别 matchId")
     @ApiOperation("中心端/院校端 ---pdf 数据预览导出市级初赛/市级复赛项目： projectGroup/项目组别 matchId")
-//    @LoginRequired({ Platform.center, Platform.school })
     public void exportProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
     public void exportProjectByGroup(@RequestBody ImportVocationalProjectDTO importVocationalProjectDTO) {
         projectService.exportProjectByGroup(importVocationalProjectDTO);
         projectService.exportProjectByGroup(importVocationalProjectDTO);
     }
     }
 
 
-
-
+    @PostMapping("exportPlanMemberImages")
+    @ApiOperation("导出这个计划学生的所有图片  ")
+    public void exportPlanMemberImages(@RequestBody ProjectDO projectDO, HttpServletResponse response){
+       projectService.exportFiles(projectDO,response);
+    }
 
 
 
 
 }
 }
\ No newline at end of file

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

@@ -32,14 +32,12 @@ public class ProjectReviewPeriodController {
     private ProjectReviewPeriodService projectReviewPeriodService;
     private ProjectReviewPeriodService projectReviewPeriodService;
 
 
     @PostMapping(value = "/getProjectReviewPeriod")
     @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) {
     public ResponseVO getProjectReviewPeriod(@RequestBody ProjectReviewPeriodDTO projectReviewPeriodDTO) {
         return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO));
         return ResponseData.generateCreatedResponse(0, projectReviewPeriodService.getProjectReviewPeriod(projectReviewPeriodDTO));
     }
     }
 
 
     @PostMapping(value = "/updateProjectReviewPeriod")
     @PostMapping(value = "/updateProjectReviewPeriod")
-    @LoginRequired(Platform.center)
     @ApiOperation("中心端  --- 修改评审时间：id/ID、matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、startTime/开始时间、endTime/结束时间")
     @ApiOperation("中心端  --- 修改评审时间：id/ID、matchId/赛事ID、projectGroup/项目组别、projectSchedule/项目进度、startTime/开始时间、endTime/结束时间")
     public ResponseVO updateProjectReviewPeriod(@RequestBody ProjectReviewPeriodDO projectReviewPeriodDO) {
     public ResponseVO updateProjectReviewPeriod(@RequestBody ProjectReviewPeriodDO projectReviewPeriodDO) {
         projectReviewPeriodService.updateProjectReviewPeriod(projectReviewPeriodDO);
         projectReviewPeriodService.updateProjectReviewPeriod(projectReviewPeriodDO);

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

+package com.zhongzhi.controller;
+
+
+import com.zhongzhi.common.utils.ResponseData;
+import com.zhongzhi.service.ProjectTrackService;
+import com.zhongzhi.vo.ResponseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+    import org.springframework.web.bind.annotation.RestController;
+
+/**
+*      <p>
+    * 赛道字典表 前端控制器
+    * </p>
+* @author DengMin
+* @since 2025-03-28
+*/
+@RestController
+@RequestMapping("/projectTrack")
+@Api(tags = "赛道")
+public class ProjectTrackController {
+
+    @Autowired
+    private ProjectTrackService projectTrackService;
+
+    @PostMapping("allTracks")
+    @ApiOperation("查询所有赛道 ")
+    public ResponseVO allTracks(){
+        return ResponseData.generateCreatedResponse(0,projectTrackService.list());
+    }
+
+}

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

 package com.zhongzhi.dao;
 package com.zhongzhi.dao;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhongzhi.model.AdministerDO;
 import com.zhongzhi.model.AdministerDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzhi.vo.administer.GetAdministerPageVO;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 /**
 /**
@@ -15,4 +17,8 @@ import org.springframework.stereotype.Repository;
 @Repository
 @Repository
 public interface AdministerDAO extends BaseMapper<AdministerDO> {
 public interface AdministerDAO extends BaseMapper<AdministerDO> {
 
 
+   IPage<GetAdministerPageVO> getAdministerPage(IPage iPage, String listItem, String username);
+
+   void updateAdminister(AdministerDO administerDO);
+
 }
 }

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

+package com.zhongzhi.dao;
+
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzhi.model.ProjectTrackDO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+* <p>
+    * 赛道管理员映射表 Mapper 接口
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@Repository
+    public interface AdministerTrackMappingDAO extends BaseMapper<AdministerTrackMappingDO> {
+
+    List<ProjectTrackDO> administerTracks(Long userId);
+
+    }

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

@@ -7,6 +7,7 @@ import com.zhongzhi.model.CollegesDictDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzhi.vo.college.AwardedListVO;
 import com.zhongzhi.vo.college.AwardedListVO;
 import com.zhongzhi.vo.college.CollegePageVO;
 import com.zhongzhi.vo.college.CollegePageVO;
+import com.zhongzhi.vo.college.GetCollegeInfoVO;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
@@ -27,4 +28,7 @@ public interface CollegesDictDAO extends BaseMapper<CollegesDictDO> {
     IPage<AwardedListVO> getAwardedList(Page page, String name);
     IPage<AwardedListVO> getAwardedList(Page page, String name);
 
 
     List<AwardedListVO> getAwardedListAll();
     List<AwardedListVO> getAwardedListAll();
+
+    List<GetCollegeInfoVO> getCollegeInfo(String name);
+
 }
 }

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

@@ -23,5 +23,5 @@ public interface MatchDictDAO extends BaseMapper<MatchDictDO> {
 
 
     IPage<MatchDictVO> getSeedTrackMatchPage(Page page);
     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

@@ -29,9 +29,9 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> {
 
 
     IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage(Page page, Long matchId, String projectGroup,String projectTrack, @Param("type") String type,
     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,Long userId,String college);
 
 
-    IPage<ReviewListVO> getReviewList(Page page, String projectName, String projectGroup, String projectReview, Long matchId, String projectStatus, String projectAssigned,String projectProgress);
+    IPage<ReviewListVO> getReviewList(Page page, String projectName, String projectGroup, String projectReview, Long matchId, String projectSchedule, String projectAssigned,String projectProgress,String projectTrack,Long userId,String college);
 
 
     IPage<ProjectPageVO> getProjectReviewPage(Page page, Long judgeId, Long matchId, String projectName, String projectSchedule, String projectReview, String projectGroup,String projectProgress);
     IPage<ProjectPageVO> getProjectReviewPage(Page page, Long judgeId, Long matchId, String projectName, String projectSchedule, String projectReview, String projectGroup,String projectProgress);
 
 
@@ -39,7 +39,7 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> {
 
 
     List<ProjectDO> getProjectByCollege(Long matchId, @Param("name") String name, String projectProgress);
     List<ProjectDO> getProjectByCollege(Long matchId, @Param("name") String name, String projectProgress);
 
 
-    List<ProjectDO> getSeedTrackProjectList(Long matchId, String projectGroup, @Param("name") String name,@Param("projectProgress")String projectProgress);
+    List<ProjectDO> getSeedTrackProjectList(Long matchId, String projectGroup, @Param("name") String name,@Param("projectProgress")String projectProgress,Long userId,String college);
 
 
     List<ProjectDO> selectListByCollege(String projectType, String projectGroup,  @Param("name") String name);
     List<ProjectDO> selectListByCollege(String projectType, String projectGroup,  @Param("name") String name);
 
 
@@ -54,4 +54,10 @@ public interface ProjectDAO extends BaseMapper<ProjectDO> {
     List<ProjectDO> projects(Long matchId,Long collegeId,String college);
     List<ProjectDO> projects(Long matchId,Long collegeId,String college);
 
 
     Integer collegeNum();
     Integer collegeNum();
+
+    List<ProjectDO> getVocationalReviewNum(Long userId,Long matchId,String college);
+
+    List<ProjectDO> getVocationalAssignNum(Long userId,Long matchId,String college);
+
+    List<ProjectDO> exportProjectReview(Long userId,Long matchId,String projectSchedule,String college);
 }
 }

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

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 @Repository
 public interface ProjectJudgeDAO extends BaseMapper<ProjectJudgeDO> {
 public interface ProjectJudgeDAO extends BaseMapper<ProjectJudgeDO> {
 
 
-    IPage<ProjectJudgePageVO> getProjectJudgePage(Page page, String username, Integer status);
+    IPage<ProjectJudgePageVO> getProjectJudgePage(Page page, String username, Integer status,String projectTrack);
 
 
     IPage<ProjectJudgePageVO> projectJudgesAssigned(Page page, @Param("matchId") Long matchId, @Param("projectGroup") String projectGroup, @Param("projectSchedule") String projectSchedule);
     IPage<ProjectJudgePageVO> projectJudgesAssigned(Page page, @Param("matchId") Long matchId, @Param("projectGroup") String projectGroup, @Param("projectSchedule") String projectSchedule);
 }
 }

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

+package com.zhongzhi.dao;
+
+import com.zhongzhi.model.ProjectTrackDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* <p>
+    * 赛道字典表 Mapper 接口
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+    public interface ProjectTrackDAO extends BaseMapper<ProjectTrackDO> {
+
+    }

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

+package com.zhongzhi.dto.administer;
+
+import lombok.Data;
+
+@Data
+public class AdministerTracksDTO {
+
+    private Long userId;
+
+}

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

+package com.zhongzhi.dto.administer;
+
+import com.zhongzhi.model.AdministerDO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CreateAdministerDTO extends AdministerDO {
+
+    private List<Long> trackIds;
+
+    private List<Long> permissionIds;
+
+}

src/main/java/com/zhongzhi/dto/college/GetCollegesListDTO.java

+package com.zhongzhi.dto.college;
+
+import lombok.Data;
+
+@Data
+public class GetCollegesListDTO {
+
+    private Integer pageSize;
+
+    private Integer pageNum;
+
+    private String name;
+
+}

src/main/java/com/zhongzhi/dto/judge/ProjectJudgePageDTO.java

@@ -9,6 +9,8 @@ public class ProjectJudgePageDTO {
 
 
     private String projectGroup;
     private String projectGroup;
 
 
+    private String projectTrack;
+
     private String projectSchedule;
     private String projectSchedule;
 
 
     private String username;
     private String username;

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

@@ -13,32 +13,35 @@ public class ExportProjectDTO {
     private String projectName;
     private String projectName;
 
 
     @ExcelColumn(col = 3, value = "组别")
     @ExcelColumn(col = 3, value = "组别")
-    private String projectProgress;
+    private String projectGroup;
 
 
-    @ExcelColumn(col = 4, value = "负责人")
+    @ExcelColumn(col = 4, value = "赛道")
+    private String projectTrack;
+
+    @ExcelColumn(col = 5, value = "单元赛道")
+    private String unitTrack;
+
+    @ExcelColumn(col = 6, value = "负责人")
     private String name;
     private String name;
 
 
-    @ExcelColumn(col = 5, value = "院校")
+    @ExcelColumn(col = 7, value = "院校")
     private String college;
     private String college;
 
 
-    @ExcelColumn(col = 6, value = "学籍号")
-    private String studentNo;
-
-    @ExcelColumn(col = 7, value = "专业")
+    @ExcelColumn(col = 8, value = "专业")
     private String major;
     private String major;
 
 
-    @ExcelColumn(col = 8, value = "手机号")
+    @ExcelColumn(col = 9, value = "手机号")
     private String telephone;
     private String telephone;
 
 
-    @ExcelColumn(col = 9, value = "团队成员")
+    @ExcelColumn(col = 10, value = "团队成员")
     private String teamMembers;
     private String teamMembers;
 
 
-    @ExcelColumn(col = 10, value = "指导老师")
+    @ExcelColumn(col = 11, value = "指导老师")
     private String teachers;
     private String teachers;
 
 
-    @ExcelColumn(col = 11, value = "项目阶段")
+    @ExcelColumn(col = 12, value = "项目阶段")
     private String projectSchedule;
     private String projectSchedule;
 
 
-    @ExcelColumn(col = 12, value = "项目状态")
+    @ExcelColumn(col = 13, value = "项目状态")
     private String projectStatus;
     private String projectStatus;
 }
 }

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

@@ -15,5 +15,7 @@ public class ProjectCollegeListDTO {
 
 
     private Long matchId;
     private Long matchId;
 
 
+    private Long userId;
+
     private String projectProgress;
     private String projectProgress;
 }
 }

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

@@ -24,4 +24,6 @@ public class ProjectListPageDTO {
     private Integer pageNo;
     private Integer pageNo;
 
 
     private Integer pageSize;
     private Integer pageSize;
+
+    private Long userId;
 }
 }

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

@@ -30,7 +30,11 @@ public class ReviewListDTO {
 
 
     private String projectAssigned;
     private String projectAssigned;
 
 
+    private String projectTrack;
+
     private String projectSchedule;
     private String projectSchedule;
 
 
     private String projectProgress;
     private String projectProgress;
+
+    private Long userId;
 }
 }

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

@@ -12,4 +12,6 @@ public class ReviewVocationalNumDTO {
     private String projectStatus;
     private String projectStatus;
 
 
     private Long projectJudgeId;
     private Long projectJudgeId;
+
+    private String projectSchedule;
 }
 }

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

@@ -10,4 +10,6 @@ public class SeedTrackProjectNumDTO {
     private String projectGroup;
     private String projectGroup;
 
 
     private String projectProgress;
     private String projectProgress;
+
+    private Long userId;
 }
 }

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

@@ -50,4 +50,6 @@ public class AdministerDO extends BaseModel {
      * 角色
      * 角色
      */
      */
     private String role;
     private String role;
+
+    private String college;
 }
 }

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

+package com.zhongzhi.model;
+
+    import com.baomidou.mybatisplus.annotation.IdType;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.zhongzhi.model.base.BaseModel;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import lombok.Data;
+    import lombok.EqualsAndHashCode;
+
+/**
+* <p>
+    * 赛道管理员映射表
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+    @Data
+        @EqualsAndHashCode(callSuper = true)
+    @TableName("administer_track_mapping")
+    public class AdministerTrackMappingDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long administerId;
+
+    private Long trackId;
+
+
+}

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

@@ -158,5 +158,8 @@ public class ProjectDO extends BaseModel {
 
 
     private Integer editStatus;
     private Integer editStatus;
 
 
+    private String aboveProvinceReward;
+
+    private String rewardUrl;
 
 
 }
 }

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

@@ -70,4 +70,6 @@ public class ProjectJudgeDO extends BaseModel {
 
 
     private Integer passwordFree;
     private Integer passwordFree;
 
 
+    private String projectTrack;
+
 }
 }

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

+package com.zhongzhi.model;
+
+    import com.zhongzhi.model.base.BaseModel;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import com.baomidou.mybatisplus.annotation.IdType;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import lombok.Data;
+    import lombok.EqualsAndHashCode;
+
+/**
+* <p>
+    * 赛道字典表
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+    @Data
+        @EqualsAndHashCode(callSuper = true)
+    @TableName("project_track")
+    public class ProjectTrackDO extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+            @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String projectTrack;
+
+
+}

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

@@ -20,4 +20,6 @@ public interface AdministerService extends IService<AdministerDO> {
     AdministerVO login(LoginDTO loginDTO);
     AdministerVO login(LoginDTO loginDTO);
 
 
     IPage getAdministerPage(AdministerPageDTO administerPageDTO);
     IPage getAdministerPage(AdministerPageDTO administerPageDTO);
+
+    void updateAdminister(AdministerDO administerDO);
 }
 }

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

+package com.zhongzhi.service;
+
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzhi.model.ProjectTrackDO;
+
+import java.util.List;
+
+/**
+* <p>
+    * 赛道管理员映射表 服务类
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+public interface AdministerTrackMappingService extends IService<AdministerTrackMappingDO> {
+
+    List<ProjectTrackDO> administerTracks(AdministerTracksDTO administerTracksDTO);
+
+
+}

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhongzhi.dto.college.*;
 import com.zhongzhi.dto.college.*;
 import com.zhongzhi.model.*;
 import com.zhongzhi.model.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzhi.vo.college.CollegesVO;
-import com.zhongzhi.vo.college.DetailVO;
-import com.zhongzhi.vo.college.RegisterMembersVO;
-import com.zhongzhi.vo.college.SchoolsVO;
+import com.zhongzhi.vo.college.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import java.util.List;
 import java.util.List;
@@ -23,6 +20,8 @@ import java.util.Map;
  */
  */
 public interface CollegesDictService extends IService<CollegesDictDO> {
 public interface CollegesDictService extends IService<CollegesDictDO> {
 
 
+    List<GetCollegeInfoVO> getCollegeInfo(GetCollegesListDTO getCollegesListDTO);
+
     CollegesVO login(LoginDTO loginDTO);
     CollegesVO login(LoginDTO loginDTO);
 
 
     IPage getCollegesPage(CollegesPageDTO collegesPageDTO);
     IPage getCollegesPage(CollegesPageDTO collegesPageDTO);

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

@@ -30,7 +30,7 @@ public interface MatchDictService extends IService<MatchDictDO> {
 
 
     List<MatchDictDO> getMatch();
     List<MatchDictDO> getMatch();
 
 
-    List<MatchDictDO> getList(String projectType, String projectGroup);
+//    List<MatchDictDO> getList(String projectType, String projectGroup);
 
 
     IPage getVocationalPage(SelectListPageDTO selectListPageDTO);
     IPage getVocationalPage(SelectListPageDTO selectListPageDTO);
 
 

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

@@ -17,4 +17,7 @@ import java.util.List;
 public interface PermissionsService extends IService<PermissionsDO> {
 public interface PermissionsService extends IService<PermissionsDO> {
 
 
     List<PermissionVO> getPermissionById(Long id);
     List<PermissionVO> getPermissionById(Long id);
+
+    List<PermissionVO> allPermissions();
+
 }
 }

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

@@ -13,6 +13,7 @@ import com.zhongzhi.vo.ExcelFieldVO;
 import com.zhongzhi.vo.member.ProjectMemberVO;
 import com.zhongzhi.vo.member.ProjectMemberVO;
 import com.zhongzhi.vo.project.*;
 import com.zhongzhi.vo.project.*;
 
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -165,5 +166,7 @@ public interface ProjectService extends IService<ProjectDO> {
 
 
     void exportProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
     void exportProjectByGroup(ImportVocationalProjectDTO importVocationalProjectDTO);
 
 
+    void exportFiles(ProjectDO projectDO, HttpServletResponse response);
+
     // ProjectDataOverview getCollegeVocationalDataOverview();
     // ProjectDataOverview getCollegeVocationalDataOverview();
 }
 }

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

+package com.zhongzhi.service;
+
+import com.zhongzhi.model.ProjectTrackDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* <p>
+    * 赛道字典表 服务类
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+    public interface ProjectTrackService extends IService<ProjectTrackDO> {
+
+    }

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

@@ -7,16 +7,18 @@ import com.zhongzhi.common.constant.Platform;
 import com.zhongzhi.common.constant.SmsCode;
 import com.zhongzhi.common.constant.SmsCode;
 import com.zhongzhi.common.exception.HttpException;
 import com.zhongzhi.common.exception.HttpException;
 import com.zhongzhi.common.utils.JwtUtil;
 import com.zhongzhi.common.utils.JwtUtil;
+import com.zhongzhi.dao.AdministerPermissionDAO;
+import com.zhongzhi.dao.AdministerTrackMappingDAO;
 import com.zhongzhi.dto.administer.AdministerPageDTO;
 import com.zhongzhi.dto.administer.AdministerPageDTO;
 import com.zhongzhi.dto.administer.LoginDTO;
 import com.zhongzhi.dto.administer.LoginDTO;
-import com.zhongzhi.model.AdministerDO;
+import com.zhongzhi.model.*;
 import com.zhongzhi.dao.AdministerDAO;
 import com.zhongzhi.dao.AdministerDAO;
-import com.zhongzhi.model.SmsCodeDO;
 import com.zhongzhi.service.AdministerService;
 import com.zhongzhi.service.AdministerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzhi.service.PermissionsService;
 import com.zhongzhi.service.PermissionsService;
 import com.zhongzhi.service.SmsCodeService;
 import com.zhongzhi.service.SmsCodeService;
 import com.zhongzhi.vo.administer.AdministerVO;
 import com.zhongzhi.vo.administer.AdministerVO;
+import com.zhongzhi.vo.administer.GetAdministerPageVO;
 import com.zhongzhi.vo.permission.PermissionVO;
 import com.zhongzhi.vo.permission.PermissionVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +44,12 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerDAO, Administer
     @Autowired
     @Autowired
     private PermissionsService permissionsService;
     private PermissionsService permissionsService;
 
 
+    @Autowired
+    private AdministerTrackMappingDAO administerTrackMappingDAO;
+
+    @Autowired
+    private AdministerPermissionDAO administerPermissionDAO;
+
     @Override
     @Override
     public AdministerVO login(LoginDTO loginDTO) {
     public AdministerVO login(LoginDTO loginDTO) {
         AdministerVO administerVO = new AdministerVO();
         AdministerVO administerVO = new AdministerVO();
@@ -66,6 +74,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerDAO, Administer
         BeanUtils.copyProperties(administerDO, administerVO);
         BeanUtils.copyProperties(administerDO, administerVO);
         String token = JwtUtil.generateToken(administerDO.getId(), Platform.center);
         String token = JwtUtil.generateToken(administerDO.getId(), Platform.center);
         administerVO.setToken(token);
         administerVO.setToken(token);
+        administerVO.setId(administerDO.getId());
 
 
         List<PermissionVO> list = permissionsService.getPermissionById(administerDO.getId());
         List<PermissionVO> list = permissionsService.getPermissionById(administerDO.getId());
         List<PermissionVO> treeList = new ArrayList();
         List<PermissionVO> treeList = new ArrayList();
@@ -92,9 +101,41 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerDAO, Administer
     @Override
     @Override
     public IPage getAdministerPage(AdministerPageDTO administerPageDTO) {
     public IPage getAdministerPage(AdministerPageDTO administerPageDTO) {
         Page page = new Page(administerPageDTO.getPageNo(), administerPageDTO.getPageSize());
         Page page = new Page(administerPageDTO.getPageNo(), administerPageDTO.getPageSize());
-        return this.baseMapper.selectPage(page, new QueryWrapper<AdministerDO>()
-                .lambda()
-                .eq(AdministerDO::getRole, administerPageDTO.getListItem())
-                .like(AdministerDO::getUsername, administerPageDTO.getUsername()));
+
+        IPage<GetAdministerPageVO> page1 = this.baseMapper.getAdministerPage(page,administerPageDTO.getListItem(),administerPageDTO.getUsername());
+        List<GetAdministerPageVO> records = page1.getRecords();
+        for (GetAdministerPageVO getAdministerPageVO : records){
+
+            List<AdministerTrackMappingDO> administerTrackMappingDOS = administerTrackMappingDAO.selectList(new QueryWrapper<AdministerTrackMappingDO>()
+            .lambda()
+            .eq(AdministerTrackMappingDO::getAdministerId,getAdministerPageVO.getId()));
+            getAdministerPageVO.setAdministerTrackMappingDOS(administerTrackMappingDOS);
+
+            List<PermissionVO> list = permissionsService.getPermissionById(getAdministerPageVO.getId());
+            List<PermissionVO> treeList = new ArrayList();
+            list.forEach(permissions -> {
+                if (permissions.getParentId() == null) {
+                    treeList.add(permissions);
+                }
+
+                list.forEach(p -> {
+                    if (p.getParentId() != null) {
+                        if (p.getParentId().equals(permissions.getId())) {
+                            if (permissions.getChildNodeList() == null) {
+                                permissions.setChildNodeList(new ArrayList<>());
+                            }
+                            permissions.getChildNodeList().add(p);
+                        }
+                    }
+                });
+            });
+            getAdministerPageVO.setAdministerPermissionDOS(treeList);
+        }
+        return page1;
+    }
+
+    @Override
+    public void updateAdminister(AdministerDO administerDO){
+        this.baseMapper.updateAdminister(administerDO);
     }
     }
 }
 }

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

+package com.zhongzhi.service.impl;
+
+import com.zhongzhi.dto.administer.AdministerTracksDTO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.zhongzhi.dao.AdministerTrackMappingDAO;
+import com.zhongzhi.model.ProjectTrackDO;
+import com.zhongzhi.service.AdministerTrackMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* <p>
+    * 赛道管理员映射表 服务实现类
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@Service
+public class AdministerTrackMappingServiceImpl extends ServiceImpl<AdministerTrackMappingDAO, AdministerTrackMappingDO> implements AdministerTrackMappingService {
+
+    @Override
+    public List<ProjectTrackDO> administerTracks(AdministerTracksDTO administerTracksDTO){
+        return this.baseMapper.administerTracks(administerTracksDTO.getUserId());
+    }
+
+}

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

@@ -65,6 +65,10 @@ public class CollegesDictServiceImpl extends ServiceImpl<CollegesDictDAO, Colleg
     @Autowired
     @Autowired
     private CollegesDictDAO collegesDictDAO;
     private CollegesDictDAO collegesDictDAO;
 
 
+    public List<GetCollegeInfoVO> getCollegeInfo(GetCollegesListDTO getCollegesListDTO){
+        return this.baseMapper.getCollegeInfo(getCollegesListDTO.getName());
+    }
+
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public CollegesVO login(LoginDTO loginDTO) {
     public CollegesVO login(LoginDTO loginDTO) {

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

@@ -156,10 +156,10 @@ public class MatchDictServiceImpl extends ServiceImpl<MatchDictDAO, MatchDictDO>
         return this.baseMapper.selectById(matchDictDO.getId());
         return this.baseMapper.selectById(matchDictDO.getId());
     }
     }
 
 
-    @Override
-    public List<MatchDictDO> getList(String projectType, String projectGroup) {
-        return this.baseMapper.getList(projectType, projectGroup);
-    }
+//    @Override
+//    public List<MatchDictDO> getList(String projectType, String projectGroup) {
+//        return this.baseMapper.getList(projectType, projectGroup);
+//    }
 
 
     @Override
     @Override
     public IPage getVocationalPage(SelectListPageDTO selectListPageDTO) {
     public IPage getVocationalPage(SelectListPageDTO selectListPageDTO) {

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzhi.vo.permission.PermissionVO;
 import com.zhongzhi.vo.permission.PermissionVO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -24,4 +25,28 @@ public class PermissionsServiceImpl extends ServiceImpl<PermissionsDAO, Permissi
     public List<PermissionVO> getPermissionById(Long id) {
     public List<PermissionVO> getPermissionById(Long id) {
         return this.baseMapper.getPermissionById(id);
         return this.baseMapper.getPermissionById(id);
     }
     }
+
+    @Override
+    public List<PermissionVO> allPermissions(){
+        List<PermissionVO> list = this.getPermissionById(null);
+        List<PermissionVO> treeList = new ArrayList();
+        list.forEach(permissions -> {
+            if (permissions.getParentId() == null) {
+                treeList.add(permissions);
+            }
+
+            list.forEach(p -> {
+                if (p.getParentId() != null) {
+                    if (p.getParentId().equals(permissions.getId())) {
+                        if (permissions.getChildNodeList() == null) {
+                            permissions.setChildNodeList(new ArrayList<>());
+                        }
+                        permissions.getChildNodeList().add(p);
+                    }
+                }
+            });
+        });
+        return treeList;
+    }
+
 }
 }

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

@@ -50,7 +50,7 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
 
 
     @Override
     @Override
     public IPage<ProjectJudgePageVO> getProjectJudgePage(ProjectJudgePageDTO projectJudgePageDTO) {
     public IPage<ProjectJudgePageVO> getProjectJudgePage(ProjectJudgePageDTO projectJudgePageDTO) {
-        IPage<ProjectJudgePageVO> iPage = this.baseMapper.getProjectJudgePage(new Page(projectJudgePageDTO.getPageNo(), projectJudgePageDTO.getPageSize()), projectJudgePageDTO.getUsername(), projectJudgePageDTO.getStatus());
+        IPage<ProjectJudgePageVO> iPage = this.baseMapper.getProjectJudgePage(new Page(projectJudgePageDTO.getPageNo(), projectJudgePageDTO.getPageSize()), projectJudgePageDTO.getUsername(), projectJudgePageDTO.getStatus(),projectJudgePageDTO.getProjectTrack());
         for (ProjectJudgePageVO record : iPage.getRecords()) {
         for (ProjectJudgePageVO record : iPage.getRecords()) {
             Integer count = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
             Integer count = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                     .lambda()
                     .lambda()
@@ -179,4 +179,5 @@ public class ProjectJudgeServiceImpl extends ServiceImpl<ProjectJudgeDAO, Projec
         }
         }
         ExcelUtil.writeExcel(field, data);
         ExcelUtil.writeExcel(field, data);
     }
     }
+
 }
 }

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

@@ -27,7 +27,6 @@ public class ProjectReviewPeriodServiceImpl extends ServiceImpl<ProjectReviewPer
         ProjectReviewPeriodDO projectReviewPeriodDO = this.baseMapper.selectOne(new QueryWrapper<ProjectReviewPeriodDO>()
         ProjectReviewPeriodDO projectReviewPeriodDO = this.baseMapper.selectOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 .lambda()
                 .lambda()
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPeriodDTO.getMatchId())
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPeriodDTO.getMatchId())
-                .eq(ProjectReviewPeriodDO::getProjectGroup, projectReviewPeriodDTO.getProjectGroup())
                 .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPeriodDTO.getProjectSchedule()));
                 .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPeriodDTO.getProjectSchedule()));
         if (projectReviewPeriodDO != null) {
         if (projectReviewPeriodDO != null) {
             projectReviewPeriodVO.setId(projectReviewPeriodDO.getId());
             projectReviewPeriodVO.setId(projectReviewPeriodDO.getId());
@@ -43,8 +42,7 @@ public class ProjectReviewPeriodServiceImpl extends ServiceImpl<ProjectReviewPer
         ProjectReviewPeriodDO projectReviewPeriod = this.baseMapper.selectOne(new QueryWrapper<ProjectReviewPeriodDO>()
         ProjectReviewPeriodDO projectReviewPeriod = this.baseMapper.selectOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 .lambda()
                 .lambda()
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPeriodDO.getMatchId())
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPeriodDO.getMatchId())
-                .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPeriodDO.getProjectSchedule())
-                .eq(ProjectReviewPeriodDO::getProjectGroup, projectReviewPeriodDO.getProjectGroup()));
+                .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPeriodDO.getProjectSchedule()));
         if (projectReviewPeriod != null) {
         if (projectReviewPeriod != null) {
             projectReviewPeriodDO.setId(projectReviewPeriod.getId());
             projectReviewPeriodDO.setId(projectReviewPeriod.getId());
             this.baseMapper.updateById(projectReviewPeriodDO);
             this.baseMapper.updateById(projectReviewPeriodDO);

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

@@ -76,7 +76,6 @@ public class ProjectReviewServiceImpl extends ServiceImpl<ProjectReviewDAO, Proj
                             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                                     .lambda()
                                     .lambda()
                                     .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
                                     .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
-                                    .eq(ProjectReviewPeriodDO::getProjectGroup, projectDO.getProjectProgress())
                                     .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
                                     .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
 //                        startTime = projectReviewPeriodDO.getStartTime();
 //                        startTime = projectReviewPeriodDO.getStartTime();
 //                        endTime = projectReviewPeriodDO.getEndTime();
 //                        endTime = projectReviewPeriodDO.getEndTime();
@@ -116,7 +115,6 @@ public class ProjectReviewServiceImpl extends ServiceImpl<ProjectReviewDAO, Proj
                             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                                     .lambda()
                                     .lambda()
                                     .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
                                     .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
-                                    .eq(ProjectReviewPeriodDO::getProjectGroup, projectDO.getProjectGroup())
                                     .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
                                     .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
 //                        startTime = projectReviewPeriodDO.getStartTime();
 //                        startTime = projectReviewPeriodDO.getStartTime();
 //                        endTime = projectReviewPeriodDO.getEndTime();
 //                        endTime = projectReviewPeriodDO.getEndTime();
@@ -239,7 +237,6 @@ public class ProjectReviewServiceImpl extends ServiceImpl<ProjectReviewDAO, Proj
                 ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                         .lambda()
                         .lambda()
                         .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
                         .eq(ProjectReviewPeriodDO::getMatchId, projectDO.getMatchId())
-                        .eq(ProjectReviewPeriodDO::getProjectGroup, projectDO.getProjectGroup())
                         .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
                         .eq(ProjectReviewPeriodDO::getProjectSchedule, projectDO.getProjectSchedule()));
                 if (projectReviewPeriodDO.getStartTime().before(new Date())) {
                 if (projectReviewPeriodDO.getStartTime().before(new Date())) {
                     throw new HttpException(10075);
                     throw new HttpException(10075);

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

@@ -24,6 +24,7 @@ import com.zhongzhi.vo.member.ProjectMemberVO;
 import com.zhongzhi.vo.project.*;
 import com.zhongzhi.vo.project.*;
 import com.zhongzhi.vo.review.FinalsReviewVO;
 import com.zhongzhi.vo.review.FinalsReviewVO;
 import com.zhongzhi.vo.review.ReMatchReviewVO;
 import com.zhongzhi.vo.review.ReMatchReviewVO;
+import com.zhongzhi.vo.review.SchoolReviewVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -31,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -97,6 +99,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Autowired
     @Autowired
     private CollegesDictDAO collegesDictDAO;
     private CollegesDictDAO collegesDictDAO;
 
 
+    @Autowired
+    private AdministerDAO administerDAO;
+
 //    @Override
 //    @Override
 //    public IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO) {
 //    public IPage getMainTrackProject(ProjectListPageDTO projectListPageDTO) {
 //        StudentDO studentDO = (StudentDO) Localstorage.getUser();
 //        StudentDO studentDO = (StudentDO) Localstorage.getUser();
@@ -142,6 +147,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
     @Override
     @Override
     public IPage getVocationalReviewList(ReviewListDTO reviewListDTO) {
     public IPage getVocationalReviewList(ReviewListDTO reviewListDTO) {
+
+        AdministerDO administerDO = administerDAO.selectById(reviewListDTO.getUserId());
         if (reviewListDTO.getProjectReview() != null) {
         if (reviewListDTO.getProjectReview() != null) {
             if (reviewListDTO.getProjectReview().equals(ProjectReview.TO_REVIEWED) ||
             if (reviewListDTO.getProjectReview().equals(ProjectReview.TO_REVIEWED) ||
                     reviewListDTO.getProjectReview().equals(ProjectReview.SUBMITTED)) {
                     reviewListDTO.getProjectReview().equals(ProjectReview.SUBMITTED)) {
@@ -158,12 +165,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 reviewListDTO.getProjectGroup(),
                 reviewListDTO.getProjectGroup(),
                 reviewListDTO.getProjectReview(),
                 reviewListDTO.getProjectReview(),
                 reviewListDTO.getMatchId(),
                 reviewListDTO.getMatchId(),
-                reviewListDTO.getProjectStatus(),
-                reviewListDTO.getProjectAssigned(), null);
+                reviewListDTO.getProjectSchedule(),
+                reviewListDTO.getProjectAssigned(), null,
+                reviewListDTO.getProjectTrack(),
+                reviewListDTO.getUserId(), administerDO.getCollege());
 
 
         for (ReviewListVO record : iPage.getRecords()) {
         for (ReviewListVO record : iPage.getRecords()) {
             StudentDO studentDO = studentService.getById(record.getProposerId());
             StudentDO studentDO = studentService.getById(record.getProposerId());
             if (studentDO != null) {
             if (studentDO != null) {
+                record.setCollege(studentDO.getCollege());
                 record.setSchool(studentDO.getCollege());
                 record.setSchool(studentDO.getCollege());
                 record.setName(studentDO.getName());
                 record.setName(studentDO.getName());
             }
             }
@@ -261,11 +271,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             queryWrapper.lambda().eq(ProjectReviewDO::getProjectId, id);
             queryWrapper.lambda().eq(ProjectReviewDO::getProjectId, id);
             List<ProjectReviewDO> review = projectReviewService.list(queryWrapper);
             List<ProjectReviewDO> review = projectReviewService.list(queryWrapper);
             if (review.size() > 0) {
             if (review.size() > 0) {
+
+                List<SchoolReviewVO> school = new ArrayList<>();
                 List<ReMatchReviewVO> rematch = new ArrayList<>();
                 List<ReMatchReviewVO> rematch = new ArrayList<>();
                 List<FinalsReviewVO> finals = new ArrayList<>();
                 List<FinalsReviewVO> finals = new ArrayList<>();
                 for (ProjectReviewDO pr : review) {
                 for (ProjectReviewDO pr : review) {
                     ProjectJudgeDO projectJudgeDO = projectJudgeService.getById(pr.getJudgeId());
                     ProjectJudgeDO projectJudgeDO = projectJudgeService.getById(pr.getJudgeId());
-                    if (pr.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)) {
+                    if (pr.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)) {
+                        SchoolReviewVO schoolReviewVO = new SchoolReviewVO();
+                        schoolReviewVO.setId(pr.getId());
+                        if (projectJudgeDO != null) {
+                            schoolReviewVO.setSchoolJudgeName(projectJudgeDO.getUsername());
+                        }
+                        if (collegesDict.getId() == null) {
+                            schoolReviewVO.setSchoolScore(pr.getScore());
+                        }
+                        schoolReviewVO.setSchoolTime(DateFormatUtil.format(pr.getReviewTime(), DateFormatUtil.FMT_sdf_yMd));
+                        school.add(schoolReviewVO);
+                    } else if (pr.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)) {
                         ReMatchReviewVO reMatchReviewVO = new ReMatchReviewVO();
                         ReMatchReviewVO reMatchReviewVO = new ReMatchReviewVO();
                         reMatchReviewVO.setId(pr.getId());
                         reMatchReviewVO.setId(pr.getId());
                         if (projectJudgeDO != null) {
                         if (projectJudgeDO != null) {
@@ -291,6 +314,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         finals.add(finalsReviewVO);
                         finals.add(finalsReviewVO);
                     }
                     }
                 }
                 }
+                seedTrackProjectDetailVO.setSchools(school);
                 seedTrackProjectDetailVO.setRematch(rematch);
                 seedTrackProjectDetailVO.setRematch(rematch);
                 seedTrackProjectDetailVO.setFinals(finals);
                 seedTrackProjectDetailVO.setFinals(finals);
             }
             }
@@ -316,6 +340,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Override
     @Override
     public IPage getVocationalProjectPage(ProjectListPageDTO projectListPageDTO) {
     public IPage getVocationalProjectPage(ProjectListPageDTO projectListPageDTO) {
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
+        AdministerDO administerDO = administerDAO.selectById(projectListPageDTO.getUserId());
         Long matchId = null;
         Long matchId = null;
         if (projectListPageDTO.getMatchId() == null) {
         if (projectListPageDTO.getMatchId() == null) {
             MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
             MatchDictDO matchDictDO = matchDictService.getOne(new QueryWrapper<MatchDictDO>()
@@ -329,7 +354,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         }
         }
 
 
         IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, matchId, projectListPageDTO.getProjectGroup(), projectListPageDTO.getProjectTrack(), MemberType.PRINCIPAL, 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());
+                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress(), projectListPageDTO.getUserId(), administerDO.getCollege());
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
                     .lambda()
                     .lambda()
@@ -348,7 +373,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
         Page page = new Page(projectListPageDTO.getPageNo(), projectListPageDTO.getPageSize());
         IPage<SeedTrackProjectPageVO> iPage = this.baseMapper.getSeedTrackProjectPage(page, projectListPageDTO.getMatchId(), projectListPageDTO.getProjectGroup(), null, MemberType.PRINCIPAL, 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());
+                projectListPageDTO.getProjectSchedule(), projectListPageDTO.getProjectStatus(), projectListPageDTO.getItemField(), projectListPageDTO.getName(), projectListPageDTO.getProjectProgress(), projectListPageDTO.getUserId(), null);
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
         for (SeedTrackProjectPageVO record : iPage.getRecords()) {
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
             List<ProjectMaterialsDO> list = projectMaterialsService.list(new QueryWrapper<ProjectMaterialsDO>()
                     .lambda()
                     .lambda()
@@ -368,7 +393,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
         ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 .lambda()
                 .lambda()
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPageDTO.getMatchId())
                 .eq(ProjectReviewPeriodDO::getMatchId, projectReviewPageDTO.getMatchId())
-                .eq(ProjectReviewPeriodDO::getProjectGroup, projectReviewPageDTO.getProjectGroup())
                 .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPageDTO.getProjectSchedule()));
                 .eq(ProjectReviewPeriodDO::getProjectSchedule, projectReviewPageDTO.getProjectSchedule()));
         if (projectReviewPeriodDO != null) {
         if (projectReviewPeriodDO != null) {
             if ((new Date().after(projectReviewPeriodDO.getStartTime()) || DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getStartTime(), DateFormatUtil.FMT_sdf14_L)))
             if ((new Date().after(projectReviewPeriodDO.getStartTime()) || DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getStartTime(), DateFormatUtil.FMT_sdf14_L)))
@@ -385,7 +409,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         projectJudgeDO.getId(),
                         projectJudgeDO.getId(),
                         projectReviewPageDTO.getMatchId(),
                         projectReviewPageDTO.getMatchId(),
                         projectReviewPageDTO.getProjectName(),
                         projectReviewPageDTO.getProjectName(),
-                        projectReviewPageDTO.getProjectStatus(),
+                        projectReviewPageDTO.getProjectSchedule(),
                         projectReview,
                         projectReview,
                         projectReviewPageDTO.getProjectGroup(),
                         projectReviewPageDTO.getProjectGroup(),
                         null);
                         null);
@@ -596,7 +620,68 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     }
     }
 
 
     @Override
     @Override
+    public void exportFiles(ProjectDO projectDO, HttpServletResponse response) {
+
+        //导出这个计划所有学生三方协议的图片，按照文件夹分类  学号_姓名
+        List<ProjectDO> projectDOS = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
+                .lambda()
+                .eq(ProjectDO::getMatchId, projectDO.getMatchId())
+                .eq(ProjectDO::getProjectSchedule, ProjectSchedule.SCHOOL_REVIEW));
+
+        System.out.println(projectDOS.size());
+
+        LinkedHashMap<String, HashMap<String, List<String>>> studentImageMap = new LinkedHashMap<>();
+
+        for (ProjectDO projectDO1 : projectDOS) {
+
+            HashMap<String, List<String>> imageMaps = new HashMap<>();
+
+            //查询学生信息 ---> 学号 姓名
+            StudentDO memberDO = studentService.getById(projectDO1.getProposerId());
+
+            //这个人本次实习的所有图片
+            //项目计划书
+            if (null != projectDO1.getProjectAttachment()){
+                List<String> projectAttachment = new ArrayList<>();
+                projectAttachment.add(projectDO1.getProjectAttachment());
+                imageMaps.put("projectAttachment",projectAttachment);
+            }
+
+            if (null != projectDO1.getProjectPptUrl()){
+                List<String> projectPptUrl = new ArrayList<>();
+                projectPptUrl.add(projectDO1.getProjectPptUrl());
+                imageMaps.put("projectPptUrl",projectPptUrl);
+            }
+
+            if (null != projectDO1.getIdentityCertificate()){
+                List<String> identityCertificate = new ArrayList<>();
+                identityCertificate.add(projectDO1.getIdentityCertificate());
+                imageMaps.put("identityCertificate",identityCertificate);
+            }
+
+            if (null != projectDO1.getCommitmentLetter()){
+                List<String> commitmentLetter = new ArrayList<>();
+                commitmentLetter.add(projectDO1.getCommitmentLetter());
+                imageMaps.put("commitmentLetter",commitmentLetter);
+            }
+
+            if (null != projectDO1.getParticipationCertificate()){
+                List<String> participationCertificate = new ArrayList<>();
+                participationCertificate.add(projectDO1.getParticipationCertificate());
+                imageMaps.put("participationCertificate",participationCertificate);
+            }
+
+            //导出  按照名字学号做文件夹做导出
+            studentImageMap.put(memberDO.getName()+"_"+memberDO.getTelephone(), imageMaps);
+        }
+
+        System.out.println(studentImageMap);
+        ZipUtils.downloadAndZip(studentImageMap);
+    }
+
+    @Override
     public VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
     public VocationalNumVO getVocationalProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
+        AdministerDO administerDO = administerDAO.selectById(seedTrackProjectNumDTO.getUserId());
         Map<String, Object> map = Localstorage.getMap();
         Map<String, Object> map = Localstorage.getMap();
         CollegesDictDO collegesDictDO = new CollegesDictDO();
         CollegesDictDO collegesDictDO = new CollegesDictDO();
         if (map.get("type").equals(Platform.school)) {
         if (map.get("type").equals(Platform.school)) {
@@ -608,7 +693,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             ProjectJudgeDO projectJudgeDO = (ProjectJudgeDO) map.get("user");
             ProjectJudgeDO projectJudgeDO = (ProjectJudgeDO) map.get("user");
             list = this.baseMapper.getListByJudgeId(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), projectJudgeDO.getId());
             list = this.baseMapper.getListByJudgeId(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), projectJudgeDO.getId());
         } else {
         } else {
-            list = this.baseMapper.getSeedTrackProjectList(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), collegesDictDO.getName(), null);
+            list = this.baseMapper.getSeedTrackProjectList(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), collegesDictDO.getName(), null, seedTrackProjectNumDTO.getUserId(), administerDO.getCollege());
         }
         }
 
 
         VocationalNumVO vocationalNumVO = new VocationalNumVO();
         VocationalNumVO vocationalNumVO = new VocationalNumVO();
@@ -638,34 +723,23 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
     @Override
     @Override
     public VocationalReviewNumVO getVocationalReviewNum(ReviewListDTO reviewListDTO) {
     public VocationalReviewNumVO getVocationalReviewNum(ReviewListDTO reviewListDTO) {
-        VocationalReviewNumVO vo = new VocationalReviewNumVO();
-        List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
-                .lambda()
-                .eq(ProjectDO::getMatchId, reviewListDTO.getMatchId())
-                .and(w -> w.eq(ProjectDO::getProjectReview, ProjectReview.TO_SCORE)
-                        .or()
-                        .eq(ProjectDO::getProjectReview, ProjectReview.SUBMITTED))
-        );
 
 
-        Long review = list.stream().filter(projectDO -> projectDO.getProjectReview().equals(ProjectReview.REVIEW) &&
-                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectStatus()) && projectDO.getProjectGroup().equals(reviewListDTO.getProjectGroup())).count();
+        AdministerDO administerDO = administerDAO.selectById(reviewListDTO.getUserId());
+        VocationalReviewNumVO vo = new VocationalReviewNumVO();
+        List<ProjectDO> list = this.baseMapper.getVocationalReviewNum(reviewListDTO.getUserId(), reviewListDTO.getMatchId(), administerDO.getCollege());
 
 
-        Long notReview = list.stream().filter(projectDO -> projectDO.getProjectReview().equals(ProjectReview.TO_REVIEWED) &&
-                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectStatus()) && projectDO.getProjectGroup().equals(reviewListDTO.getProjectGroup())).count();
+        Long review = list.stream().filter(projectDO -> projectDO.getProjectReview().equals(ProjectReview.REVIEW) && projectDO.getProjectSchedule().equals(reviewListDTO.getProjectSchedule())).count();
+        Long notReview = list.stream().filter(projectDO -> projectDO.getProjectReview().equals(ProjectReview.TO_REVIEWED) && projectDO.getProjectSchedule().equals(reviewListDTO.getProjectSchedule())).count();
 
 
-        Long vocRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-        Long vocFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-        Long secRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-        Long secFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-//        Long secPreliminaryNUm = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.PRELIMINARY_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
+        Long secPreliminaryNUm = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)).count();
+        Long secRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)).count();
+        Long secFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)).count();
 
 
         vo.setReview(review);
         vo.setReview(review);
         vo.setNotReview(notReview);
         vo.setNotReview(notReview);
-        vo.setVocRematchNum(vocRematchNum);
-        vo.setVocFinalNum(vocFinalNum);
         vo.setSecRematchNum(secRematchNum);
         vo.setSecRematchNum(secRematchNum);
         vo.setSecFinalNum(secFinalNum);
         vo.setSecFinalNum(secFinalNum);
-//        vo.setSecPreliminaryNUm(secPreliminaryNUm);
+        vo.setSecPreliminaryNUm(secPreliminaryNUm);
         return vo;
         return vo;
     }
     }
 
 
@@ -678,7 +752,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         for (ProjectDO projectDO : projectList) {
         for (ProjectDO projectDO : projectList) {
             if (projectDO != null) {
             if (projectDO != null) {
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
-                projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
+//                projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
 
 
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
@@ -730,8 +804,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
         ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 .lambda()
                 .lambda()
                 .eq(ProjectReviewPeriodDO::getMatchId, reviewVocationalNumDTO.getMatchId())
                 .eq(ProjectReviewPeriodDO::getMatchId, reviewVocationalNumDTO.getMatchId())
-                .eq(ProjectReviewPeriodDO::getProjectGroup, reviewVocationalNumDTO.getProjectGroup())
-                .eq(ProjectReviewPeriodDO::getProjectSchedule, reviewVocationalNumDTO.getProjectStatus()));
+                .eq(ProjectReviewPeriodDO::getProjectSchedule, reviewVocationalNumDTO.getProjectSchedule()));
         if (projectReviewPeriodDO != null) {
         if (projectReviewPeriodDO != null) {
             if ((new Date().after(projectReviewPeriodDO.getStartTime()) ||
             if ((new Date().after(projectReviewPeriodDO.getStartTime()) ||
                     DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getStartTime(), DateFormatUtil.FMT_sdf14_L)))
                     DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getStartTime(), DateFormatUtil.FMT_sdf14_L)))
@@ -739,21 +812,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     (new Date().before(projectReviewPeriodDO.getEndTime()) ||
                     (new Date().before(projectReviewPeriodDO.getEndTime()) ||
                             DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getEndTime(), DateFormatUtil.FMT_sdf14_L)))) {
                             DateFormatUtil.format(new Date(), DateFormatUtil.FMT_sdf14_L).equals(DateFormatUtil.format(projectReviewPeriodDO.getEndTime(), DateFormatUtil.FMT_sdf14_L)))) {
                 List<ProjectDO> list = this.baseMapper.getProjectReviewList(projectJudgeDO.getId(), reviewVocationalNumDTO.getMatchId(), null);
                 List<ProjectDO> list = this.baseMapper.getProjectReviewList(projectJudgeDO.getId(), reviewVocationalNumDTO.getMatchId(), null);
-                Long vocRematchNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && p.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-                Long vocFinalNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && p.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-                Long secRematchNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && p.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-                Long secFinalNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && p.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-//                Long secPreliminaryNUm = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.PRELIMINARY_REVIEW) && p.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-                Long reviewedNum = list.stream().filter(p -> p.getProjectSchedule().equals(reviewVocationalNumDTO.getProjectStatus())
-                        && p.getProjectGroup().equals(reviewVocationalNumDTO.getProjectGroup()) && p.getProjectReview().equals(ProjectReview.REVIEW)).count();
-
-                Long notReviewedNum = list.stream().filter(p -> p.getProjectSchedule().equals(reviewVocationalNumDTO.getProjectStatus())
-                        && p.getProjectGroup().equals(reviewVocationalNumDTO.getProjectGroup()) && p.getProjectReview().equals(ProjectReview.ASSIGNED)).count();
-                vocationalProjectNum.setVocRematchNum(vocRematchNum);
-                vocationalProjectNum.setVocFinalNum(vocFinalNum);
+                Long secPreliminaryNUm = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)).count();
+                Long secRematchNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)).count();
+                Long secFinalNum = list.stream().filter(p -> p.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)).count();
+                Long reviewedNum = list.stream().filter(p -> p.getProjectSchedule().equals(reviewVocationalNumDTO.getProjectSchedule()) && p.getProjectReview().equals(ProjectReview.REVIEW)).count();
+
+                Long notReviewedNum = list.stream().filter(p -> p.getProjectSchedule().equals(reviewVocationalNumDTO.getProjectSchedule()) && p.getProjectReview().equals(ProjectReview.ASSIGNED)).count();
+
                 vocationalProjectNum.setSecRematchNum(secRematchNum);
                 vocationalProjectNum.setSecRematchNum(secRematchNum);
                 vocationalProjectNum.setSecFinalNum(secFinalNum);
                 vocationalProjectNum.setSecFinalNum(secFinalNum);
-//                vocationalProjectNum.setSecPreliminaryNUm(secPreliminaryNUm);
+                vocationalProjectNum.setSecPreliminaryNUm(secPreliminaryNUm);
                 vocationalProjectNum.setReviewedNum(reviewedNum);
                 vocationalProjectNum.setReviewedNum(reviewedNum);
                 vocationalProjectNum.setNotReviewedNum(notReviewedNum);
                 vocationalProjectNum.setNotReviewedNum(notReviewedNum);
             }
             }
@@ -803,31 +871,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     public ProjectAssignNumVO getVocationalAssignNum(ReviewListDTO reviewListDTO) {
     public ProjectAssignNumVO getVocationalAssignNum(ReviewListDTO reviewListDTO) {
         ProjectAssignNumVO projectAssignNumVO = new ProjectAssignNumVO();
         ProjectAssignNumVO projectAssignNumVO = new ProjectAssignNumVO();
 
 
-        List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
-                .lambda()
-                .eq(ProjectDO::getMatchId, reviewListDTO.getMatchId())
-                .isNotNull(ProjectDO::getProjectAssigned)
-        );
+        AdministerDO administerDO = administerDAO.selectById(reviewListDTO.getUserId());
+        List<ProjectDO> list = this.baseMapper.getVocationalAssignNum(reviewListDTO.getUserId(), reviewListDTO.getMatchId(), administerDO.getCollege());
 
 
         Long assignNum = list.stream().filter(projectDO -> projectDO.getProjectAssigned().equals(ProjectReview.ASSIGNED) &&
         Long assignNum = list.stream().filter(projectDO -> projectDO.getProjectAssigned().equals(ProjectReview.ASSIGNED) &&
-                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectStatus()) && projectDO.getProjectGroup().equals(reviewListDTO.getProjectGroup())).count();
+                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectSchedule())).count();
 
 
         Long unassignedNum = list.stream().filter(projectDO -> projectDO.getProjectAssigned().equals(ProjectReview.UNASSIGNED) &&
         Long unassignedNum = list.stream().filter(projectDO -> projectDO.getProjectAssigned().equals(ProjectReview.UNASSIGNED) &&
-                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectStatus()) && projectDO.getProjectGroup().equals(reviewListDTO.getProjectGroup())).count();
+                projectDO.getProjectSchedule().equals(reviewListDTO.getProjectSchedule())).count();
 
 
-        Long vocRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-        Long vocFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.SECONDARY_GROUP)).count();
-        Long secRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-        Long secFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
-//        Long secPreliminaryNUm = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.PRELIMINARY_REVIEW) && projectDO.getProjectGroup().equals(ProjectType.VOCATIONAL_GROUP)).count();
+        Long secPreliminaryNUm = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SCHOOL_REVIEW)).count();
+        Long secRematchNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.SEMI_FINAL_REVIEW)).count();
+        Long secFinalNum = list.stream().filter(projectDO -> projectDO.getProjectSchedule().equals(ProjectSchedule.FINAL_REVIEW)).count();
 
 
         projectAssignNumVO.setAssignNum(assignNum);
         projectAssignNumVO.setAssignNum(assignNum);
         projectAssignNumVO.setUnassignedNum(unassignedNum);
         projectAssignNumVO.setUnassignedNum(unassignedNum);
-        projectAssignNumVO.setVocRematchNum(vocRematchNum);
-        projectAssignNumVO.setVocFinalNum(vocFinalNum);
         projectAssignNumVO.setSecRematchNum(secRematchNum);
         projectAssignNumVO.setSecRematchNum(secRematchNum);
         projectAssignNumVO.setSecFinalNum(secFinalNum);
         projectAssignNumVO.setSecFinalNum(secFinalNum);
-//        projectAssignNumVO.setSecPreliminaryNUm(secPreliminaryNUm);
+        projectAssignNumVO.setSecPreliminaryNUm(secPreliminaryNUm);
         return projectAssignNumVO;
         return projectAssignNumVO;
     }
     }
 
 
@@ -960,6 +1021,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
             projectDO.setProjectType(ProjectType.MAIN_TRACK);
             projectDO.setProjectType(ProjectType.MAIN_TRACK);
             projectDO.setProjectGroup(ProjectType.MAIN_TRACK);
             projectDO.setProjectGroup(ProjectType.MAIN_TRACK);
+            projectDO.setProjectAssigned(ProjectReview.UNASSIGNED);
+            projectDO.setProjectReview(ProjectReview.TO_REVIEWED);
             if (matchDictDO != null) {
             if (matchDictDO != null) {
                 projectDO.setMatchId(matchDictDO.getId());
                 projectDO.setMatchId(matchDictDO.getId());
             }
             }
@@ -1313,10 +1376,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         }
         }
     }
     }
 
 
+    @Override
     public void confirm(ProjectDO projectDO) {
     public void confirm(ProjectDO projectDO) {
 
 
         ProjectDO projectDO1 = this.baseMapper.selectById(projectDO.getId());
         ProjectDO projectDO1 = this.baseMapper.selectById(projectDO.getId());
         projectDO1.setProjectStatus(ProjectReview.TO_REVIEWED);
         projectDO1.setProjectStatus(ProjectReview.TO_REVIEWED);
+
+        StudentDO studentDO = studentService.getById(projectDO1.getProposerId());
+
+        //发送短信
+        aliyunSmsUtil.sendNotice(studentDO.getTelephone());
+
         this.baseMapper.updateById(projectDO1);
         this.baseMapper.updateById(projectDO1);
     }
     }
 
 
@@ -1497,7 +1567,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         pd.setProjectStatus(ProjectStatus.UN_SUBMITTED);
         pd.setProjectStatus(ProjectStatus.UN_SUBMITTED);
         this.baseMapper.updateById(pd);
         this.baseMapper.updateById(pd);
     }
     }
-//
+
 //    @Override
 //    @Override
 //    public IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO) {
 //    public IPage getSeedTrackProject(ProjectListPageDTO projectListPageDTO) {
 //        StudentDO studentDO = (StudentDO) Localstorage.getUser();
 //        StudentDO studentDO = (StudentDO) Localstorage.getUser();
@@ -1732,6 +1802,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             }
             }
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
             projectDO.setProjectStatus(ProjectStatus.UN_SUBMITTED);
             projectDO.setProjectSchedule(ProjectSchedule.REGISTER);
             projectDO.setProjectSchedule(ProjectSchedule.REGISTER);
+            projectDO.setProjectReview(ProjectReview.TO_REVIEWED);
+            projectDO.setProjectAssigned(ProjectReview.UNASSIGNED);
             projectDO.setProjectGroup(createVocationalProjectDTO.getProjectGroup());
             projectDO.setProjectGroup(createVocationalProjectDTO.getProjectGroup());
         }
         }
 
 
@@ -2267,23 +2339,26 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             project.setId(projectDO.getId());
             project.setId(projectDO.getId());
 
 
 
 
-            if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule()) ){
-                if ( approveDTO.getProjectStatus() == 7) {
+            if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
+                if (approveDTO.getProjectStatus() == 7) {
                     project.setProjectStatus(ProjectStatus.ABANDON);
                     project.setProjectStatus(ProjectStatus.ABANDON);
                 } else {
                 } else {
                     project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
                     project.setProjectStatus(ProjectReview.TO_REVIEWED);
                     project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 }
                 }
-
+                project.setProjectAssigned(ProjectReview.UNASSIGNED);
+                project.setProjectReview(ProjectReview.TO_REVIEWED);
             }
             }
 
 
-            if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())){
+            if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())) {
                 if (approveDTO.getProjectStatus() == 7) {
                 if (approveDTO.getProjectStatus() == 7) {
                     project.setProjectStatus(ProjectStatus.ABANDON);
                     project.setProjectStatus(ProjectStatus.ABANDON);
                 } else {
                 } else {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectStatus(ProjectReview.TO_REVIEWED);
                     project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 }
                 }
+                project.setProjectAssigned(ProjectReview.UNASSIGNED);
+                project.setProjectReview(ProjectReview.TO_REVIEWED);
             }
             }
 
 
             if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
             if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
@@ -2303,12 +2378,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 } else if (approveDTO.getProjectStatus() == 4) {
                 } else if (approveDTO.getProjectStatus() == 4) {
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
-                }else if (approveDTO.getProjectStatus() == 7){
+                } else if (approveDTO.getProjectStatus() == 7) {
                     project.setProjectStatus(ProjectStatus.ABANDON);
                     project.setProjectStatus(ProjectStatus.ABANDON);
                 }
                 }
             }
             }
 
 
-            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
+            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
                 /**
                 /**
                  * 决赛通过  ---> 决赛通过
                  * 决赛通过  ---> 决赛通过
                  */
                  */
@@ -2318,10 +2393,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 } else if (approveDTO.getProjectStatus() == 6) {
                 } else if (approveDTO.getProjectStatus() == 6) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
-                }else if (approveDTO.getProjectStatus() == 2){
+                } else if (approveDTO.getProjectStatus() == 2) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
-                }else if (approveDTO.getProjectStatus() == 4){
+                } else if (approveDTO.getProjectStatus() == 4) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                 }
                 }
@@ -2396,14 +2471,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
     @Override
     @Override
     public void exportProjectAll(ProjectCollegeListDTO projectCollegeListDTO) {
     public void exportProjectAll(ProjectCollegeListDTO projectCollegeListDTO) {
         List<Map> data = new ArrayList<>();
         List<Map> data = new ArrayList<>();
+        AdministerDO administerDO = administerDAO.selectById(projectCollegeListDTO.getUserId());
 
 
         ExportProjectDTO project = new ExportProjectDTO();
         ExportProjectDTO project = new ExportProjectDTO();
-        List<ProjectDO> list = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
-                .lambda()
-                .ne(ProjectDO::getProjectStatus, ProjectStatus.UN_SUBMITTED)
-                .eq(ProjectDO::getProjectGroup, projectCollegeListDTO.getProjectGroup())
-                .eq(ProjectDO::getProjectSchedule, projectCollegeListDTO.getProjectSchedule())
-                .eq(ProjectDO::getMatchId, projectCollegeListDTO.getMatchId()));
+        List<ProjectDO> list = this.baseMapper.exportProjectReview(projectCollegeListDTO.getUserId(), projectCollegeListDTO.getMatchId(), projectCollegeListDTO.getProjectSchedule(), administerDO.getCollege());
         if (list != null && list.size() > 0) {
         if (list != null && list.size() > 0) {
             for (ProjectDO projectDO : list) {
             for (ProjectDO projectDO : list) {
                 if (projectDO != null) {
                 if (projectDO != null) {
@@ -2414,6 +2485,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         project.setName(studentDO.getName());
                         project.setName(studentDO.getName());
                         project.setMajor(studentDO.getMajor());
                         project.setMajor(studentDO.getMajor());
                         project.setTelephone(studentDO.getTelephone());
                         project.setTelephone(studentDO.getTelephone());
+                        project.setCollege(studentDO.getCollege());
                     }
                     }
 
 
                     MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                     MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
@@ -2432,7 +2504,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                         } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                             teacher += memberDO.getName() + ",";
                             teacher += memberDO.getName() + ",";
                         } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
                         } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
-                            project.setStudentNo(memberDO.getStudentNo());
+//                            project.setEducation(memberDO.getDeleteTime());
                         }
                         }
                     }
                     }
                     if (StringUtils.isNotBlank(teamMember)) {
                     if (StringUtils.isNotBlank(teamMember)) {
@@ -2491,7 +2563,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                         } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                             teacher += memberDO.getName() + ",";
                             teacher += memberDO.getName() + ",";
                         } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
                         } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
-                            project.setStudentNo(memberDO.getStudentNo());
+//                            project.setStudentNo(memberDO.getStudentNo());
                         }
                         }
                     }
                     }
                     if (StringUtils.isNotBlank(teamMember)) {
                     if (StringUtils.isNotBlank(teamMember)) {
@@ -2524,23 +2596,27 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         ProjectDO project = new ProjectDO();
         ProjectDO project = new ProjectDO();
         project.setId(projectDO.getId());
         project.setId(projectDO.getId());
 
 
-        if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule()) ){
-            if ( approveDTO.getProjectStatus() == 7) {
+        if (ProjectSchedule.REGISTER.equals(projectDO.getProjectSchedule())) {
+            if (approveDTO.getProjectStatus() == 7) {
                 project.setProjectStatus(ProjectStatus.ABANDON);
                 project.setProjectStatus(ProjectStatus.ABANDON);
             } else {
             } else {
                 project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
                 project.setProjectSchedule(ProjectSchedule.SCHOOL_REVIEW);
                 project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 project.setProjectStatus(ProjectReview.TO_REVIEWED);
             }
             }
-
+            project.setProjectAssigned(ProjectReview.UNASSIGNED);
+            project.setProjectReview(ProjectReview.TO_REVIEWED);
         }
         }
 
 
-        if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())){
+
+        if (ProjectSchedule.SCHOOL_REVIEW.equals(projectDO.getProjectSchedule())) {
             if (approveDTO.getProjectStatus() == 7) {
             if (approveDTO.getProjectStatus() == 7) {
                 project.setProjectStatus(ProjectStatus.ABANDON);
                 project.setProjectStatus(ProjectStatus.ABANDON);
             } else {
             } else {
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectStatus(ProjectReview.TO_REVIEWED);
                 project.setProjectStatus(ProjectReview.TO_REVIEWED);
             }
             }
+            project.setProjectAssigned(ProjectReview.UNASSIGNED);
+            project.setProjectReview(ProjectReview.TO_REVIEWED);
         }
         }
 
 
         if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
         if (ProjectSchedule.SEMI_FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
@@ -2560,16 +2636,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             } else if (approveDTO.getProjectStatus() == 4) {
             } else if (approveDTO.getProjectStatus() == 4) {
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectSchedule(ProjectSchedule.SEMI_FINAL_REVIEW);
                 project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                 project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
-            }else if (approveDTO.getProjectStatus() == 7){
+            } else if (approveDTO.getProjectStatus() == 7) {
                 project.setProjectStatus(ProjectStatus.ABANDON);
                 project.setProjectStatus(ProjectStatus.ABANDON);
             }
             }
         }
         }
 
 
-        if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
+        if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
             /**
             /**
              * 决赛通过  ---> 决赛通过
              * 决赛通过  ---> 决赛通过
              */
              */
-            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())){
+            if (ProjectSchedule.FINAL_REVIEW.equals(projectDO.getProjectSchedule())) {
                 /**
                 /**
                  * 决赛通过  ---> 决赛通过
                  * 决赛通过  ---> 决赛通过
                  */
                  */
@@ -2579,10 +2655,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 } else if (approveDTO.getProjectStatus() == 6) {
                 } else if (approveDTO.getProjectStatus() == 6) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_SILVER_AWARD);
-                }else if (approveDTO.getProjectStatus() == 2){
+                } else if (approveDTO.getProjectStatus() == 2) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_WINNING_AWARD);
-                }else if (approveDTO.getProjectStatus() == 4){
+                } else if (approveDTO.getProjectStatus() == 4) {
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectSchedule(ProjectSchedule.FINAL_REVIEW);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                     project.setProjectStatus(ProjectStatus.REMATCH_BRONZE_AWARD);
                 }
                 }
@@ -2703,6 +2779,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     project.setName(studentDO.getName());
                     project.setName(studentDO.getName());
                     project.setMajor(studentDO.getMajor());
                     project.setMajor(studentDO.getMajor());
                     project.setTelephone(studentDO.getTelephone());
                     project.setTelephone(studentDO.getTelephone());
+                    project.setCollege(studentDO.getCollege());
                 }
                 }
 
 
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
                 MatchDictDO matchDictDO = matchDictService.getById(projectDO.getMatchId());
@@ -2721,7 +2798,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                     } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                     } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                         teacher += memberDO.getName() + ",";
                         teacher += memberDO.getName() + ",";
                     } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
                     } else if (memberDO.getType().equals(MemberType.PRINCIPAL)) {
-                        project.setStudentNo(memberDO.getStudentNo());
+//                        project.setStudentNo(memberDO.getStudentNo());
                     }
                     }
                 }
                 }
                 if (StringUtils.isNotBlank(teamMember)) {
                 if (StringUtils.isNotBlank(teamMember)) {
@@ -2801,6 +2878,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
     @Override
     @Override
     public IPage<ReviewListVO> getReviewList(ReviewListDTO reviewListDTO) {
     public IPage<ReviewListVO> getReviewList(ReviewListDTO reviewListDTO) {
+        AdministerDO administerDO = administerDAO.selectById(reviewListDTO.getUserId());
         if (reviewListDTO.getProjectReview() != null) {
         if (reviewListDTO.getProjectReview() != null) {
             if (reviewListDTO.getProjectReview().equals(ProjectReview.TO_REVIEWED) ||
             if (reviewListDTO.getProjectReview().equals(ProjectReview.TO_REVIEWED) ||
                     reviewListDTO.getProjectReview().equals(ProjectReview.SUBMITTED)) {
                     reviewListDTO.getProjectReview().equals(ProjectReview.SUBMITTED)) {
@@ -2819,7 +2897,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 reviewListDTO.getMatchId(),
                 reviewListDTO.getMatchId(),
                 reviewListDTO.getProjectStatus(),
                 reviewListDTO.getProjectStatus(),
                 reviewListDTO.getProjectAssigned(),
                 reviewListDTO.getProjectAssigned(),
-                reviewListDTO.getProjectProgress());
+                reviewListDTO.getProjectProgress(),
+                reviewListDTO.getProjectTrack(),
+                reviewListDTO.getUserId(), administerDO.getCollege());
 
 
         for (ReviewListVO record : iPage.getRecords()) {
         for (ReviewListVO record : iPage.getRecords()) {
             StudentDO studentDO = studentService.getById(record.getProposerId());
             StudentDO studentDO = studentService.getById(record.getProposerId());
@@ -3207,7 +3287,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                 ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                         .lambda()
                         .lambda()
                         .eq(ProjectReviewPeriodDO::getMatchId, project.getMatchId())
                         .eq(ProjectReviewPeriodDO::getMatchId, project.getMatchId())
-                        .eq(ProjectReviewPeriodDO::getProjectGroup, project.getProjectGroup())
                         .eq(ProjectReviewPeriodDO::getProjectSchedule, project.getProjectSchedule()));
                         .eq(ProjectReviewPeriodDO::getProjectSchedule, project.getProjectSchedule()));
                 if (projectReviewPeriodDO != null) {
                 if (projectReviewPeriodDO != null) {
                     if (projectReviewPeriodDO.getStartTime().after(new Date())) {
                     if (projectReviewPeriodDO.getStartTime().after(new Date())) {
@@ -3234,7 +3313,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
                 Integer num = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                 Integer num = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                         .lambda()
                         .lambda()
-                        .eq(ProjectReviewDO::getProjectId, project.getId()));
+                        .eq(ProjectReviewDO::getProjectId, project.getId())
+                        .eq(ProjectReviewDO::getProjectSchedule, projectReviewDO.getProjectSchedule()));
 
 
                 Integer submitNum = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                 Integer submitNum = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                         .lambda()
                         .lambda()
@@ -3264,7 +3344,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
             ProjectReviewPeriodDO projectReviewPeriodDO = projectReviewPeriodService.getOne(new QueryWrapper<ProjectReviewPeriodDO>()
                     .lambda()
                     .lambda()
                     .eq(ProjectReviewPeriodDO::getMatchId, project.getMatchId())
                     .eq(ProjectReviewPeriodDO::getMatchId, project.getMatchId())
-                    .eq(ProjectReviewPeriodDO::getProjectGroup, project.getProjectGroup())
                     .eq(ProjectReviewPeriodDO::getProjectSchedule, project.getProjectSchedule()));
                     .eq(ProjectReviewPeriodDO::getProjectSchedule, project.getProjectSchedule()));
             if (projectReviewPeriodDO != null) {
             if (projectReviewPeriodDO != null) {
                 if (projectReviewPeriodDO.getStartTime().after(new Date())) {
                 if (projectReviewPeriodDO.getStartTime().after(new Date())) {
@@ -3291,7 +3370,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
             Integer num = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
             Integer num = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                     .lambda()
                     .lambda()
-                    .eq(ProjectReviewDO::getProjectId, projectReviewScoreDTO.getId()));
+                    .eq(ProjectReviewDO::getProjectId, projectReviewScoreDTO.getId())
+                    .eq(ProjectReviewDO::getProjectSchedule, projectReviewDO.getProjectSchedule()));
 
 
             Integer submitNum = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
             Integer submitNum = projectReviewService.count(new QueryWrapper<ProjectReviewDO>()
                     .lambda()
                     .lambda()
@@ -3306,7 +3386,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
             ProjectReviewDO projectReview = new ProjectReviewDO();
             ProjectReviewDO projectReview = new ProjectReviewDO();
             projectReview.setId(projectReviewDO.getId());
             projectReview.setId(projectReviewDO.getId());
-            projectReview.setScore(projectReviewScoreDTO.getScore());
+            projectReview.setScore(projectReviewDO.getReviewScore());
             projectReview.setReviewStatus(ProjectReview.SUBMITTED);
             projectReview.setReviewStatus(ProjectReview.SUBMITTED);
             projectReview.setReviewTime(new Date());
             projectReview.setReviewTime(new Date());
             projectReview.setReviewOpinion(projectReviewDO.getReviewOpinion());
             projectReview.setReviewOpinion(projectReviewDO.getReviewOpinion());
@@ -3617,7 +3697,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         projectDataOverview.setFinalsSilverAwardNum(finalsSilverAwardNum);
         projectDataOverview.setFinalsSilverAwardNum(finalsSilverAwardNum);
         projectDataOverview.setFinalsGoldAwardNum(finalsGoldAwardNum);
         projectDataOverview.setFinalsGoldAwardNum(finalsGoldAwardNum);
         projectDataOverview.setSchoolProjectNum(schoolProjectNum + preliminaryProjectNum + rematchProjectNum + finalProjectNum);
         projectDataOverview.setSchoolProjectNum(schoolProjectNum + preliminaryProjectNum + rematchProjectNum + finalProjectNum);
-        projectDataOverview.setRematchProjectNum(rematchProjectNum + finalProjectNum);
+        projectDataOverview.setRematchProjectNum(rematchProjectNum);
         projectDataOverview.setPreliminaryProjectNum(preliminaryProjectNum);
         projectDataOverview.setPreliminaryProjectNum(preliminaryProjectNum);
         projectDataOverview.setRegisteringNum(registeringNum++);
         projectDataOverview.setRegisteringNum(registeringNum++);
 
 
@@ -3625,7 +3705,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
             初赛比例
             初赛比例
          */
          */
         if (preliminaryProjectNum > 0) {
         if (preliminaryProjectNum > 0) {
-            Double preliminaryProportion = new BigDecimal(preliminaryProjectNum).divide(new BigDecimal(preliminaryProjectNum + rematchProjectNum + finalProjectNum), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+            Double preliminaryProportion = new BigDecimal(preliminaryProjectNum).divide(new BigDecimal(projectDataOverview.getProjectNum()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             projectDataOverview.setPreliminaryProportion(preliminaryProportion);
             projectDataOverview.setPreliminaryProportion(preliminaryProportion);
         } else {
         } else {
             projectDataOverview.setRematchProportion(0.0);
             projectDataOverview.setRematchProportion(0.0);
@@ -3634,8 +3714,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         /*
         /*
             复赛比例
             复赛比例
          */
          */
-        if (rematchProjectNum > 0 && schoolProjectNum > 0) {
-            Double rematchProportion = new BigDecimal(rematchProjectNum + finalProjectNum).divide(new BigDecimal(preliminaryProjectNum + rematchProjectNum + finalProjectNum), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+        if (rematchProjectNum > 0) {
+            Double rematchProportion = new BigDecimal(rematchProjectNum).divide(new BigDecimal(projectDataOverview.getProjectNum()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             projectDataOverview.setRematchProportion(rematchProportion);
             projectDataOverview.setRematchProportion(rematchProportion);
         } else {
         } else {
             projectDataOverview.setRematchProportion(0.0);
             projectDataOverview.setRematchProportion(0.0);
@@ -3645,8 +3725,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         /*
         /*
             决赛比例
             决赛比例
          */
          */
-        if (finalProjectNum > 0 && rematchProjectNum > 0) {
-            Double finalProportion = new BigDecimal(finalProjectNum).divide(new BigDecimal(rematchProjectNum + finalProjectNum), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+        if (finalProjectNum > 0) {
+            Double finalProportion = new BigDecimal(finalProjectNum).divide(new BigDecimal(projectDataOverview.getProjectNum()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             projectDataOverview.setFinalProportion(finalProportion);
             projectDataOverview.setFinalProportion(finalProportion);
         } else {
         } else {
             projectDataOverview.setFinalProportion(0.0);
             projectDataOverview.setFinalProportion(0.0);
@@ -3702,16 +3782,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         List<Map> data = new ArrayList<>();
         List<Map> data = new ArrayList<>();
         List<ExcelFieldVO> fieldList = ExcelUtil.getField(ProjectJudgeVO.class);
         List<ExcelFieldVO> fieldList = ExcelUtil.getField(ProjectJudgeVO.class);
         ProjectJudgeVO projectJudgeVO = new ProjectJudgeVO();
         ProjectJudgeVO projectJudgeVO = new ProjectJudgeVO();
-        List<ProjectDO> projectList = this.baseMapper.selectList(new QueryWrapper<ProjectDO>()
-                .lambda()
-                .ne(ProjectDO::getProjectSchedule, ProjectSchedule.SCHOOL_REVIEW)
-                .eq(StringUtils.isNotBlank(reviewListDTO.getProjectGroup()), ProjectDO::getProjectGroup, reviewListDTO.getProjectGroup())
-                .eq(StringUtils.isNotBlank(reviewListDTO.getProjectSchedule()), ProjectDO::getProjectSchedule, reviewListDTO.getProjectSchedule())
-                .eq(ProjectDO::getMatchId, reviewListDTO.getMatchId()));
+        AdministerDO administerDO = administerDAO.selectById(reviewListDTO.getUserId());
+        List<ProjectDO> projectList = this.baseMapper.exportProjectReview(reviewListDTO.getUserId(), reviewListDTO.getMatchId(), reviewListDTO.getProjectSchedule(), administerDO.getCollege());
         for (ProjectDO projectDO : projectList) {
         for (ProjectDO projectDO : projectList) {
             if (projectDO != null) {
             if (projectDO != null) {
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
-                projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
+                projectJudgeVO.setProjectGroup(projectDO.getProjectGroup());
+                projectJudgeVO.setProjectTrack(projectDO.getProjectTrack());
+                projectJudgeVO.setUnitTrack(projectDO.getUnitTrack());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
 //                projectJudgeVO.setCollege(projectDO.getCollege());
 //                projectJudgeVO.setCollege(projectDO.getCollege());
 
 
@@ -3723,6 +3801,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                 StudentDO studentDO = studentService.getById(projectDO.getProposerId());
                 StudentDO studentDO = studentService.getById(projectDO.getProposerId());
                 if (studentDO != null) {
                 if (studentDO != null) {
                     projectJudgeVO.setLeader(studentDO.getName());
                     projectJudgeVO.setLeader(studentDO.getName());
+                    projectJudgeVO.setCollege(studentDO.getCollege());
                 }
                 }
 
 
                 Map<String, Object> map = JSON.parseObject(JSON.toJSONString(projectJudgeVO), Map.class);
                 Map<String, Object> map = JSON.parseObject(JSON.toJSONString(projectJudgeVO), Map.class);
@@ -3767,7 +3846,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         for (ProjectDO projectDO : projectList) {
         for (ProjectDO projectDO : projectList) {
             if (projectDO != null) {
             if (projectDO != null) {
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
                 projectJudgeVO.setProjectName(projectDO.getProjectName());
-                projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
+//                projectJudgeVO.setProjectProgress(projectDO.getProjectProgress());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
                 projectJudgeVO.setProjectSchedule(projectDO.getProjectSchedule());
 //                projectJudgeVO.setCollege(projectDO.getCollege());
 //                projectJudgeVO.setCollege(projectDO.getCollege());
 
 
@@ -4032,6 +4111,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
 
 
     @Override
     @Override
     public SeedTrackProjectNumVO getSeedTrackProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
     public SeedTrackProjectNumVO getSeedTrackProjectNum(SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
+        AdministerDO administerDO = administerDAO.selectById(seedTrackProjectNumDTO.getUserId());
         Map<String, Object> map = Localstorage.getMap();
         Map<String, Object> map = Localstorage.getMap();
         CollegesDictDO collegesDictDO = new CollegesDictDO();
         CollegesDictDO collegesDictDO = new CollegesDictDO();
         if (map.get("type").equals(Platform.school)) {
         if (map.get("type").equals(Platform.school)) {
@@ -4039,7 +4119,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
         }
         }
 
 
         SeedTrackProjectNumVO seedTrackProjectNumVO = new SeedTrackProjectNumVO();
         SeedTrackProjectNumVO seedTrackProjectNumVO = new SeedTrackProjectNumVO();
-        List<ProjectDO> list = this.baseMapper.getSeedTrackProjectList(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), collegesDictDO.getName(), seedTrackProjectNumDTO.getProjectProgress());
+        List<ProjectDO> list = this.baseMapper.getSeedTrackProjectList(seedTrackProjectNumDTO.getMatchId(), seedTrackProjectNumDTO.getProjectGroup(), collegesDictDO.getName(), seedTrackProjectNumDTO.getProjectProgress(), seedTrackProjectNumDTO.getUserId(), administerDO.getCollege());
         Integer schoolProjectNum = 0;
         Integer schoolProjectNum = 0;
         Integer rematchProjectNum = 0;
         Integer rematchProjectNum = 0;
         Integer finalProjectNum = 0;
         Integer finalProjectNum = 0;
@@ -4095,7 +4175,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDAO, ProjectDO> imple
                         } else {
                         } else {
                             project.setTelephone(memberDO.getTelephone());
                             project.setTelephone(memberDO.getTelephone());
                         }
                         }
-                        project.setStudentNo(memberDO.getStudentNo());
+//                        project.setStudentNo(memberDO.getStudentNo());
                     } else if (memberDO.getType().equals(MemberType.TEAM_MEMBER)) {
                     } else if (memberDO.getType().equals(MemberType.TEAM_MEMBER)) {
                         teamMember += memberDO.getName() + ",";
                         teamMember += memberDO.getName() + ",";
                     } else if (memberDO.getType().equals(MemberType.MENTOR)) {
                     } else if (memberDO.getType().equals(MemberType.MENTOR)) {

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

+package com.zhongzhi.service.impl;
+
+import com.zhongzhi.model.ProjectTrackDO;
+import com.zhongzhi.dao.ProjectTrackDAO;
+import com.zhongzhi.service.ProjectTrackService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+* <p>
+    * 赛道字典表 服务实现类
+    * </p>
+*
+* @author DengMin
+* @since 2025-03-28
+*/
+@Service
+    public class ProjectTrackServiceImpl extends ServiceImpl<ProjectTrackDAO, ProjectTrackDO> implements ProjectTrackService {
+
+    }

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

@@ -103,12 +103,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDAO, StudentDO> imple
             throw new HttpException(10024);
             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);
+//        }
 
 
         String token = JwtUtil.generateToken(studentDO.getId(), SmsCode.student);
         String token = JwtUtil.generateToken(studentDO.getId(), SmsCode.student);
         BeanUtils.copyProperties(studentDO, studentInfoVO);
         BeanUtils.copyProperties(studentDO, studentInfoVO);

src/main/java/com/zhongzhi/vo/administer/AdministerVO.java

@@ -8,6 +8,8 @@ import java.util.List;
 @Data
 @Data
 public class AdministerVO {
 public class AdministerVO {
 
 
+    private Long id;
+
     private String token;
     private String token;
 
 
     private String username;
     private String username;

src/main/java/com/zhongzhi/vo/administer/GetAdministerPageVO.java

+package com.zhongzhi.vo.administer;
+
+import com.zhongzhi.model.AdministerDO;
+import com.zhongzhi.model.AdministerPermissionDO;
+import com.zhongzhi.model.AdministerTrackMappingDO;
+import com.zhongzhi.vo.permission.PermissionVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetAdministerPageVO extends AdministerDO {
+
+    private List<AdministerTrackMappingDO> administerTrackMappingDOS;
+
+    private List<PermissionVO> administerPermissionDOS;
+}

src/main/java/com/zhongzhi/vo/college/GetCollegeInfoVO.java

+package com.zhongzhi.vo.college;
+
+import lombok.Data;
+
+@Data
+public class GetCollegeInfoVO {
+
+    private Long id;
+
+    private String name;
+
+    private String code;
+
+}

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

@@ -56,4 +56,6 @@ public class ProjectJudgePageVO {
      * 待评审数量
      * 待评审数量
      */
      */
     private Integer notReviewedNum;
     private Integer notReviewedNum;
+
+    private String projectTrack;
 }
 }

src/main/java/com/zhongzhi/vo/oss/UploadFileVO.java

@@ -7,4 +7,6 @@ public class UploadFileVO {
 
 
     private String url;
     private String url;
 
 
+    private String requestId;
+
 }
 }

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

@@ -5,27 +5,27 @@ import lombok.Data;
 @Data
 @Data
 public class ProjectAssignNumVO {
 public class ProjectAssignNumVO {
 
 
+//    /**
+//     * 中职复赛项目数量
+//     */
+//    private Long vocRematchNum;
+//    /**
+//     * 中职决赛项目数量
+//     */
+//    private Long vocFinalNum;
     /**
     /**
-     * 中职复赛项目数量
-     */
-    private Long vocRematchNum;
-    /**
-     * 中职决赛项目数量
-     */
-    private Long vocFinalNum;
-    /**
-     * 高职复赛项目数量
+     * 复赛项目数量
      */
      */
     private Long secRematchNum;
     private Long secRematchNum;
     /**
     /**
-     * 高职决赛项目数量
+     * 决赛项目数量
      */
      */
     private Long secFinalNum;
     private Long secFinalNum;
 
 
     /**
     /**
-     * 高职初赛项目数量
+     * 初赛项目数量
      */
      */
-//    private Long secPreliminaryNUm;
+    private Long secPreliminaryNUm;
 
 
     /**
     /**
      * 已分配
      * 已分配

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

@@ -16,11 +16,17 @@ public class ProjectJudgeVO {
     private String leader;
     private String leader;
 
 
     @ExcelColumn(col = 4, value = "组别")
     @ExcelColumn(col = 4, value = "组别")
-    private String projectProgress;
+    private String projectGroup;
 
 
-    @ExcelColumn(col = 5, value = "院校")
+    @ExcelColumn(col = 5, value = "赛道")
+    private String projectTrack;
+
+    @ExcelColumn(col = 6, value = "单元赛道")
+    private String unitTrack;
+
+    @ExcelColumn(col = 7, value = "院校")
     private String college;
     private String college;
 
 
-    @ExcelColumn(col = 6, value = "阶段")
+    @ExcelColumn(col = 8, value = "阶段")
     private String projectSchedule;
     private String projectSchedule;
 }
 }

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

@@ -26,8 +26,14 @@ public class ProjectPageVO {
 
 
     private String projectTrack;
     private String projectTrack;
 
 
+    private String school;
+
     private String college;
     private String college;
 
 
+    private String major;
+
+    private String telephone;
+
     private String name;
     private String name;
 
 
     private Double score;
     private Double score;

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

@@ -15,8 +15,18 @@ public class ReviewListVO {
 
 
     private String projectGroup;
     private String projectGroup;
 
 
+    private String college;
+
     private String school;
     private String school;
 
 
+    private String major;
+
+    private String telephone;
+
+    private String projectTrack;
+
+    private String unitTrack;
+
     private String projectSchedule;
     private String projectSchedule;
 
 
     private String reviewResult;
     private String reviewResult;

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

@@ -11,6 +11,7 @@ import com.zhongzhi.model.ProjectWorksDO;
 import com.zhongzhi.vo.member.ProjectMemberVO;
 import com.zhongzhi.vo.member.ProjectMemberVO;
 import com.zhongzhi.vo.review.FinalsReviewVO;
 import com.zhongzhi.vo.review.FinalsReviewVO;
 import com.zhongzhi.vo.review.ReMatchReviewVO;
 import com.zhongzhi.vo.review.ReMatchReviewVO;
+import com.zhongzhi.vo.review.SchoolReviewVO;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
@@ -284,6 +285,11 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
     /**
     /**
      * 复赛评分
      * 复赛评分
      */
      */
+    private List<SchoolReviewVO> schools;
+
+    /**
+     * 复赛评分
+     */
     private List<ReMatchReviewVO> rematch;
     private List<ReMatchReviewVO> rematch;
 
 
     /**
     /**
@@ -329,4 +335,8 @@ public class SeedTrackProjectDetailVO extends ProjectMemberVO {
     private Integer editStatus;
     private Integer editStatus;
 
 
     private String vodUrl;
     private String vodUrl;
+
+    private String aboveProvinceReward;
+
+    private String rewardUrl;
 }
 }

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

@@ -6,32 +6,21 @@ import lombok.Data;
 public class VocationalProjectNum {
 public class VocationalProjectNum {
 
 
     /**
     /**
-     * 中职复赛项目数量
+     * 初赛项目数量
      */
      */
-    private Long vocRematchNum;
+    private Long secPreliminaryNUm;
     /**
     /**
-     * 中职决赛项目数量
-     */
-    private Long vocFinalNum;
-    /**
-     * 高职复赛项目数量
+     * 复赛项目数量
      */
      */
     private Long secRematchNum;
     private Long secRematchNum;
     /**
     /**
-     * 高职决赛项目数量
+     * 决赛项目数量
      */
      */
     private Long secFinalNum;
     private Long secFinalNum;
-
-    /**
-     * 高职初赛项目数量
-     */
-//    private Long secPreliminaryNUm;
-
     /**
     /**
      * 已评审项目数量
      * 已评审项目数量
      */
      */
     private Long reviewedNum;
     private Long reviewedNum;
-
     /**
     /**
      * 待评审项目数量
      * 待评审项目数量
      */
      */

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

@@ -5,28 +5,29 @@ import lombok.Data;
 @Data
 @Data
 public class VocationalReviewNumVO {
 public class VocationalReviewNumVO {
 
 
+//    /**
+//     * 中职复赛项目数量
+//     */
+//    private Long vocRematchNum;
+//    /**
+//     * 中职决赛项目数量
+//     */
+//    private Long vocFinalNum;
+
     /**
     /**
-     * 中职复赛项目数量
-     */
-    private Long vocRematchNum;
-    /**
-     * 中职决赛项目数量
+     * 初赛项目数量
      */
      */
-    private Long vocFinalNum;
+    private Long secPreliminaryNUm;
+
     /**
     /**
-     * 高职复赛项目数量
+     * 复赛项目数量
      */
      */
     private Long secRematchNum;
     private Long secRematchNum;
     /**
     /**
-     * 高职决赛项目数量
+     * 决赛项目数量
      */
      */
     private Long secFinalNum;
     private Long secFinalNum;
 
 
-    /**
-     * 高职初赛项目数量
-     */
-    private Long secPreliminaryNUm;
-
     private Long review;
     private Long review;
 
 
     private Long notReview;
     private Long notReview;

src/main/java/com/zhongzhi/vo/review/SchoolReviewVO.java

@@ -26,4 +26,6 @@ public class SchoolReviewVO {
      * 评审时间
      * 评审时间
      */
      */
     private String schoolTime;
     private String schoolTime;
+
+    private String schoolJudgeName;
 }
 }

src/main/resources/application-dev.properties

@@ -3,11 +3,11 @@
 server.port=23503
 server.port=23503
 # 数据源配置
 # 数据源配置
 # 数据源配置
 # 数据源配置
-spring.datasource.url=jdbc:mysql://139.224.253.21:3306/gtja?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://116.62.57.92: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=root
-spring.datasource.password=ykhladmin302
+spring.datasource.username=devloper
+spring.datasource.password=dev@1553$
 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-pre.properties

-# 预生产环境配置
-# 端口号
-server.port=11210
-# 数据源配置
-spring.datasource.url=jdbc:mysql://116.62.57.92:3306/zhongzhi?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=devloper
-spring.datasource.password=dev@1553$
-spring.datasource.druid.initialSize=5
-spring.datasource.druid.minIdle=5
-spring.datasource.druid.maxActive=20
-spring.datasource.druid.maxWait=60000
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-spring.datasource.druid.minEvictableIdleTimeMillis=300000
-spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.druid.testWhileIdle=true
-spring.datasource.druid.testOnBorrow=false
-spring.datasource.druid.testOnReturn=false
-spring.datasource.druid.poolPreparedStatements=true
-spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.druid.useGlobalDataSourceStat=true
-# 控制台日志打印
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file

src/main/resources/application-prod.properties

 # 生产环境配置
 # 生产环境配置
 # 端口号
 # 端口号
 server.port=23503
 server.port=23503
+server.tomcat.connection-timeout=600000
 # 数据源配置
 # 数据源配置
-spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/gtja?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.url=jdbc:mysql://rm-uf62202s176hufw8x0o.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_new
 spring.datasource.username=ykadmin_new
@@ -10,8 +12,8 @@ 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
 spring.datasource.druid.maxActive=20
 spring.datasource.druid.maxActive=20
-spring.datasource.druid.maxWait=60000
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+spring.datasource.druid.maxWait=600000
+spring.datasource.druid.timeBetweenEvictionRunsMillis=600000
 spring.datasource.druid.minEvictableIdleTimeMillis=300000
 spring.datasource.druid.minEvictableIdleTimeMillis=300000
 spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.druid.testWhileIdle=true
 spring.datasource.druid.testWhileIdle=true

src/main/resources/application.properties

 # 环境配置
 # 环境配置
-spring.profiles.active=dev
+spring.profiles.active=prod
 # 文件编码 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
@@ -25,8 +25,8 @@ logging.config=classpath:logback-spring.xml
 # 阿里云短信
 # 阿里云短信
 sms.product=Dysmsapi
 sms.product=Dysmsapi
 sms.domain=dysmsapi.aliyuncs.com
 sms.domain=dysmsapi.aliyuncs.com
-sms.accessKeyId=LTAI5tPAH7P7WQVeowo517BE
-sms.accessKeySecret=0ueqhIfdAZyw5lWlBVSLpAxTtx37RY
+sms.accessKeyId=LTAI5tLUBG4B6QxhHrhddc7p
+sms.accessKeySecret=eber38QGHZixTQ6bFfrd80kbg67jIP
 sms.rcsapi=http://rcsapi.wo.cn:8000/umcinterface/sendtempletmsg
 sms.rcsapi=http://rcsapi.wo.cn:8000/umcinterface/sendtempletmsg
 sms.cpcode=AABNUV
 sms.cpcode=AABNUV
 sms.excode=210120
 sms.excode=210120

src/main/resources/mapper/AdministerDAO.xml

@@ -2,21 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhongzhi.dao.AdministerDAO">
 <mapper namespace="com.zhongzhi.dao.AdministerDAO">
 
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zhongzhi.model.AdministerDO">
-        <id column="id" property="id"/>
-        <result column="telephone" property="telephone"/>
-        <result column="username" property="username"/>
-        <result column="avatar" property="avatar"/>
-        <result column="role" property="role"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="delete_time" property="deleteTime"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, telephone, username, avatar, role, create_time, update_time, delete_time
-    </sql>
+    <select id="getAdministerPage" resultType="com.zhongzhi.vo.administer.GetAdministerPageVO">
+        SELECT
+            *
+        FROM
+            administer t
+        WHERE
+            t.delete_time IS NULL
+            AND t.role = #{listItem}
+            <if test="username != null and username != ''">
+                AND t.username LIKE concat('%', #{username}, '%')
+            </if>
+    </select>
 
 
+    <update id="updateAdminister">
+        update administer t
+          set   t.telephone = #{telephone},
+            t.username = #{username},
+            t.avatar = #{avatar},
+            t.role = #{role},
+            t.college = #{college}
+            where id = #{id}
+    </update>
 </mapper>
 </mapper>

src/main/resources/mapper/AdministerTrackMappingMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzhi.dao.AdministerTrackMappingDAO">
+
+        <select id="administerTracks" parameterType="long" resultType="com.zhongzhi.model.ProjectTrackDO">
+            SELECT
+                t2.*
+            FROM
+                administer_track_mapping t
+                left join project_track t2 on t.track_id = t2.id
+            WHERE
+                t.delete_time IS NULL
+                and t2.delete_time is null
+                AND t.administer_id = #{userId}
+        </select>
+
+</mapper>

src/main/resources/mapper/CollegesDictDAO.xml

@@ -60,4 +60,17 @@
         where delete_time is null
         where delete_time is null
     </select>
     </select>
 
 
+    <select id="getCollegeInfo" resultType="com.zhongzhi.vo.college.GetCollegeInfoVO">
+        SELECT
+        t.id,
+        t.NAME,
+        t.CODE
+        FROM
+        colleges_dict t
+        WHERE
+        t.delete_time IS NULL
+        <if test="name != null and name != ''">
+            AND t.`name` LIKE concat('%',#{name} ,'%')
+        </if>
+    </select>
 </mapper>
 </mapper>

src/main/resources/mapper/FinalMatchMemberMapper.xml

@@ -113,7 +113,7 @@ FROM
             </if>
             </if>
             and t.member_type != '车'
             and t.member_type != '车'
         GROUP BY
         GROUP BY
-            t.college_id
+            t3.NAME,t.college_id
     </select>
     </select>
 
 
     <select id="exportList"  resultType="com.zhongzhi.vo.college.ExportListVO">
     <select id="exportList"  resultType="com.zhongzhi.vo.college.ExportListVO">

src/main/resources/mapper/MatchDictDAO.xml

@@ -29,26 +29,26 @@
         where  delete_time is null
         where  delete_time is null
     </select>
     </select>
 
 
-    <select id="getList" resultType="com.zhongzhi.model.MatchDictDO">
-        SELECT
-            p.*
-        FROM project p
-        LEFT JOIN student s ON s.id = p.proposer_id
-        LEFT JOIN colleges_dict c ON c.`name` = s.college
-        <where>
-            AND p.project_status != '填写中'
-            <if test="projectType != null and projectType != ''">
-                AND p.project_type = #{projectType}
-            </if>
-            <if test="projectGroup != null and projectGroup != ''">
-                AND p.project_group = #{projectGroup}
-            </if>
-            AND p.delete_time IS NULL
-            AND s.delete_time IS NULL
-            AND c.delete_time IS NULL
-        </where>
-        GROUP BY
-            c.id
-    </select>
+<!--    <select id="getList" resultType="com.zhongzhi.model.MatchDictDO">-->
+<!--        SELECT-->
+<!--            p.*-->
+<!--        FROM project p-->
+<!--        LEFT JOIN student s ON s.id = p.proposer_id-->
+<!--        LEFT JOIN colleges_dict c ON c.`name` = s.college-->
+<!--        <where>-->
+<!--            AND p.project_status != '填写中'-->
+<!--            <if test="projectType != null and projectType != ''">-->
+<!--                AND p.project_type = #{projectType}-->
+<!--            </if>-->
+<!--            <if test="projectGroup != null and projectGroup != ''">-->
+<!--                AND p.project_group = #{projectGroup}-->
+<!--            </if>-->
+<!--            AND p.delete_time IS NULL-->
+<!--            AND s.delete_time IS NULL-->
+<!--            AND c.delete_time IS NULL-->
+<!--        </where>-->
+<!--        GROUP BY-->
+<!--            c.id-->
+<!--    </select>-->
 
 
 </mapper>
 </mapper>

src/main/resources/mapper/PermissionsDAO.xml

@@ -18,13 +18,17 @@
     </sql>
     </sql>
 
 
     <select id="getPermissionById" resultType="com.zhongzhi.vo.permission.PermissionVO">
     <select id="getPermissionById" resultType="com.zhongzhi.vo.permission.PermissionVO">
-        select
-        p.*
-        from permissions p
-        left join administer_permission ap on ap.permission_id = p.id
-        where ap.administer_id = #{id}
-        and p.delete_time is null
-        and p.delete_time is null
+        SELECT distinct
+        t2.*
+        FROM
+        administer_permission t
+        left join  permissions t2 on t.permission_id = t2.id
+        WHERE
+         t.delete_time IS NULL
+        and t2.delete_time is null
+        <if test="id != null and id != ''">
+        and t.administer_id = #{id}
+        </if>
     </select>
     </select>
 
 
 </mapper>
 </mapper>

src/main/resources/mapper/ProjectDAO.xml

@@ -2,68 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhongzhi.dao.ProjectDAO">
 <mapper namespace="com.zhongzhi.dao.ProjectDAO">
 
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zhongzhi.model.ProjectDO">
-        <id column="id" property="id"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="delete_time" property="deleteTime"/>
-        <result column="proposer_id" property="proposerId"/>
-        <result column="item_field" property="itemField"/>
-        <result column="logo_uri" property="logoUri"/>
-        <result column="project_name" property="projectName"/>
-        <result column="project_group" property="projectGroup"/>
-        <result column="match_id" property="matchId"/>
-        <result column="college" property="college" />
-        <result column="classification" property="classification"/>
-        <result column="address" property="address"/>
-        <result column="project_intro" property="projectIntro"/>
-        <result column="project_creativity" property="projectCreativity"/>
-        <result column="scientific_principle" property="scientificPrinciple"/>
-        <result column="application_prospect" property="applicationProspect"/>
-        <result column="road_show_form" property="roadShowForm"/>
-        <result column="restriction" property="restriction"/>
-        <result column="project_transform" property="projectTransform"/>
-        <result column="result_transfer" property="resultTransfer"/>
-        <result column="competition_owner" property="competitionOwner"/>
-        <result column="competition_first" property="competitionFirst"/>
-        <result column="both_invention" property="bothInvention"/>
-        <result column="project_progress" property="projectProgress"/>
-        <result column="project_stage" property="projectStage"/>
-        <result column="company_name" property="companyName"/>
-        <result column="legal_person_status" property="legalPersonStatus"/>
-        <result column="legal_person_name" property="legalPersonName"/>
-        <result column="position" property="position"/>
-        <result column="register_fund" property="registerFund"/>
-        <result column="register_date" property="registerDate"/>
-        <result column="register_province" property="registerProvince"/>
-        <result column="register_address" property="registerAddress"/>
-        <result column="unify_code" property="unifyCode"/>
-        <result column="print_attachment" property="printAttachment"/>
-        <result column="print_attachment_type" property="printAttachmentType"/>
-        <result column="print_attachment_name" property="printAttachmentName"/>
-        <result column="privacy_setting" property="privacySetting"/>
-        <result column="project_status" property="projectStatus"/>
-        <result column="project_schedule" property="projectSchedule"/>
-        <result column="project_type" property="projectType"/>
-        <result column="project_review" property="projectReview"/>
-        <result column="project_assigned" property="projectAssigned"/>
-        <result column="financial_statement" property="financialStatement"/>
-        <result column="edit_status" property="editStatus"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        create_time,
-        update_time,
-        id, proposer_id, item_field, logo_uri, project_name, project_group, match_id,college ,classification, address,
-        project_intro, project_creativity, scientific_principle, application_prospect, road_show_form, restriction,
-        project_transform, result_transfer, competition_owner, competition_first, both_invention, project_progress,
-        company_name, legal_person_status, legal_person_name, position, register_fund, register_date, register_province,
-        register_address, unify_code, privacy_setting, project_status, project_schedule, project_type, delelte_time
-        ,print_attachment, print_attachment_type, print_attachment_name, project_review, project_assigned,edit_status
-    </sql>
-
     <select id="getListPage" resultType="com.zhongzhi.vo.project.ProjectPageVO">
     <select id="getListPage" resultType="com.zhongzhi.vo.project.ProjectPageVO">
         select
         select
         p.id,
         p.id,
@@ -165,37 +103,73 @@
             </if>
             </if>
             and p.delete_time is null
             and p.delete_time is null
             and s.delete_time is null
             and s.delete_time is null
+            <if test=" userId != null and userId != ''">
+                and p.project_track in (
+                SELECT
+                t2.project_track
+                FROM
+                administer_track_mapping t
+                LEFT JOIN project_track t2 ON t.track_id = t2.id
+                WHERE
+                t.delete_time IS NULL
+                AND t.administer_id = #{userId}
+                )
+            </if>
+            <if test="college!= null and college != ''">
+                and s.college = #{college}
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 
     <select id="getReviewList" resultType="com.zhongzhi.vo.project.ReviewListVO">
     <select id="getReviewList" resultType="com.zhongzhi.vo.project.ReviewListVO">
         select
         select
-        *
-        from project
+        t1.*,
+        t2.college,
+        t2.major,
+        t2.telephone
+        from project t1
+        left join student t2 on t1.proposer_id = t2.id
         <where>
         <where>
             <if test="matchId != null and matchId != ''">
             <if test="matchId != null and matchId != ''">
-                and match_id = #{matchId}
+                and t1.match_id = #{matchId}
             </if>
             </if>
-            <if test="projectStatus != null and projectStatus != ''">
-                and project_schedule = #{projectStatus}
+            <if test="projectSchedule != null and projectSchedule != ''">
+                and t1.project_schedule = #{projectSchedule}
             </if>
             </if>
             <if test="projectReview != null and projectReview != ''">
             <if test="projectReview != null and projectReview != ''">
-                and project_review = #{projectReview}
+                and t1.project_review = #{projectReview}
             </if>
             </if>
             <if test="projectName != null and projectName != ''">
             <if test="projectName != null and projectName != ''">
-                and (project_name like concat('%', #{projectName}, '%') or college like concat('%', #{projectName}, '%'))
+                and (t1.project_name like concat('%', #{projectName}, '%') or t2.college like concat('%', #{projectName}, '%'))
             </if>
             </if>
             <if test="projectGroup != null and projectGroup != ''">
             <if test="projectGroup != null and projectGroup != ''">
-                and project_group = #{projectGroup}
+                and t1.project_group = #{projectGroup}
             </if>
             </if>
             <if test="projectAssigned != null and projectAssigned != ''">
             <if test="projectAssigned != null and projectAssigned != ''">
-                and project_assigned = #{projectAssigned}
+                and t1.project_assigned = #{projectAssigned}
             </if>
             </if>
             <if test="projectProgress != null and projectProgress != ''">
             <if test="projectProgress != null and projectProgress != ''">
-                and project_progress = #{projectProgress}
+                and t1.project_progress = #{projectProgress}
+            </if>
+            <if test="projectTrack != null and projectTrack != ''">
+                and t1.project_track like concat('%', #{projectTrack}, '%')
+            </if>
+            and t1.delete_time is null
+            <if test=" userId != null and userId != ''">
+                and t1.project_track in (
+                SELECT
+                t2.project_track
+                FROM
+                administer_track_mapping t
+                LEFT JOIN project_track t2 ON t.track_id = t2.id
+                WHERE
+                t.delete_time IS NULL
+                AND t.administer_id = #{userId}
+                )
+            </if>
+            <if test="college!= null and college != ''">
+                and t2.college = #{college}
             </if>
             </if>
-            and project_schedule != '校级申请项目'
-            and delete_time is null
         </where>
         </where>
     </select>
     </select>
 
 
@@ -205,9 +179,13 @@
             pr.review_status as reviewStatus,
             pr.review_status as reviewStatus,
             pr.review_score as reviewScore,
             pr.review_score as reviewScore,
             pr.score as score,
             pr.score as score,
-            pr.review_opinion
+            pr.review_opinion,
+            t.college school,
+            t.major,
+            t.telephone
         from project p
         from project p
         left join project_review pr on pr.project_id = p.id
         left join project_review pr on pr.project_id = p.id
+        left join student t on p.proposer_id = t.id
         <where>
         <where>
             <if test="judgeId != null and judgeId != ''">
             <if test="judgeId != null and judgeId != ''">
                 and pr.judge_id = #{judgeId}
                 and pr.judge_id = #{judgeId}
@@ -233,7 +211,6 @@
             and p.delete_time is null
             and p.delete_time is null
             and pr.delete_time is null
             and pr.delete_time is null
         </where>
         </where>
-        order by p.order_no
     </select>
     </select>
 
 
     <select id="getProjectReviewList" resultType="com.zhongzhi.model.ProjectDO">
     <select id="getProjectReviewList" resultType="com.zhongzhi.model.ProjectDO">
@@ -291,6 +268,21 @@
             and p.project_status != '填写中'
             and p.project_status != '填写中'
             and p.delete_time is null
             and p.delete_time is null
             and s.delete_time is null
             and s.delete_time is null
+            <if test=" userId != null and userId != ''">
+                and p.project_track in (
+                SELECT
+                t2.project_track
+                FROM
+                administer_track_mapping t
+                LEFT JOIN project_track t2 ON t.track_id = t2.id
+                WHERE
+                t.delete_time IS NULL
+                AND t.administer_id = #{userId}
+                )
+            </if>
+            <if test="college!= null and college != ''">
+                and s.college = #{college}
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 
@@ -438,4 +430,84 @@
             AND t2.delete_time IS NULL
             AND t2.delete_time IS NULL
     </select>
     </select>
 
 
+    <select id="getVocationalReviewNum" resultType="com.zhongzhi.model.ProjectDO">
+        SELECT
+            p.*
+        FROM
+            project p
+            left join student s on p.proposer_id = s.id
+        WHERE
+            p.delete_time is null
+            and p.match_id = #{matchId}
+            AND p.project_review IN ("待评审","已评审")
+        <if test=" userId != null and userId != ''">
+            and p.project_track in (
+            SELECT
+            t2.project_track
+            FROM
+            administer_track_mapping t
+            LEFT JOIN project_track t2 ON t.track_id = t2.id
+            WHERE
+            t.delete_time IS NULL
+            AND t.administer_id = #{userId}
+            )
+        </if>
+        <if test="college!= null and college != ''">
+            and s.college = #{college}
+        </if>
+    </select>
+
+    <select id="getVocationalAssignNum" resultType="com.zhongzhi.model.ProjectDO">
+        SELECT
+        *
+        FROM
+        project p
+        left join student s on p.proposer_id = s.id
+        WHERE
+        p.delete_time is null
+        and p.match_id = #{matchId}
+        AND p.project_assigned is not null
+        <if test=" userId != null and userId != ''">
+            and p.project_track in (
+            SELECT
+            t2.project_track
+            FROM
+            administer_track_mapping t
+            LEFT JOIN project_track t2 ON t.track_id = t2.id
+            WHERE
+            t.delete_time IS NULL
+            AND t.administer_id = #{userId}
+            )
+        </if>
+        <if test="college!= null and college != ''">
+            and s.college = #{college}
+        </if>
+    </select>
+
+    <select id="exportProjectReview" resultType="com.zhongzhi.model.ProjectDO">
+        SELECT
+        p.*
+        FROM
+        project p
+        left join student s on p.proposer_id = s.id
+        WHERE
+          p.delete_time is null
+        and p.match_id = #{matchId}
+        AND p.project_schedule = #{projectSchedule}
+        <if test=" userId != null and userId != ''">
+            and p.project_track in (
+            SELECT
+            t2.project_track
+            FROM
+            administer_track_mapping t
+            LEFT JOIN project_track t2 ON t.track_id = t2.id
+            WHERE
+            t.delete_time IS NULL
+            AND t.administer_id = #{userId}
+            )
+        </if>
+        <if test="college!= null and college != ''">
+            and s.college = #{college}
+        </if>
+    </select>
 </mapper>
 </mapper>

src/main/resources/mapper/ProjectJudgeDAO.xml

@@ -35,12 +35,15 @@
                 and status = #{status}
                 and status = #{status}
             </if>
             </if>
             and delete_time is null
             and delete_time is null
+            <if test="projectTrack != null and projectTrack != ''">
+                and project_track like concat('%', #{projectTrack}, '%')
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 
     <select id="projectJudgesAssigned" resultType="com.zhongzhi.vo.judge.ProjectJudgePageVO">
     <select id="projectJudgesAssigned" resultType="com.zhongzhi.vo.judge.ProjectJudgePageVO">
         select
         select
-        pj.*
+        distinct pj.*
         from project_judge pj
         from project_judge pj
         left join project_review pr on pr.judge_id = pj.id
         left join project_review pr on pr.judge_id = pj.id
         left join project p on p.id = pr.project_id
         left join project p on p.id = pr.project_id
@@ -57,7 +60,6 @@
             and pj.delete_time is null
             and pj.delete_time is null
             and pr.delete_time is null
             and pr.delete_time is null
         </where>
         </where>
-        group by pj.id
     </select>
     </select>
 
 
 </mapper>
 </mapper>

src/main/resources/mapper/ProjectScheduleRecordDAO.xml

@@ -27,7 +27,7 @@
 
 
     <select id="getProjectScheduleRecord" resultType="com.zhongzhi.vo.scheduleRecord.ProjectScheduleRecordVO">
     <select id="getProjectScheduleRecord" resultType="com.zhongzhi.vo.scheduleRecord.ProjectScheduleRecordVO">
         select
         select
-        p.id,
+        min(p.id) id,
         s.college as collegeName
         s.college as collegeName
         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

src/main/resources/mapper/ProjectTrackMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzhi.dao.ProjectTrackDAO">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.zhongzhi.model.ProjectTrackDO">
+                    <id column="id" property="id"/>
+                <result column="create_time" property="createTime"/>
+                <result column="update_time" property="updateTime"/>
+                <result column="delete_time" property="deleteTime"/>
+                    <result column="project_track" property="projectTrack"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+                create_time,
+                update_time,
+                delete_time,
+            id, project_track
+        </sql>
+
+</mapper>

src/main/resources/mybatis-generator.properties

@@ -6,7 +6,7 @@ setParent=com.zhongzhi
 # mapper.xml文件生成路径
 # mapper.xml文件生成路径
 mapperPath=/src/main/resources/mapper/
 mapperPath=/src/main/resources/mapper/
 # 数据库地址
 # 数据库地址
-url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/zhongzhi?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+url=jdbc:mysql://139.224.253.21:3306/gtja?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 driverName=com.mysql.cj.jdbc.Driver
 driverName=com.mysql.cj.jdbc.Driver
-userName=ykadmin
-password=youkedb608@good
+userName=root
+password=ykhladmin302
\ No newline at end of file