1

doc/DB/compass_db_schema.txt

@@ -358,6 +358,7 @@ CREATE TABLE IF NOT EXISTS volunteer_event_member_dat(
 
 Create INDEX volunteer_event_member_dat_volunteer_event_id_idx ON volunteer_event_member_dat(volunteer_event_id);
 Create INDEX volunteer_event_member_dat_user_id_idx ON volunteer_event_member_dat(user_id);
+Create INDEX volunteer_event_member_dat_circle_id_idx ON volunteer_event_member_dat(circle_id);
 
 
 ##----volunteer_event_dat create
@@ -370,6 +371,7 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 	comment text NOT NULL,
 	start_time timestamp NOT NULL,
 	finish_time timestamp NOT NULL,
+	enroll_time timestamp NOT NULL,
 	front_image text NOT NULL,
 	position text NOT NULL,
 	position_longitude text NOT NULL,
@@ -389,6 +391,7 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 	leader_name varchar(64) NOT NULL,
 	leader_contact varchar(128) NOT NULL,
 	venue text NOT NULL,
+	venue_time timestamp NOT NULL,
 	status varchar(64) NOT NULL DEFAULT 'NEW',
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;

src/cn/compass/entity/AccountMst.inc

 <?php
 /**
  * AccountMst Entity
- * $Id: AccountMst.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: AccountMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CertificateMst.inc

 <?php
 /**
  * CertificateMst Entity
- * $Id: CertificateMst.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CertificateMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CircleDat.inc

 <?php
 /**
  * CircleDat Entity
- * $Id: CircleDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CircleDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -38,9 +38,9 @@ class CircleDat extends CompassDynamicData
 		$this->comment      = $record["comment"];
 		$this->longitude    = $record["longitude"];
 		$this->latitude     = $record["latitude"];
-		$this->province      = $record["province"];
-		$this->city      	= $record["city"];
-		$this->district      = $record["district"];
+		$this->province     = $record["province"];
+		$this->city         = $record["city"];
+		$this->district     = $record["district"];
 		$this->owner_id     = $record["owner_id"];
 		$this->delete_flg   = $record["delete_flg"];
 	}

src/cn/compass/entity/CircleMemberDat.inc

 <?php
 /**
  * CircleMemberDat Entity
- * $Id: CircleMemberDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CircleMemberDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/ClassMst.inc

 <?php
 /**
  * ClassMst Entity
- * $Id: ClassMst.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: ClassMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CourseCategoryDat.inc

 <?php
 /**
  * CourseCategoryDat Entity
- * $Id: CourseCategoryDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CourseCategoryDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CourseMediaDat.inc

 <?php
 /**
  * CourseMediaDat Entity
- * $Id: CourseMediaDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CourseMediaDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CourseMst.inc

 <?php
 /**
  * CourseMst Entity
- * $Id: CourseMst.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: CourseMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/DonationsEventDat.inc

 <?php
 /**
  * DonationsEventDat Entity
- * $Id: DonationsEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: DonationsEventDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/FamilyEventDat.inc

 <?php
 /**
  * FamilyEventDat Entity
- * $Id: FamilyEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: FamilyEventDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/FamilyEventMemberDat.inc

 <?php
 /**
  * FamilyEventMemberDat Entity
- * $Id: FamilyEventMemberDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: FamilyEventMemberDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/GovernmentMst.inc

 <?php
 /**
  * GovernmentMst Entity
- * $Id: GovernmentMst.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: GovernmentMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/GovernmentQrDat.inc

 <?php
 /**
  * GovernmentQrDat Entity
- * $Id: GovernmentQrDat.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: GovernmentQrDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/GradeMst.inc

 <?php
 /**
  * GradeMst Entity
- * $Id: GradeMst.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: GradeMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/MediaTagDat.inc

 <?php
 /**
  * MediaTagDat Entity
- * $Id: MediaTagDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: MediaTagDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/SchoolMst.inc

 <?php
 /**
  * SchoolMst Entity
- * $Id: SchoolMst.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: SchoolMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/SocialEventDat.inc

 <?php
 /**
  * SocialEventDat Entity
- * $Id: SocialEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: SocialEventDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/SocialEventMemberDat.inc

 <?php
 /**
  * SocialEventMemberDat Entity
- * $Id: SocialEventMemberDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: SocialEventMemberDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/SystemConstantDat.inc

 <?php
 /**
  * SystemConstantDat Entity
- * $Id: SystemConstantDat.inc,v 1.1 2020/2/23 21:15:57 Exp $
+ * $Id: SystemConstantDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserCertificateDat.inc

 <?php
 /**
  * UserCertificateDat Entity
- * $Id: UserCertificateDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserCertificateDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserDonationDat.inc

 <?php
 /**
  * UserDonationDat Entity
- * $Id: UserDonationDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserDonationDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserMediaDat.inc

 <?php
 /**
  * UserMediaDat Entity
- * $Id: UserMediaDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserMediaDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserMessageDat.inc

 <?php
 /**
  * UserMessageDat Entity
- * $Id: UserMessageDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserMessageDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -31,7 +31,7 @@ class UserMessageDat extends CompassDynamicData
 		$this->title           = $record["title"];
 		$this->comment         = $record["comment"];
 		$this->attach_dat_type = $record["attach_dat_type"];
-		$this->attach_dat_id 	= $record["attach_dat_id"];
+		$this->attach_dat_id   = $record["attach_dat_id"];
 		$this->attach_dat_path = $record["attach_dat_path"];
 		$this->is_read         = $record["is_read"];
 		$this->delete_flg      = $record["delete_flg"];
@@ -101,8 +101,8 @@ class UserMessageDat extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "user_id");
 		ParamUtil::copyObj2Array($v_param, $this, "title");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
-		ParamUtil::attach_dat_type($v_param, $this, "attach_dat_type");
-		ParamUtil::attach_dat_id($v_param, $this, "attach_dat_id");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "attach_dat_type");
+		ParamUtil::copyObj2Array($v_param, $this, "attach_dat_id");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "attach_dat_path");
 		ParamUtil::copyObj2Array($v_param, $this, "is_read");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");

src/cn/compass/entity/UserMst.inc

 <?php
 /**
  * UserMst Entity
- * $Id: UserMst.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserMst.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserPointLog.inc

 <?php
 /**
  * UserPointLog Entity
- * $Id: UserPointLog.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: UserPointLog.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/VolunteerEventDat.inc

 <?php
 /**
  * VolunteerEventDat Entity
- * $Id: VolunteerEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * $Id: VolunteerEventDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -12,6 +12,7 @@ class VolunteerEventDat extends CompassDynamicData
 	var $comment;
 	var $start_time;
 	var $finish_time;
+	var $enroll_time;
 	var $front_image;
 	var $position;
 	var $position_longitude;
@@ -26,10 +27,12 @@ class VolunteerEventDat extends CompassDynamicData
 	var $district;
 	var $include_social_user;
 	var $max_member;
+	var $member_count;
 	var $time_length;
 	var $leader_name;
 	var $leader_contact;
 	var $venue;
+	var $venue_time;
 	var $status;
 	var $delete_flg;
 
@@ -47,6 +50,7 @@ class VolunteerEventDat extends CompassDynamicData
 		$this->comment             = $record["comment"];
 		$this->start_time          = $record["start_time"];
 		$this->finish_time         = $record["finish_time"];
+		$this->enroll_time         = $record["enroll_time"];
 		$this->front_image         = $record["front_image"];
 		$this->position            = $record["position"];
 		$this->position_longitude  = $record["position_longitude"];
@@ -61,10 +65,12 @@ class VolunteerEventDat extends CompassDynamicData
 		$this->district            = $record["district"];
 		$this->include_social_user = $record["include_social_user"];
 		$this->max_member          = $record["max_member"];
+		$this->member_count        = $record["member_count"];
 		$this->time_length         = $record["time_length"];
 		$this->leader_name         = $record["leader_name"];
 		$this->leader_contact      = $record["leader_contact"];
 		$this->venue               = $record["venue"];
+		$this->venue_time          = $record["venue_time"];
 		$this->status              = $record["status"];
 		$this->delete_flg          = $record["delete_flg"];
 	}
@@ -134,6 +140,7 @@ class VolunteerEventDat extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "comment");
 		ParamUtil::copyObj2Array($v_param, $this, "start_time");
 		ParamUtil::copyObj2Array($v_param, $this, "finish_time");
+		ParamUtil::copyObj2Array($v_param, $this, "enroll_time");
 		ParamUtil::copyObj2Array($v_param, $this, "front_image");
 		ParamUtil::copyObj2Array($v_param, $this, "position");
 		ParamUtil::copyObj2Array($v_param, $this, "position_longitude");
@@ -148,10 +155,12 @@ class VolunteerEventDat extends CompassDynamicData
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "district");
 		ParamUtil::copyObj2Array($v_param, $this, "include_social_user");
 		ParamUtil::copyObj2Array($v_param, $this, "max_member");
+		ParamUtil::copyObj2Array($v_param, $this, "member_count");
 		ParamUtil::copyObj2Array($v_param, $this, "time_length");
 		ParamUtil::copyObj2Array($v_param, $this, "leader_name");
 		ParamUtil::copyObj2Array($v_param, $this, "leader_contact");
 		ParamUtil::copyObj2Array($v_param, $this, "venue");
+		ParamUtil::copyObj2Array($v_param, $this, "venue_time");
 		ParamUtil::copyObj2Array($v_param, $this, "status");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
 

src/cn/compass/entity/VolunteerEventMemberDat.inc

 <?php
 /**
  * VolunteerEventMemberDat Entity
- * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/25 20:50:48 Exp $
+ * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -39,7 +39,7 @@ class VolunteerEventMemberDat extends CompassDynamicData
 		$this->index_no           = $record["index_no"];
 		$this->user_id            = $record["user_id"];
 		$this->circle_id          = $record["circle_id"];
-		$this->is_owner          = $record["is_owner"];
+		$this->is_owner           = $record["is_owner"];
 		$this->mobile             = $record["mobile"];
 		$this->comment            = $record["comment"];
 		$this->images             = $record["images"];

src/user/if/ajax_get_volunteer_event_detail.php

@@ -63,7 +63,7 @@ if($tmpCount > 0) {
 
 //报名是否已经结束
 $isEnrollFinish = false;
-if(date("Y-m-d H:i:s") <= $volunteerDat->finish_time) {
+if(date("Y-m-d H:i:s") <= $volunteerDat->enroll_time) {
 	$isEnrollFinish = true;
 }