111

doc/DB/compass_db_schema.txt

@@ -346,6 +346,7 @@ CREATE TABLE IF NOT EXISTS volunteer_event_member_dat(
 	position_longitude text NOT NULL,
 	position_latitude text NOT NULL,
 	role int8 NOT NULL DEFAULT '0',
+	time_length float(6,2) NOT NULL DEFAULT '0',
 	finish_time timestamp NOT NULL,
 	status varchar(64) NOT NULL DEFAULT 'NEW',
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'

src/cn/compass/entity/VolunteerEventMemberDat.inc

@@ -20,6 +20,7 @@ class VolunteerEventMemberDat extends CompassDynamicData
 	var $position_latitude;
 	var $role;
 	var $finish_time;
+	var $time_length;
 	var $status;
 	var $delete_flg;
 
@@ -45,6 +46,7 @@ class VolunteerEventMemberDat extends CompassDynamicData
 		$this->position_latitude  = $record["position_latitude"];
 		$this->role               = $record["role"];
 		$this->finish_time        = $record["finish_time"];
+		$this->time_length        = $record["time_length"];
 		$this->status             = $record["status"];
 		$this->delete_flg         = $record["delete_flg"];
 	}
@@ -122,6 +124,7 @@ class VolunteerEventMemberDat extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "position_latitude");
 		ParamUtil::copyObj2Array($v_param, $this, "role");
 		ParamUtil::copyObj2Array($v_param, $this, "finish_time");
+		ParamUtil::copyObj2Array($v_param, $this, "time_length");
 		ParamUtil::copyObj2Array($v_param, $this, "status");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
 

src/user/if/ajax_get_volunteer_event_detail.php

@@ -11,7 +11,6 @@ $eventId = ParamUtil::getRequestNumber("eventId", 0);
 
 $result = array();
 
-
 //参数检查
 if(empty($unionId)) {
 	$result["message"] = "参数错误！";
@@ -30,7 +29,7 @@ if(empty($userList)) {
 
 //查询志愿者活动
 $volunteerDat = VolunteerEventDat::getById($eventId);
-if(empty($userList)) {
+if(empty($volunteerDat)) {
 	$result["message"] = "参数错误！";
 	responseNG($result);
 }
@@ -39,94 +38,41 @@ $userMst = $userList[0];
 
 //是否已经报名参加
 $isMember = false;
+$isComplete = false;
 $param = array();
 $param['volunteer_event_id'] = $userMst->id;
 $param['user_id'] = $userMst->id;
 $param['delete_flg'] = false;
-$userList = UserMst::getListCount($param,'id','desc', 0, 1);
-
-//判断用户身份分别获取数据
-$volunteerEventList = array();
-
-//[1：家园用户]
-if($userMst->role == 1) {
-	//志愿者活动[列表显示：本校志愿者活动 + 领导机构发布的包含本区域的志愿者活动+社会机构发布的面向本区域的志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[2：家校用户]
-if($userMst->role == 2) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['delete_flg'] = false;
-	$socialEventList = SocialEventDat::getList($param,'id','desc', 0, 1);
-	
-	//亲子活动【家校用户无亲子活动】
+$tmpList = VolunteerEventMemberDat::getList($param, "id", "desc", 0, 1);
+if(!empty($tmpList)) {
+	$isMember = true;
+	if($tmpList[0]->status == "FINISH" || $tmpList[0]->status == "TIME") {
+		$isComplete = true;
+	}
 }
 
-//[3：高职用户]
-if($userMst->role == 3) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[4：教育局领导]
-if($userMst->role == 4) {
-	//志愿者活动[首页管辖区域发布的最新一条志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[5：社会用户]
-if($userMst->role == 5 {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['include_social_user'] = true;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
+//该用户是否为圈主
+$isCircleOwner = false;
+$param = array();
+$param['owner_id'] = $userMst->id;
+$param['delete_flg'] = false;
+$tmpCount = CircleDat::getListCount($param);
+if($tmpCount > 0) {
+	$isCircleOwner = true;
 }
 
-//[6：机构用户]
-if($userMst->role == 6) {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['include_social_user'] = true;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
+//报名是否已经结束
+$isEnrollFinish = false;
+if(date("Y-m-d H:i:s") <= $volunteerDat->finish_time) {
+	$isEnrollFinish = true;
 }
 
-
 //组装返回数据
-$result["volunteerEventList"] = $volunteerEventList;
+$result["isEnrollFinish"] = $isEnrollFinish;
+$result["isComplete"] = $isComplete;
+$result["isCircleOwner"] = $isCircleOwner;
+$result["isMember"] = $isMember;
+$result["volunteerEventDat"] = $volunteerDat;
 
 ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_detail.php....End.", 0);