瑞金医院

src/main/java/com/subsidy/common/constant/ProjectReview.java

@@ -15,8 +15,11 @@ public class ProjectReview {
     /**
      * 评审状态（对于项目）
      */
+//    public static final String INNER_TO_REVIEWED = "待评审";
+
     public static final String TO_REVIEWED = "待评审";
 
+
     public static final String ASSIGNED = "已分配";
 
     public static final String UNASSIGNED = "未分配";

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

@@ -11,7 +11,15 @@ public class ProjectStatus {
 
     public static final String WITHDRAWN = "已撤回";
 
-    public static final String SCHOOL_NOT_PASSED = "淘汰";
+    public static final String FIRST_NOT_PASSED = "校内初审未通过";
+
+    public static final String SECOND_NOT_PASSED = "复赛审核未通过";
+
+    public static final String FIRST_REVIEW = "等待校内初审";
+
+    public static final String SECOND_REVIEW = "等待复赛审核";
+
+    public static final String THIRD_REVIEW = "等待决赛结果";
 
     public static final String REMATCH_WINNING_AWARD = "优秀奖";
 

src/main/java/com/subsidy/common/constant/ProjectTrack.java

+package com.subsidy.common.constant;
+
+import lombok.Data;
+
+@Data
+public class ProjectTrack {
+
+    public static final String COURSE_TRACK = "课程赛道";
+
+    public static final String TEACH_TRACK = "教学赛道";
+
+}

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

@@ -66,7 +66,8 @@ public class CollegesDictController {
     }
 
     @PostMapping(value = "addContact")
-    @ApiOperation("院校端 --- 新增联系人：id  院校idleaderName/领导姓名、leaderPost/领导职务、leaderPhone/领导手机号、contactName/联系人姓名、contactPost/联系人职务、contactPhone/联系人手机号")
+    @ApiOperation("院校端 --- 新增联系人：id  院校id  leaderName/领导姓名、leaderPost/领导职务、leaderPhone/领导手机号、contactName/联系人姓名、contactPost/联系人职务、contactPhone/联系人手机号" +
+            "contactDept 部门名称  contractDesc 职责说明")
     public ResponseVO addContact(@RequestBody CollegesDictDO collegesDictDO) {
         collegesDictService.addContact(collegesDictDO);
         return ResponseData.generateCreatedResponse(0);

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

@@ -36,12 +36,21 @@ public class ProjectController {
     private ProjectService projectService;
 
     @PostMapping("createProject")
-    @ApiOperation("基本信息--保存并继续 id matchId  teacherId  courseName  courseCode  courseType  grade  courseHour  theoryHour  practiseHour" +
-            "score  years startDate1 endDate1 startDate2 endDate2  studentTotalNum  vodUrl")
+    @ApiOperation("基本信息--保存并继续 id matchId  teacherId projectTrack 赛道：课程赛道/教学赛道   courseName courseNameEn 课程英文名称 courseCode  courseType  grade  courseHour  " +
+            "   courseObject 开课对象：0：专业不限 1：限制专业  courseObjectMajor  开课对象专业  theoryHour  practiseHour" +
+            "score  years startDate1 endDate1 startDate2 endDate2  studentTotalNum1  studentTotalNum2 vodUrl " +
+            "  开课单位 companyName  courseUrl 课程网址" +
+            " supportFile 课程支撑材料上传  relateResult  teachComment")
     public ResponseVO createProject(@RequestBody UpdateProjectDTO updateProjectDTO)throws Exception{
         return ResponseData.generateCreatedResponse(0, projectService.createProject(updateProjectDTO));
     }
 
+    @PostMapping("returnPrevious")
+    @ApiOperation("查看这个老师这一届是否填过  matchId teacherId projectTrack")
+    public ResponseVO returnPrevious(@RequestBody ProjectDO projectDO){
+        return ResponseData.generateCreatedResponse(0,projectService.returnPrevious(projectDO));
+    }
+
     @PostMapping("updateProject")
     @ApiOperation("[弃用]基本信息--课程团队/课程信息   id  semester  startDate  endDate teachHours teachGrade  classTotalNum  " +
             "projectMembersDOS[userName  birthDate   education  position  title  major  semester  courseTarget   startDate  endDate teachHours teachGrade  classTotalNum ]" +
@@ -58,7 +67,7 @@ public class ProjectController {
     }
 
     @PostMapping("oneProjectByTeacherId")
-    @ApiOperation("查询单个项目  matchId teacherId")
+    @ApiOperation("查询单个项目  matchId teacherId projectTrack")
     public ResponseVO oneProjectByTeacherId(@RequestBody ProjectDO projectDO){
         return ResponseData.generateCreatedResponse(0,projectService.oneProjectByTeacherId(projectDO));
     }
@@ -137,14 +146,14 @@ public class ProjectController {
     }
 
     @PostMapping(value = "getVocationalProjectNum")
-    @ApiOperation("中心端/院校端 --- (职教)项目管理数量:id 院校id matchId/赛事ID、projectGroup/项目组别")
+    @ApiOperation("中心端/院校端 --- (职教)项目管理数量:id 院校id matchId/赛事ID、projectGroup/项目组别  projectTrack 赛道")
     public ResponseVO getVocationalProjectNum(@RequestBody SeedTrackProjectNumDTO seedTrackProjectNumDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectNum(seedTrackProjectNumDTO));
     }
 
     @PostMapping(value = "/getSeedTrackProjectList")
     @ApiOperation("院校端 --- 分页查询种子赛道全部项目：collegeId 院校id  matchId/赛事ID,projectSchedule/项目进度（全部项目传空字符串、校内赛、复赛、决赛）, " +
-            "projectStatus/项目状态,name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
+            "projectStatus/项目状态, projectTrack 赛道  name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
     public ResponseVO getSeedTrackProjectList(@RequestBody ProjectListPageDTO projectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getSeedTrackProjectList(projectListPageDTO));
     }
@@ -152,7 +161,7 @@ public class ProjectController {
     /* -- 管理端 -- */
     @PostMapping(value = "/getVocationalProjectPage")
     @ApiOperation("中心端 --- 分页查询职教赛道项目管理：matchId/赛事ID,projectGroup/项目组别（高职、中职）、projectSchedule/项目进度（全部项目传空字符串、校内赛、市级初赛、市级复赛、市级决赛）, " +
-            "projectStatus/项目状态, itemField/领域, name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
+            "projectStatus/项目状态, projectTrack 赛道,itemField/领域, name/搜名称, pageNum/当前页数 、pageSize/每页显示条数")
     public ResponseVO getVocationalProjectPage(@RequestBody ProjectListPageDTO projectListPageDTO) {
         return ResponseData.generateCreatedResponse(0, projectService.getVocationalProjectPage(projectListPageDTO));
     }

src/main/java/com/subsidy/controller/TeacherController.java

@@ -39,7 +39,7 @@ public class TeacherController {
     }
 
     @PostMapping("register")
-    @ApiOperation("教师注册-提交  userName  idCard  nationality  education  collegeId   major  position title  email  telephone   verifyCode")
+    @ApiOperation("教师注册-提交  userName  idCard  nationality  education  collegeId   major  position title  years 工作年限  email  telephone   verifyCode")
     public ResponseVO register(@RequestBody RegisterDTO registerDTO){
         return ResponseData.generateCreatedResponse(0,teacherService.register(registerDTO));
     }

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

@@ -27,4 +27,7 @@ public class ProjectListPageDTO {
 
     private Long collegeId;
 
+    private String projectTrack;
+
+
 }

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

@@ -13,4 +13,6 @@ public class SeedTrackProjectNumDTO {
 
     private String projectProgress;
 
+    private String projectTrack;
+
 }

src/main/java/com/subsidy/mapper/ProjectMapper.java

@@ -24,17 +24,19 @@ import java.util.List;
 @Repository
 public interface ProjectMapper extends BaseMapper<ProjectDO> {
 
+    void updateMajor(Long id);
+
     IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage(Page page, Long matchId, String projectGroup, String courseName);
 
     IPage<SeedTrackProjectPageVO> getSeedTrackProjectPage1(Page page, Long matchId, String projectGroup, @Param("type") String type,
                                                           Long collegeId, String projectSchedule,
-                                                          String projectStatus,  @Param("name") String name,@Param("projectProgress") String projectProgress);
+                                                          String projectStatus,  @Param("name") String name,@Param("projectProgress") String projectProgress,String projectTrack);
 
     List<MatchCollegeVodsVO> matchCollegeVods(Long collegeId, Long matchId);
 
     List<MatchDictDO> getList( @Param("projectGroup") String projectGroup);
 
-    List<ProjectDO> getSeedTrackProjectList(Long collegeId,Long matchId, String projectGroup, @Param("projectProgress")String projectProgress);
+    List<ProjectDO> getSeedTrackProjectList(Long collegeId,Long matchId, String projectGroup, @Param("projectProgress")String projectProgress,String projectTrack);
 
     List<RecentVodVO> recentVod(Long matchId,Long collegeId);
 }

src/main/java/com/subsidy/model/CollegesDictDO.java

@@ -54,25 +54,30 @@ public class CollegesDictDO extends BaseModel {
      */
     private String password;
 
-    /**
-     * 分管领导姓名
-     */
-    private String leaderName;
-
-    /**
-     * 分管领导职位
-     */
-    private String leaderPost;
+//    /**
+//     * 分管领导姓名
+//     */
+//    private String leaderName;
+//
+//    /**
+//     * 分管领导职位
+//     */
+//    private String leaderPost;
+//
+//    /**
+//     * 分管领导手机号
+//     */
+//    private String leaderPhone;
 
     /**
-     * 分管领导手机号
+     * 联系人姓名
      */
-    private String leaderPhone;
+    private String contactName;
 
     /**
-     * 联系人姓名
+     * 部门
      */
-    private String contactName;
+    private String contactDept;
 
     /**
      * 联系人职位
@@ -85,6 +90,11 @@ public class CollegesDictDO extends BaseModel {
     private String contactPhone;
 
     /**
+     * 职责说明
+     */
+    private String contractDesc;
+
+    /**
      * 登录时间
      */
     private LocalDateTime loginTime;

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 
@@ -29,6 +31,8 @@ public class ProjectDO extends BaseModel {
 
     private Long teacherId;
 
+    private String projectTrack;
+
     private Long collegeId;
 
     private String projectGroup;
@@ -39,6 +43,11 @@ public class ProjectDO extends BaseModel {
     private String courseName;
 
     /**
+     * 课程英文名称
+     */
+    private String courseNameEn;
+
+    /**
      * 课程编码
      */
     private String courseCode;
@@ -49,6 +58,16 @@ public class ProjectDO extends BaseModel {
     private String courseType;
 
     /**
+     * 开课对象
+     */
+    private Integer courseObject;
+
+    /**
+     * 开课对象专业
+     */
+    private String courseObjectMajor;
+
+    /**
      * 开课年级
      */
     private String grade;
@@ -56,27 +75,22 @@ public class ProjectDO extends BaseModel {
     /**
      * 课程总学时
      */
-    private Integer courseHour;
+    private BigDecimal courseHour;
 
     /**
-     * 理论学时
+     * 理论学时【弃用】
      */
-    private Integer theoryHour;
+    private String theoryHour;
 
     /**
      * 实践学时
      */
-    private Integer practiseHour;
+    private BigDecimal practiseHour;
 
     /**
      * 分数
      */
-    private Integer score;
-
-    /**
-     * 授课年数
-     */
-    private String years;
+    private BigDecimal score;
 
     private String startDate1;
 
@@ -87,9 +101,14 @@ public class ProjectDO extends BaseModel {
     private String endDate2;
 
     /**
-     * 最近两轮学生总人数
+     * 最近学生总人数1
+     */
+    private Integer studentTotalNum1;
+
+    /**
+     * 最近学生总人数2
      */
-    private Integer studentTotalNum;
+    private Integer studentTotalNum2;
 
     /**
      * 学期
@@ -109,7 +128,7 @@ public class ProjectDO extends BaseModel {
     /**
      * 授课学时
      */
-    private Integer teachHours;
+    private BigDecimal teachHours;
 
     /**
      * 授课年级
@@ -196,4 +215,29 @@ public class ProjectDO extends BaseModel {
      */
     private String uploadDate;
 
+    /**
+     * 课程支撑材料上传
+     */
+    private String supportFile;
+
+    /**
+     * 相关成果
+     */
+    private String relateResult;
+
+    /**
+     * 教学反思和自我评价
+     */
+    private String teachComment;
+
+    /**
+     * 开课单位
+     */
+    private String companyName;
+
+    /**
+     * 课程地址
+     */
+    private String courseUrl;
+
 }

src/main/java/com/subsidy/model/ProjectMembersDO.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 
@@ -77,7 +79,7 @@ public class ProjectMembersDO extends BaseModel {
     /**
      * 授课学时
      */
-    private Integer teachHours;
+    private BigDecimal teachHours;
 
     /**
      * 授课年级

src/main/java/com/subsidy/model/TeacherDO.java

@@ -67,6 +67,11 @@ public class TeacherDO extends BaseModel {
     private String title;
 
     /**
+     * 工作年限
+     */
+    private Integer years;
+
+    /**
      * 邮箱
      */
     private String email;

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

@@ -22,13 +22,15 @@ public interface ProjectService extends IService<ProjectDO> {
 
    ProjectDO createProject(UpdateProjectDTO updateProjectDTO)throws Exception;
 
+   ProjectDO returnPrevious(ProjectDO projectDO);
+
    ProjectDO updateProject(UpdateProjectDTO updateProjectDTO)throws Exception;
 
    OneProjectVO oneProject(ProjectDO projectDO);
 
    OneProjectVO oneProjectByTeacherId(ProjectDO projectDO);
 
-   OneProjectVO teacherProject(ProjectDO projectDO);
+   List<OneProjectVO> teacherProject(ProjectDO projectDO);
 
    void downloadPdf(ProjectDO projectDO);
 

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

@@ -206,7 +206,7 @@ public class CollegesDictServiceImpl extends ServiceImpl<CollegesDictMapper, Col
                 eps.setTeacherName(teacherDO.getUserName());
                 eps.setGender(PDFUtil.idCard2Gender(teacherDO.getIdCard()));
                 eps.setBirthDate(PDFUtil.idCard2BirthDate(teacherDO.getIdCard()));
-                eps.setYears(projectDO.getYears());
+                eps.setYears(teacherDO.getYears()+"");
                 eps.setPosition(teacherDO.getPosition() + "/" + teacherDO.getTitle());
                 eps.setEmail(teacherDO.getEmail());
 

src/main/java/com/subsidy/service/impl/TeacherServiceImpl.java

@@ -149,7 +149,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, TeacherDO> im
             BeanUtils.copyProperties(teacherDO,loginVO);
             return loginVO;
         } else {
-            throw new HttpException(10003);
+            throw new HttpException(10004);
         }
     }
 

src/main/java/com/subsidy/vo/college/CollegesVO.java

@@ -29,10 +29,14 @@ public class CollegesVO {
 
     private String contactName;
 
+    private String contactDept;
+
     private String contactPost;
 
     private String contactPhone;
 
+    private String contractDesc;
+
     private String token;
 
 }

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

@@ -21,6 +21,8 @@ public class SeedTrackProjectPageVO {
 
     private String title;
 
+    private Integer years;
+
     private String education;
 
     private String major;

src/main/resources/application-prod.properties

@@ -2,11 +2,11 @@
 spring.server.port=23504
 
 # 数据源配置
-spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/ecnutrack?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://172.20.4.227:3306/ecnutrack?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.username=ykadmin_new
-spring.datasource.password=youkedb608@good
+spring.datasource.username=root
+spring.datasource.password=ecnutrack10269!&
 
 spring.datasource.druid.initialSize=5
 spring.datasource.druid.minIdle=5

src/main/resources/mapper/ProjectMapper.xml

@@ -2,6 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.subsidy.mapper.ProjectMapper">
 
+    <update id="updateMajor" parameterType="long">
+        update project t set t.course_object_major = null where id = #{id}
+    </update>
+
     <select id="getSeedTrackProjectPage" resultType="com.subsidy.vo.project.SeedTrackProjectPageVO">
         SELECT
         p.course_name,
@@ -14,6 +18,7 @@
         s.telephone,
         p.project_group,
         p.`status`,
+        s.years,
         DATE_FORMAT( p.create_date, '%Y-%m-%d' ) AS applicationTime
         FROM
         project p
@@ -98,6 +103,9 @@
             <if test="projectProgress!= null and projectProgress != ''">
                 and p.project_progress = #{projectProgress}
             </if>
+            <if test="projectTrack != null and projectTrack != ''">
+                and p.project_track = #{projectTrack}
+            </if>
             and p.project_status != '填写中'
             and p.delete_date is null
             and s.delete_date is null
@@ -128,6 +136,7 @@
         s.position,
         s.title,
         s.education,
+        s.years,
         p.course_name,
         DATE_FORMAT(p.create_date, '%Y-%m-%d') as applicationTime
         from project p
@@ -159,6 +168,9 @@
             <if test="name != null and name != ''">
                 and (p.course_name like concat('%',#{name},'%') or s.user_name like concat('%',#{name},'%') or cd.name like concat('%',#{name},'%'))
             </if>
+            <if test="projectTrack != null and projectTrack != ''">
+                and p.project_track = #{projectTrack}
+            </if>
             and p.delete_date is null
             and s.delete_date is null
         </where>