志愿者任务实体类

common/src/main/java/com/jpsoft/employment/modules/base/dao/VolunteerSignRecordDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.VolunteerSignRecord;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface VolunteerSignRecordDAO {
+	int insert(VolunteerSignRecord entity);
+	int update(VolunteerSignRecord entity);
+	int exist(String id);
+	VolunteerSignRecord get(String id);
+	int delete(String id);
+	List<VolunteerSignRecord> list();
+	List<VolunteerSignRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/dao/VolunteerTasksDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.VolunteerTasks;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface VolunteerTasksDAO {
+	int insert(VolunteerTasks entity);
+	int update(VolunteerTasks entity);
+	int exist(String id);
+	VolunteerTasks get(String id);
+	int delete(String id);
+	List<VolunteerTasks> list();
+	List<VolunteerTasks> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/entity/AddressInfo.java

@@ -52,5 +52,8 @@ public class AddressInfo {
 	
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+	@ApiModelProperty(value = "类型（1：爱心人士地址，2，学校地址）")
+	private String type;
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/ParticipateProjectInfo.java

@@ -39,7 +39,7 @@ public class ParticipateProjectInfo {
 				@ApiModelProperty(value = "联系人")
 	private String contacts;
 	
-				@ApiModelProperty(value = "联系单位")
+				@ApiModelProperty(value = "联系电话")
 	private String contactsCompany;
 	
 				@ApiModelProperty(value = "创建人")

common/src/main/java/com/jpsoft/employment/modules/base/entity/VolunteerSignRecord.java

@@ -0,0 +1,53 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_volunteer_sign_record的实体类
+ */
+@Data
+@ApiModel(value = "base_volunteer_sign_record的实体类")
+public class VolunteerSignRecord {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "姓名")
+	private String name;
+	
+				@ApiModelProperty(value = "联系电话")
+	private String phone;
+	
+				@ApiModelProperty(value = "备注")
+	private String bak;
+	
+				@ApiModelProperty(value = "志愿者任务ID")
+	private String volunteerTasksId;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/VolunteerTasks.java

@@ -0,0 +1,60 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_volunteer_tasks的实体类
+ */
+@Data
+@ApiModel(value = "base_volunteer_tasks的实体类")
+public class VolunteerTasks {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "任务介绍")
+	private String introduce;
+	
+				@ApiModelProperty(value = "志愿者要求")
+	private String volunteerRequirements;
+	
+				@ApiModelProperty(value = "校方联系方式")
+	private String schoolContact;
+	
+					@ApiModelProperty(value = "活动开始时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date startTime;
+	
+				@ApiModelProperty(value = "任务结束时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date endTime;
+	
+			@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

common/src/main/java/com/jpsoft/employment/modules/base/service/VolunteerSignRecordService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.VolunteerSignRecord;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface VolunteerSignRecordService {
+	VolunteerSignRecord get(String id);
+	boolean exist(String id);
+	int insert(VolunteerSignRecord model);
+	int update(VolunteerSignRecord model);
+	int delete(String id);
+	List<VolunteerSignRecord> list();
+	Page<VolunteerSignRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/VolunteerTasksService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.VolunteerTasks;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface VolunteerTasksService {
+	VolunteerTasks get(String id);
+	boolean exist(String id);
+	int insert(VolunteerTasks model);
+	int update(VolunteerTasks model);
+	int delete(String id);
+	List<VolunteerTasks> list();
+	Page<VolunteerTasks> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/VolunteerSignRecordServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.VolunteerSignRecordDAO;
+import com.jpsoft.employment.modules.base.entity.VolunteerSignRecord;
+import com.jpsoft.employment.modules.base.service.VolunteerSignRecordService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="volunteerSignRecordService")
+public class VolunteerSignRecordServiceImpl implements VolunteerSignRecordService {
+	@Resource(name="volunteerSignRecordDAO")
+	private VolunteerSignRecordDAO volunteerSignRecordDAO;
+
+	@Override
+	public VolunteerSignRecord get(String id) {
+		// TODO Auto-generated method stub
+		return volunteerSignRecordDAO.get(id);
+	}
+
+	@Override
+	public int insert(VolunteerSignRecord model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return volunteerSignRecordDAO.insert(model);
+	}
+
+	@Override
+	public int update(VolunteerSignRecord model) {
+		// TODO Auto-generated method stub
+		return volunteerSignRecordDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return volunteerSignRecordDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = volunteerSignRecordDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<VolunteerSignRecord> list() {
+		// TODO Auto-generated method stub
+		return volunteerSignRecordDAO.list();
+	}
+		
+	@Override
+	public Page<VolunteerSignRecord> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<VolunteerSignRecord> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            volunteerSignRecordDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/VolunteerTasksServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.VolunteerTasksDAO;
+import com.jpsoft.employment.modules.base.entity.VolunteerTasks;
+import com.jpsoft.employment.modules.base.service.VolunteerTasksService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="volunteerTasksService")
+public class VolunteerTasksServiceImpl implements VolunteerTasksService {
+	@Resource(name="volunteerTasksDAO")
+	private VolunteerTasksDAO volunteerTasksDAO;
+
+	@Override
+	public VolunteerTasks get(String id) {
+		// TODO Auto-generated method stub
+		return volunteerTasksDAO.get(id);
+	}
+
+	@Override
+	public int insert(VolunteerTasks model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return volunteerTasksDAO.insert(model);
+	}
+
+	@Override
+	public int update(VolunteerTasks model) {
+		// TODO Auto-generated method stub
+		return volunteerTasksDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return volunteerTasksDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = volunteerTasksDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<VolunteerTasks> list() {
+		// TODO Auto-generated method stub
+		return volunteerTasksDAO.list();
+	}
+		
+	@Override
+	public Page<VolunteerTasks> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<VolunteerTasks> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            volunteerTasksDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/AddressInfo.xml

@@ -15,6 +15,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="type" column="type_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.AddressInfo">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_address_info
-	    (id_,recipients_,phone_,region_,detail_address,reg_user_id,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,recipients_,phone_,region_,detail_address,reg_user_id,create_by,create_time,update_by,update_time,del_flag,type_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{type,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,6 +79,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="type!=null">
+				type_=#{type,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -97,8 +102,9 @@
 			select * from base_address_info
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag=false
+			<if test="searchParams.type != null">
+				and type_ = #{searchParams.type}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

common/src/main/resources/mapper/base/VolunteerSignRecord.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.VolunteerSignRecordDAO">
+	<resultMap id="VolunteerSignRecordMap" type="com.jpsoft.employment.modules.base.entity.VolunteerSignRecord">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="phone" column="phone_" />
+			<result property="bak" column="bak_" />
+			<result property="volunteerTasksId" column="volunteer_tasks_id" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.VolunteerSignRecord">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_volunteer_sign_record
+	    (id_,name_,phone_,bak_,volunteer_tasks_id,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{bak,jdbcType=VARCHAR}
+,#{volunteerTasksId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_volunteer_sign_record where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.VolunteerSignRecord">
+		update base_volunteer_sign_record
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="bak!=null">
+		bak_=#{bak,jdbcType=VARCHAR},
+		</if>
+				<if test="volunteerTasksId!=null">
+		volunteer_tasks_id=#{volunteerTasksId,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="VolunteerSignRecordMap">
+		select 
+id_,name_,phone_,bak_,volunteer_tasks_id,create_by,create_time,update_by,update_time,del_flag		from base_volunteer_sign_record where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_volunteer_sign_record where id_=#{0}
+	</select>
+	<select id="list" resultMap="VolunteerSignRecordMap">
+		select * from base_volunteer_sign_record
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="VolunteerSignRecordMap">
+		<![CDATA[
+			select * from base_volunteer_sign_record
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/base/VolunteerTasks.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.VolunteerTasksDAO">
+	<resultMap id="VolunteerTasksMap" type="com.jpsoft.employment.modules.base.entity.VolunteerTasks">
+		<id property="id" column="id_" />
+			<result property="introduce" column="introduce_" />
+			<result property="volunteerRequirements" column="volunteer_requirements" />
+			<result property="schoolContact" column="school_contact" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.VolunteerTasks">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_volunteer_tasks
+	    (id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{introduce,jdbcType=VARCHAR}
+,#{volunteerRequirements,jdbcType=VARCHAR}
+,#{schoolContact,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_volunteer_tasks where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.VolunteerTasks">
+		update base_volunteer_tasks
+		<set>
+				<if test="introduce!=null">
+		introduce_=#{introduce,jdbcType=VARCHAR},
+		</if>
+				<if test="volunteerRequirements!=null">
+		volunteer_requirements=#{volunteerRequirements,jdbcType=VARCHAR},
+		</if>
+				<if test="schoolContact!=null">
+		school_contact=#{schoolContact,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="VolunteerTasksMap">
+		select 
+id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_by,create_time,update_by,update_time,del_flag		from base_volunteer_tasks where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_volunteer_tasks where id_=#{0}
+	</select>
+	<select id="list" resultMap="VolunteerTasksMap">
+		select * from base_volunteer_tasks
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="VolunteerTasksMap">
+		<![CDATA[
+			select * from base_volunteer_tasks
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/employment/modules/base/controller/AddressInfoController.java

@@ -79,6 +79,7 @@ public class AddressInfoController {
             AddressInfo addressInfo = addressInfoService.get(id);
 
             if (addressInfo != null) {
+
                 msgResult.setResult(true);
                 msgResult.setData(addressInfo);
             } else {
@@ -215,6 +216,7 @@ public class AddressInfoController {
             searchParams.put("id","%" + id + "%");
         }
 
+        searchParams.put("type","2");
 
         Page<AddressInfo> page = addressInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/VolunteerSignRecordController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.base.entity.VolunteerSignRecord;
+import com.jpsoft.employment.modules.base.service.VolunteerSignRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.mapping.ResultMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/volunteerSignRecord")
+public class VolunteerSignRecordController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private VolunteerSignRecordService volunteerSignRecordService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<VolunteerSignRecord> create(){
+        MessageResult<VolunteerSignRecord> msgResult = new MessageResult<>();
+
+        VolunteerSignRecord volunteerSignRecord = new VolunteerSignRecord();
+
+        msgResult.setData(volunteerSignRecord);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<VolunteerSignRecord> add(@RequestBody VolunteerSignRecord volunteerSignRecord,@RequestAttribute String subject){
+        MessageResult<VolunteerSignRecord> msgResult = new MessageResult<>();
+
+        try {
+            volunteerSignRecord.setId(UUID.randomUUID().toString());
+			volunteerSignRecord.setDelFlag(false);
+            volunteerSignRecord.setCreateBy(subject);
+            volunteerSignRecord.setCreateTime(new Date());
+
+            int affectCount = volunteerSignRecordService.insert(volunteerSignRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerSignRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<VolunteerSignRecord> edit(@PathVariable("id") String id){
+        MessageResult<VolunteerSignRecord> msgResult = new MessageResult<>();
+
+        try {
+            VolunteerSignRecord volunteerSignRecord = volunteerSignRecordService.get(id);
+
+            if (volunteerSignRecord != null) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerSignRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<VolunteerSignRecord> update(@RequestBody VolunteerSignRecord volunteerSignRecord,@RequestAttribute String subject){
+        MessageResult<VolunteerSignRecord> msgResult = new MessageResult<>();
+
+        try {
+		    volunteerSignRecord.setUpdateBy(subject);
+            volunteerSignRecord.setUpdateTime(new Date());
+		
+            int affectCount = volunteerSignRecordService.update(volunteerSignRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerSignRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<VolunteerSignRecord> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<VolunteerSignRecord> msgResult = new MessageResult<>();
+
+        try {
+			
+			VolunteerSignRecord volunteerSignRecord = volunteerSignRecordService.get(id);
+            volunteerSignRecord.setDelFlag(true);
+            volunteerSignRecord.setUpdateBy(subject);
+            volunteerSignRecord.setUpdateTime(new Date());
+			
+			int affectCount = volunteerSignRecordService.update(volunteerSignRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                VolunteerSignRecord volunteerSignRecord = volunteerSignRecordService.get(id);
+                volunteerSignRecord.setDelFlag(true);
+                volunteerSignRecord.setUpdateBy(subject);
+                volunteerSignRecord.setUpdateTime(new Date());
+
+                affectCount += volunteerSignRecordService.update(volunteerSignRecord);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<VolunteerSignRecord> page = volunteerSignRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/base/controller/VolunteerTasksController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.base.entity.VolunteerTasks;
+import com.jpsoft.employment.modules.base.service.VolunteerTasksService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/volunteerTasks")
+public class VolunteerTasksController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private VolunteerTasksService volunteerTasksService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<VolunteerTasks> create(){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        VolunteerTasks volunteerTasks = new VolunteerTasks();
+
+        msgResult.setData(volunteerTasks);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<VolunteerTasks> add(@RequestBody VolunteerTasks volunteerTasks,@RequestAttribute String subject){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+            volunteerTasks.setId(UUID.randomUUID().toString());
+			volunteerTasks.setDelFlag(false);
+            volunteerTasks.setCreateBy(subject);
+            volunteerTasks.setCreateTime(new Date());
+
+            int affectCount = volunteerTasksService.insert(volunteerTasks);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerTasks);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<VolunteerTasks> edit(@PathVariable("id") String id){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+            VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
+
+            if (volunteerTasks != null) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerTasks);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<VolunteerTasks> update(@RequestBody VolunteerTasks volunteerTasks,@RequestAttribute String subject){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+		    volunteerTasks.setUpdateBy(subject);
+            volunteerTasks.setUpdateTime(new Date());
+		
+            int affectCount = volunteerTasksService.update(volunteerTasks);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(volunteerTasks);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<VolunteerTasks> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<VolunteerTasks> msgResult = new MessageResult<>();
+
+        try {
+			
+			VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
+            volunteerTasks.setDelFlag(true);
+            volunteerTasks.setUpdateBy(subject);
+            volunteerTasks.setUpdateTime(new Date());
+			
+			int affectCount = volunteerTasksService.update(volunteerTasks);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                VolunteerTasks volunteerTasks = volunteerTasksService.get(id);
+                volunteerTasks.setDelFlag(true);
+                volunteerTasks.setUpdateBy(subject);
+                volunteerTasks.setUpdateTime(new Date());
+
+                affectCount += volunteerTasksService.update(volunteerTasks);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<VolunteerTasks> page = volunteerTasksService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}