1

doc/DB/compass_db_schema.txt

@@ -284,8 +284,7 @@ CREATE TABLE IF NOT EXISTS social_event_member_dat(
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 
 Create INDEX social_event_member_dat_user_id_idx ON social_event_member_dat(user_id);
-Create INDEX social_event_member_dat_social_event_ididx ON social_event_member_dat(social_event_id);
-
+Create INDEX social_event_member_dat_social_event_id_idx ON social_event_member_dat(social_event_id);
 
 
 ##----family_event_dat create
@@ -330,6 +329,32 @@ Create INDEX family_event_member_dat_user_id_idx ON family_event_member_dat(user
 Create INDEX family_event_member_dat_family_event_id_idx ON family_event_member_dat(family_event_id);
 
 
+##----volunteer_event_member_dat create
+
+DROP TABLE IF EXISTS volunteer_event_member_dat;
+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;
+
+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);
+
+
 ##----volunteer_event_dat create
 
 DROP TABLE IF EXISTS volunteer_event_dat;
@@ -337,11 +362,14 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	title text NOT NULL,
+	comment text NOT NULL,
 	start_time timestamp NOT NULL,
 	finish_time timestamp NOT NULL,
+	front_image text NOT NULL,
 	position text NOT NULL,
 	position_longitude text NOT NULL,
 	position_latitude text NOT NULL,
+	account_id int8 NOT NULL DEFAULT '0',
 	author varchar(64) NOT NULL,
 	author_role int8 NOT NULL DEFAULT '0',
 	school_no varchar(64) NOT NULL DEFAULT '0',
@@ -362,32 +390,6 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 Create INDEX volunteer_event_dat_id_idx ON volunteer_event_dat(id);
 
 
-##----volunteer_event_member_dat create
-
-DROP TABLE IF EXISTS volunteer_event_member_dat;
-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;
-
-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);
-
-
 ##----user_certificate_dat create
 
 DROP TABLE IF EXISTS user_certificate_dat;
@@ -529,3 +531,45 @@ Create INDEX user_media_dat_course_id_idx ON user_media_dat(course_id);
 Create INDEX user_media_dat_media_id_idx ON user_media_dat(media_id);
 
 
+##----donation_event_dat create
+
+DROP TABLE IF EXISTS donation_event_dat;
+CREATE TABLE IF NOT EXISTS donation_event_dat(
+	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
+	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	title text NOT NULL,
+	comment text NOT NULL,
+	start_time timestamp NOT NULL,
+	finish_time timestamp NOT NULL,
+	front_image text NOT NULL,
+	author varchar(64) NOT NULL,
+	author_role int8 NOT NULL DEFAULT '0',
+	max_money float(10,2) NOT NULL DEFAULT '0',
+	money float(10,2) NOT NULL DEFAULT '0',
+	status varchar(64) NOT NULL,
+	delete_flg tinyint(1) NOT NULL DEFAULT '0'
+) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
+
+Create INDEX donation_event_dat_id_idx ON donation_event_dat(id);
+
+
+##----user_donation_dat create
+
+DROP TABLE IF EXISTS user_donation_dat;
+CREATE TABLE IF NOT EXISTS user_donation_dat(
+	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
+	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	user_id int8 NOT NULL,
+	donation_id int8 NOT NULL,
+	comment text,
+	money float(5,2) NOT NULL DEFAULT '0',
+	order_no varchar(255),
+	mchid_order_no varchar(255),
+	status varchar(64),
+	delete_flg tinyint(1) NOT NULL DEFAULT '0'
+) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
+
+Create INDEX user_donation_dat_user_id_idx ON user_donation_dat(user_id);
+Create INDEX user_donation_dat_donation_id_idx ON user_donation_dat(donation_id);
+
+

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/23 21:15:57 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/23 21:15:58 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/23 21:15:58 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/23 21:15:58 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/23 21:15:58 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/23 21:15:58 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/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -35,7 +35,7 @@ class CourseMediaDat extends CompassDynamicData
 		$this->tags        = $record["tags"];
 		$this->front_image = $record["front_image"];
 		$this->media       = $record["media"];
-		$this->size       = $record["size"];
+		$this->size        = $record["size"];
 		$this->teacher     = $record["teacher"];
 		$this->is_free     = $record["is_free"];
 		$this->price       = $record["price"];

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/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -31,9 +31,9 @@ class CourseMst extends CompassDynamicData
 		$this->sub_category_id    = $record["sub_category_id"];
 		$this->title              = $record["title"];
 		$this->front_image        = $record["front_image"];
-		$this->teacher_name    = $record["teacher_name"];
+		$this->teacher_name       = $record["teacher_name"];
 		$this->teacher_profile    = $record["teacher_profile"];
-		$this->media_count    = $record["media_count"];
+		$this->media_count        = $record["media_count"];
 		$this->delete_flg         = $record["delete_flg"];
 	}
 

src/cn/compass/entity/DonationsEventDat.inc

+<?php
+/**
+ * DonationsEventDat Entity
+ * $Id: DonationsEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
+ * @author zb
+ * @package jp.compass.entity
+ * @access public
+ */
+class DonationsEventDat extends CompassDynamicData
+{
+	var $title;
+	var $comment;
+	var $start_time;
+	var $finish_time;
+	var $front_image;
+	var $author;
+	var $author_role;
+	var $max_money;
+	var $money;
+	var $status;
+	var $delete_flg;
+
+	/**
+	 * 构造实现。donations_event_dat创建实例。
+	 * 
+	 * @access public
+	 * @param mixed donations_event_dat
+	 */
+	function constructor($record)
+	{
+		parent::constructor($record);
+
+		$this->title       = $record["title"];
+		$this->comment     = $record["comment"];
+		$this->start_time  = $record["start_time"];
+		$this->finish_time = $record["finish_time"];
+		$this->front_image = $record["front_image"];
+		$this->author      = $record["author"];
+		$this->author_role = $record["author_role"];
+		$this->max_money   = $record["max_money"];
+		$this->money       = $record["money"];
+		$this->status      = $record["status"];
+		$this->delete_flg  = $record["delete_flg"];
+	}
+
+	/**
+	 * 根据条件,获取数据列表。
+	 * 条件与DBManager的doSelect相同。
+	 * @access public
+	 * @static
+	 * @param array 检索条件
+	 * @return array Entity的队列
+	 */
+	public static function getList($w_param = null, $orderkey = null, $direction = "ASC", $offset = null, $limit = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+
+		return CompassDBHandler::getList("DonationsEventDat", "donations_event_dat", $w_param, $orderkey, $direction, $offset, $limit);
+	}
+
+	/**
+	 * 根据条件，获取数据列表的件数。
+	 * 条件与DBManager的doSelect相同。
+	 * @access public
+	 * @static
+	 * @param array 检索条件
+	 * @return array Entity的队列
+	 */
+	public static function getListCount($w_param = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+		$db = CompassDBManager::getInstance();
+		$result = $db->doSelect("donations_event_dat", $w_param, null, null, null, null, "count(*) as count");
+
+		return $result[0]["count"];
+	}
+
+	/**
+	 * 获得此类指定ID的实例。
+	 */
+	public static function getById($id)
+	{
+		// delete_flg
+		$param = array();
+		$param["delete_flg"] = false;
+
+		return CompassDBHandler::getById("DonationsEventDat", "donations_event_dat", $id, $param);
+	}
+
+	// -- 这里开始Dynamic ---
+	/**
+	 * 将此实例写入DB。
+	 * DynamicData共用的保存方法。
+	 * @access public
+	 * @return int 写入实例的ID
+	 */
+	public function save()
+	{
+		$v_param = array();
+
+		ParamUtil::copyObj2Array($v_param, $this, "title");
+		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, "front_image");
+		ParamUtil::copyObj2Array($v_param, $this, "author");
+		ParamUtil::copyObj2Array($v_param, $this, "author_role");
+		ParamUtil::copyObj2Array($v_param, $this, "max_money");
+		ParamUtil::copyObj2Array($v_param, $this, "money");
+		ParamUtil::copyObj2Array($v_param, $this, "status");
+		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
+
+		// 保存
+		parent::_save("donations_event_dat", $v_param);
+	}
+}
\ No newline at end of file

src/cn/compass/entity/FamilyEventDat.inc

 <?php
 /**
  * FamilyEventDat Entity
- * $Id: FamilyEventDat.inc,v 1.1 2020/2/22 11:26:51 Exp $
+ * $Id: FamilyEventDat.inc,v 1.1 2020/2/23 21:15:58 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/23 21:15:58 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/23 21:15:57 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/23 21:15:57 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/23 21:15:57 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/23 21:15:58 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/23 21:15:57 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/22 11:26:51 Exp $
+ * $Id: SocialEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -15,8 +15,8 @@ class SocialEventDat extends CompassDynamicData
 	var $title;
 	var $author;
 	var $publish_time;
-	var $content;
 	var $images;
+	var $content;
 	var $delete_flg;
 
 	/**
@@ -36,8 +36,8 @@ class SocialEventDat extends CompassDynamicData
 		$this->title           = $record["title"];
 		$this->author          = $record["author"];
 		$this->publish_time    = $record["publish_time"];
+		$this->images          = $record["images"];
 		$this->content         = $record["content"];
-		$this->images           = $record["images"];
 		$this->delete_flg      = $record["delete_flg"];
 	}
 
@@ -109,8 +109,8 @@ class SocialEventDat extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "title");
 		ParamUtil::copyObj2Array($v_param, $this, "author");
 		ParamUtil::copyObj2Array($v_param, $this, "publish_time");
-		ParamUtil::copyObj2Array($v_param, $this, "content");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "images");
+		ParamUtil::copyObj2Array($v_param, $this, "content");
 		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
 
 		// 保存

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/23 21:15:58 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/23 21:15:57 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/23 21:15:58 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 $
+ * @author zb
+ * @package jp.compass.entity
+ * @access public
+ */
+class UserDonationDat extends CompassDynamicData
+{
+	var $user_id;
+	var $donation_id;
+	var $comment;
+	var $money;
+	var $order_no;
+	var $mchid_order_no;
+	var $status;
+	var $delete_flg;
+
+	/**
+	 * 构造实现。user_donation_dat创建实例。
+	 * 
+	 * @access public
+	 * @param mixed user_donation_dat
+	 */
+	function constructor($record)
+	{
+		parent::constructor($record);
+
+		$this->user_id        = $record["user_id"];
+		$this->donation_id    = $record["donation_id"];
+		$this->comment        = $record["comment"];
+		$this->money          = $record["money"];
+		$this->order_no       = $record["order_no"];
+		$this->mchid_order_no = $record["mchid_order_no"];
+		$this->status         = $record["status"];
+		$this->delete_flg     = $record["delete_flg"];
+	}
+
+	/**
+	 * 根据条件,获取数据列表。
+	 * 条件与DBManager的doSelect相同。
+	 * @access public
+	 * @static
+	 * @param array 检索条件
+	 * @return array Entity的队列
+	 */
+	public static function getList($w_param = null, $orderkey = null, $direction = "ASC", $offset = null, $limit = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+
+		return CompassDBHandler::getList("UserDonationDat", "user_donation_dat", $w_param, $orderkey, $direction, $offset, $limit);
+	}
+
+	/**
+	 * 根据条件，获取数据列表的件数。
+	 * 条件与DBManager的doSelect相同。
+	 * @access public
+	 * @static
+	 * @param array 检索条件
+	 * @return array Entity的队列
+	 */
+	public static function getListCount($w_param = null)
+	{
+		if ($w_param == null) {
+			$w_param = array();
+			$w_param["delete_flg"] = "false";
+		}
+		$db = CompassDBManager::getInstance();
+		$result = $db->doSelect("user_donation_dat", $w_param, null, null, null, null, "count(*) as count");
+
+		return $result[0]["count"];
+	}
+
+	/**
+	 * 获得此类指定ID的实例。
+	 */
+	public static function getById($id)
+	{
+		// delete_flg
+		$param = array();
+		$param["delete_flg"] = false;
+
+		return CompassDBHandler::getById("UserDonationDat", "user_donation_dat", $id, $param);
+	}
+
+	// -- 这里开始Dynamic ---
+	/**
+	 * 将此实例写入DB。
+	 * DynamicData共用的保存方法。
+	 * @access public
+	 * @return int 写入实例的ID
+	 */
+	public function save()
+	{
+		$v_param = array();
+
+		ParamUtil::copyObj2Array($v_param, $this, "user_id");
+		ParamUtil::copyObj2Array($v_param, $this, "donation_id");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
+		ParamUtil::copyObj2Array($v_param, $this, "money");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "order_no");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "mchid_order_no");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "status");
+		ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
+
+		// 保存
+		parent::_save("user_donation_dat", $v_param);
+	}
+}
\ No newline at end of file

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/23 21:15:58 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/23 21:15:58 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/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -66,7 +66,7 @@ class UserMst extends CompassDynamicData
 		$this->latitude                 = $record["latitude"];
 		$this->government_id            = $record["government_id"];
 		$this->province                 = $record["province"];
-		$this->city                 	= $record["city"];
+		$this->city                     = $record["city"];
 		$this->district                 = $record["district"];
 		$this->organization_submit_date = $record["organization_submit_date"];
 		$this->organization_no          = $record["organization_no"];

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/23 21:15:58 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 11:34:26 Exp $
+ * $Id: VolunteerEventDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public
@@ -9,15 +9,16 @@
 class VolunteerEventDat extends CompassDynamicData
 {
 	var $title;
+	var $comment;
 	var $start_time;
 	var $finish_time;
 	var $front_image;
 	var $position;
 	var $position_longitude;
 	var $position_latitude;
+	var $account_id;
 	var $author;
 	var $author_role;
-	var $account_id;
 	var $school_no;
 	var $original_source;
 	var $province;
@@ -43,15 +44,16 @@ class VolunteerEventDat extends CompassDynamicData
 		parent::constructor($record);
 
 		$this->title               = $record["title"];
+		$this->comment             = $record["comment"];
 		$this->start_time          = $record["start_time"];
 		$this->finish_time         = $record["finish_time"];
 		$this->front_image         = $record["front_image"];
 		$this->position            = $record["position"];
 		$this->position_longitude  = $record["position_longitude"];
 		$this->position_latitude   = $record["position_latitude"];
+		$this->account_id          = $record["account_id"];
 		$this->author              = $record["author"];
 		$this->author_role         = $record["author_role"];
-		$this->account_id          = $record["account_id"];
 		$this->school_no           = $record["school_no"];
 		$this->original_source     = $record["original_source"];
 		$this->province            = $record["province"];
@@ -129,15 +131,16 @@ class VolunteerEventDat extends CompassDynamicData
 		$v_param = array();
 
 		ParamUtil::copyObj2Array($v_param, $this, "title");
+		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, "front_image");
 		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, "account_id");
 		ParamUtil::copyObj2Array($v_param, $this, "author");
 		ParamUtil::copyObj2Array($v_param, $this, "author_role");
-		ParamUtil::copyObj2Array($v_param, $this, "account_id");
 		ParamUtil::copyObj2Array($v_param, $this, "school_no");
 		ParamUtil::copyObj2Array($v_param, $this, "original_source");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "province");

src/cn/compass/entity/VolunteerEventMemberDat.inc

 <?php
 /**
  * VolunteerEventMemberDat Entity
- * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/22 17:45:56 Exp $
+ * $Id: VolunteerEventMemberDat.inc,v 1.1 2020/2/23 21:15:58 Exp $
  * @author zb
  * @package jp.compass.entity
  * @access public

src/user/if/ajax_get_top_dat.php

@@ -3,7 +3,7 @@
 // 获取首页数据
 require_once ("../user_include.inc");
 
-ErrorLogger::doOutput("Compass...ajax_get_user_role.php....Start.", 0);
+ErrorLogger::doOutput("Compass...ajax_get_top_dat.php....Start.", 0);
 
 //获取参数
 $unionId = ParamUtil::getRequestString("unionId");
@@ -35,13 +35,16 @@ $socialEventList = array();
 $mediaList = array();
 
 //[1：家园用户]
+$param = array();
+$param['delete_flg'] = false;
+$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
 if($userMst->role == 1) {
 	//志愿者活动[查找本校发布的志愿者活动+面向所属区域学校发布的志愿者活动]
 	$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);
+	//$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
 	
 	//社会实践【家园用户无社会实践】
 	
@@ -54,7 +57,7 @@ if($userMst->role == 1) {
 }
 
 //[2：家校用户]
-if($userMst->role == 1) {
+if($userMst->role == 2) {
 	//志愿者活动
 	
 	//社会实践
@@ -69,7 +72,7 @@ if($userMst->role == 1) {
 }
 
 //[3：高职用户]
-if($userMst->role == 1) {
+if($userMst->role == 3) {
 	//志愿者活动
 	
 	//社会实践【高职用户无亲子活动】
@@ -115,7 +118,7 @@ $result["familyEventList"] = $familyEventList;
 $result["socialEventList"] = $socialEventList;
 $result["mediaList"] = $mediaList;
 
-ErrorLogger::doOutput("Compass...ajax_get_user_role.php....End.", 0);
+ErrorLogger::doOutput("Compass...ajax_get_top_dat.php....End.", 0);
 
 //返回结果
 responseOK($result);

src/user/if/ajax_get_volunteer_event_list.php

+<?php
+
+// 获取志愿者活动列表
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_list.php....Start.", 0);
+
+//获取参数
+$unionId = ParamUtil::getRequestString("unionId");
+$page = ParamUtil::getRequestNumber("page", 0);//翻页
+
+$result = array();
+
+//参数检查
+if(empty($unionId)) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
+}
+
+//判断用户是否存在
+$param = array();
+$param['unionid'] = $unionId;
+$param['delete_flg'] = false;
+$userList = UserMst::getList($param,'id','desc', 0, 1);
+if(empty($userList)) {
+	$result["message"] = "用户不存在！";
+	responseNG($result);
+}
+
+$userMst = $userList[0];
+
+//判断用户身份分别获取数据
+$volunteerEventList = array();
+
+$param = array();
+$param['delete_flg'] = false;
+$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
+
+//[1：家园用户]
+if($userMst->role == 1) {
+	//志愿者活动[查找本校发布的志愿者活动+面向所属区域学校发布的志愿者活动]
+	$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);
+}
+
+//[2：家校用户]
+if($userMst->role == 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);
+	
+	//亲子活动【家校用户无亲子活动】
+	//公益课堂
+}
+
+//[3：高职用户]
+if($userMst->role == 1) {
+	//志愿者活动
+	
+
+}
+
+//[4：教育局领导]
+if($userMst->role == 1) {
+
+}
+
+//[5：社会用户]
+if($userMst->role == 1) {
+
+}
+
+//[6：机构用户]
+if($userMst->role == 1) {
+
+}
+
+
+//组装返回数据
+$result["volunteerEventList"] = $volunteerEventList;
+
+ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_list.php....End.", 0);
+
+//返回结果
+responseOK($result);
+
+function responseNG($result) {
+	$result = array("status"=>"NG", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+function responseOK($result) {
+	$result = array("status"=>"OK", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+?>
\ No newline at end of file