diff --git a/src/main/java/com/peteralbus/controller/StudentController.java b/src/main/java/com/peteralbus/controller/StudentController.java index b00f9da..81a54f9 100644 --- a/src/main/java/com/peteralbus/controller/StudentController.java +++ b/src/main/java/com/peteralbus/controller/StudentController.java @@ -102,6 +102,10 @@ public class StudentController modelAndView.addObject("currentStatus","正在等待组长通过您的申请"); modelAndView.setViewName("/jsp/student/waitGroup.jsp"); } + if(participate.getFinished()) + { + modelAndView.setViewName("/jsp/student/activityResult.jsp"); + } modelAndView.addObject("activity",activity); return modelAndView; } diff --git a/src/main/java/com/peteralbus/entity/Activity.java b/src/main/java/com/peteralbus/entity/Activity.java index 92447cc..d2a31cd 100644 --- a/src/main/java/com/peteralbus/entity/Activity.java +++ b/src/main/java/com/peteralbus/entity/Activity.java @@ -23,6 +23,8 @@ public class Activity implements Serializable private String activityIntroduction; private Integer minPeople; private Integer maxPeople; + @TableField(exist = false) + private Boolean isFinished; @Version private Integer version; @TableField(fill = FieldFill.INSERT) @@ -153,6 +155,16 @@ public class Activity implements Serializable this.maxPeople = maxPeople; } + public Boolean getFinished() + { + return isFinished; + } + + public void setFinished(Boolean finished) + { + isFinished = finished; + } + @Override public String toString() { diff --git a/src/main/java/com/peteralbus/service/RecordService.java b/src/main/java/com/peteralbus/service/RecordService.java index 06f8643..d7cce60 100644 --- a/src/main/java/com/peteralbus/service/RecordService.java +++ b/src/main/java/com/peteralbus/service/RecordService.java @@ -10,17 +10,35 @@ import java.util.List; /** * The type Record service. + * * @author peteralbus */ @Service public class RecordService { + /** + * The Record dao. + */ @Autowired RecordDao recordDao; + + /** + * Insert record int. + * + * @param record the record + * @return the int + */ public int insertRecord(Record record) { return recordDao.insert(record); } + + /** + * Select by participate list. + * + * @param participationId the participation id + * @return the list + */ public List selectByParticipate(Long participationId) { QueryWrapper queryWrapper=new QueryWrapper<>(); diff --git a/src/main/resources/mapper/ActivityDao.xml b/src/main/resources/mapper/ActivityDao.xml index 4ea00ab..27889b3 100644 --- a/src/main/resources/mapper/ActivityDao.xml +++ b/src/main/resources/mapper/ActivityDao.xml @@ -9,7 +9,7 @@ where activity.is_delete=0 and user.user_id=#{userId} and user.user_id=manage.user_id and manage.activity_id=activity.activity_id and manage.is_delete=0 diff --git a/src/main/webapp/jsp/student/activities.jsp b/src/main/webapp/jsp/student/activities.jsp index bddc1c8..b35dafa 100644 --- a/src/main/webapp/jsp/student/activities.jsp +++ b/src/main/webapp/jsp/student/activities.jsp @@ -91,13 +91,18 @@
+ +
参加的活动
@@ -118,7 +123,6 @@
负责老师:{{i.realName}} 

要求人数:{{item.minPeople}}-{{item.maxPeople}}人

-

{{item.activityIntroduction}}
@@ -148,6 +152,7 @@ return{ title:'社会实践活动列表', keyWord:'', + showFinished:true, user:{ username:'', realName:'', @@ -191,6 +196,7 @@ minPeople:'${activity.getMinPeople()}', maxPeople:'${activity.getMaxPeople()}', gmtCreate:'${activity.getFormattedCreateDate()}', + isFinished:${activity.getFinished()}, teachers:teachers }) @@ -220,14 +226,10 @@ computed:{ activityListResult:function (){ let result=[]; - if(this.keyWord==='') - { - return this.activityList; - } for(let i=0;i +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + 社会实践活动评分结果 + + + + + + + + + + + + +
+
+ <%@ include file="/jsp/header.html" %> +
+
+
+ + + <%@ include file="/jsp/aside.html" %> + + + +
+
+ + + + + + + 评分 +
+ + + +
+ 社会实践活动信息 +
+ + + + + {{activity.activityName}} + + + + {{activity.activityType}} + + + + {{activity.minPeople}}-{{activity.maxPeople}}人 + + + + {{i.realName}}  + + + + {{activity.gmtCreate}} + + + + + + {{activity.activityIntroduction}} + + +
+ 日志 + + + +

{{item.recordTitle}}

+

{{item.recordContent}}

+ + + + 小组 +
+ + {{group.groupName}} + {{group.leaderName}} + {{group.memberCount}} + +

成员信息

+ + + + + + + +
+
+ + +
+
+
+ <%@ include file="/jsp/foot.html" %> +
+
+ + +