1

doc/DB/compass_db_schema.txt

@@ -197,9 +197,9 @@ CREATE TABLE IF NOT EXISTS user_mst(
 	mobile varchar(32),
 	account_id int8 NOT NULL DEFAULT '0',
 	child_age int8 NOT NULL DEFAULT '1',
-	role varchar(128) NOT NULL DEFAULT '0',
+	role int8 NOT NULL DEFAULT '0',
 	school_owner tinyint(1) NOT NULL DEFAULT '0',
-	class_owner tinyint(1) NOT NULL DEFAULT '0'
+	class_owner tinyint(1) NOT NULL DEFAULT '0',
 	longitude text,
 	latitude text,
 	government_id int8 NOT NULL DEFAULT '0',
@@ -340,7 +340,13 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 	position text NOT NULL,
 	position_longitude text NOT NULL,
 	position_latitude text NOT NULL,
-	scope int8 NOT NULL,
+	author varchar(64) NOT NULL,
+	author_role int8 NOT NULL DEFAULT '0',
+	school_id int8 NOT NULL DEFAULT '0',
+	province varchar(64),
+	city varchar(64),
+	district varchar(64),
+	include_social_user tinyint(1) NOT NULL DEFAULT '0',
 	max_member int8 NOT NULL DEFAULT '0',
 	time_length varchar(64) NOT NULL,
 	leader_name varchar(64) NOT NULL,
@@ -360,12 +366,17 @@ CREATE TABLE IF NOT EXISTS volunteer_event_member_dat(
 	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	volunteer_event_id int8 NOT NULL,
+	index_no varchar(5) NOT NULL,
 	user_id int8 NOT NULL,
+	circle_id int8 NOT NULL DEFAULT '0',
+	mobile varchar(32) NOT NULL,
 	comment text NOT NULL,
 	images text NOT NULL,
 	position text NOT NULL,
 	position_longitude text NOT NULL,
 	position_latitude text NOT NULL,
+	role int8 NOT NULL DEFAULT '0',
+	finish_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/13 10:54:23 Exp $
- * @author lixq
+ * $Id: AccountMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: CertificateMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: CircleDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CircleMemberDat.inc

 <?php
 /**
  * CircleMemberDat Entity
- * $Id: CircleMemberDat.inc,v 1.1 2020/2/14 16:39:17 Exp $
+ * $Id: CircleMemberDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -10,6 +10,7 @@ class CircleMemberDat extends CompassDynamicData
 {
 	var $circle_id;
 	var $user_id;
+	var $name;
 	var $delete_flg;
 
 	/**
@@ -24,6 +25,7 @@ class CircleMemberDat extends CompassDynamicData
 
 		$this->circle_id  = $record["circle_id"];
 		$this->user_id    = $record["user_id"];
+		$this->name       = $record["name"];
 		$this->delete_flg = $record["delete_flg"];
 	}
 
@@ -90,6 +92,7 @@ class CircleMemberDat extends CompassDynamicData
 
 		ParamUtil::copyObj2Array($v_param, $this, "circle_id");
 		ParamUtil::copyObj2Array($v_param, $this, "user_id");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "name");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
 
 		// 保存

src/cn/compass/entity/ClassMst.inc

 <?php
 /**
  * ClassMst Entity
- * $Id: ClassMst.inc,v 1.1 2020/2/14 16:39:17 Exp $
+ * $Id: ClassMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: CourseCategoryDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: CourseMediaDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: CourseMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: FamilyEventDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: FamilyEventMemberDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: GovernmentMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: GovernmentQrDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: GradeMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: MediaTagDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: SchoolMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: SocialEventDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: SocialEventMemberDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: SystemConstantDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: UserCertificateDat.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: UserMediaDat.inc,v 1.1 2020/2/22 11:26:51 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/17 17:20:32 Exp $
+ * $Id: UserMessageDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/UserMst.inc

 <?php
 /**
  * UserMst Entity
- * $Id: UserMst.inc,v 1.1 2020/2/18 20:07:42 Exp $
+ * $Id: UserMst.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: UserPointLog.inc,v 1.1 2020/2/22 11:26:51 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/14 16:39:17 Exp $
+ * $Id: VolunteerEventDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -14,7 +14,13 @@ class VolunteerEventDat extends CompassDynamicData
 	var $position;
 	var $position_longitude;
 	var $position_latitude;
-	var $scope;
+	var $author;
+	var $author_role;
+	var $school_id;
+	var $province;
+	var $city;
+	var $district;
+	var $include_social_user;
 	var $max_member;
 	var $time_length;
 	var $leader_name;
@@ -39,7 +45,13 @@ class VolunteerEventDat extends CompassDynamicData
 		$this->position            = $record["position"];
 		$this->position_longitude  = $record["position_longitude"];
 		$this->position_latitude   = $record["position_latitude"];
-		$this->scope              = $record["scope"];
+		$this->author              = $record["author"];
+		$this->author_role         = $record["author_role"];
+		$this->school_id           = $record["school_id"];
+		$this->province            = $record["province"];
+		$this->city                = $record["city"];
+		$this->district            = $record["district"];
+		$this->include_social_user = $record["include_social_user"];
 		$this->max_member          = $record["max_member"];
 		$this->time_length         = $record["time_length"];
 		$this->leader_name         = $record["leader_name"];
@@ -116,7 +128,13 @@ class VolunteerEventDat extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "position");
 		ParamUtil::copyObj2Array($v_param, $this, "position_longitude");
 		ParamUtil::copyObj2Array($v_param, $this, "position_latitude");
-		ParamUtil::copyObj2Array($v_param, $this, "scope");
+		ParamUtil::copyObj2Array($v_param, $this, "author");
+		ParamUtil::copyObj2Array($v_param, $this, "author_role");
+		ParamUtil::copyObj2Array($v_param, $this, "school_id");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "province");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "city");
+		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, "time_length");
 		ParamUtil::copyObj2Array($v_param, $this, "leader_name");

src/cn/compass/entity/VolunteerEventMemberDat.inc

 <?php
 /**
  * VolunteerEventMemberDat Entity
- * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/14 16:39:17 Exp $
+ * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -9,12 +9,17 @@
 class VolunteerEventMemberDat extends CompassDynamicData
 {
 	var $volunteer_event_id;
+	var $index_no;
 	var $user_id;
+	var $circle_id;
+	var $mobile;
 	var $comment;
 	var $images;
 	var $position;
 	var $position_longitude;
 	var $position_latitude;
+	var $role;
+	var $finish_time;
 	var $status;
 	var $delete_flg;
 
@@ -29,12 +34,17 @@ class VolunteerEventMemberDat extends CompassDynamicData
 		parent::constructor($record);
 
 		$this->volunteer_event_id = $record["volunteer_event_id"];
+		$this->index_no           = $record["index_no"];
 		$this->user_id            = $record["user_id"];
+		$this->circle_id          = $record["circle_id"];
+		$this->mobile             = $record["mobile"];
 		$this->comment            = $record["comment"];
 		$this->images             = $record["images"];
 		$this->position           = $record["position"];
 		$this->position_longitude = $record["position_longitude"];
 		$this->position_latitude  = $record["position_latitude"];
+		$this->role               = $record["role"];
+		$this->finish_time        = $record["finish_time"];
 		$this->status             = $record["status"];
 		$this->delete_flg         = $record["delete_flg"];
 	}
@@ -101,12 +111,17 @@ class VolunteerEventMemberDat extends CompassDynamicData
 		$v_param = array();
 
 		ParamUtil::copyObj2Array($v_param, $this, "volunteer_event_id");
+		ParamUtil::copyObj2Array($v_param, $this, "index_no");
 		ParamUtil::copyObj2Array($v_param, $this, "user_id");
+		ParamUtil::copyObj2Array($v_param, $this, "circle_id");
+		ParamUtil::copyObj2Array($v_param, $this, "mobile");
 		ParamUtil::copyObj2Array($v_param, $this, "comment");
 		ParamUtil::copyObj2Array($v_param, $this, "images");
 		ParamUtil::copyObj2Array($v_param, $this, "position");
 		ParamUtil::copyObj2Array($v_param, $this, "position_longitude");
 		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, "status");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");