+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserTagDTO;
+import com.elink.esua.epdc.dto.UserTagRelationDTO;
+import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.excel.VolunteerInfoExcel;
+import com.elink.esua.epdc.modules.volunteer.service.VolunteerInfoService;
+import com.elink.esua.epdc.service.UserTagRelationService;
+import com.elink.esua.epdc.service.UserTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@RestController
+@RequestMapping("volunteerinfo")
+public class VolunteerInfoController {
+
+ @Autowired
+ private VolunteerInfoService volunteerInfoService;
+
+ @Autowired
+ private UserTagService userTagService; //标签表
+
+ @Autowired
+ private UserTagRelationService userTagRelationService; //用户标签关系表
+ /**
+ * 新增时 赋默认值
+ * 查询到数据 返回的是志愿者表中的基础数据
+ * 没查到数据 返回的是用户表中的数据
+ * @return
+ */
+// @PostMapping("/defaultValue")
+// public Result defaultValue(){
+// Long userId = SecurityUser.getUserId();
+// String id = "2303cb67e81d3163bdb15043baac7e27";
+// VolunteerInfoDTO volunteerInfo = volunteerInfoService.get(id);
+// if(volunteerInfo == null){ //返回 用户表 数据
+// Result userInfo = volunteerInfoService.getVolunteerUserDefaultValue(id);
+// return userInfo;
+// }
+// return new Result().ok(volunteerInfo);
+// }
+
+ /**
+ * 查询列表数据
+ * @param params
+ * @return
+ */
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = volunteerInfoService.volunteerInfo(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * 根据志愿者ID，查询志愿者 单条详情
+ * 积分需要连user表查询
+ * @param id
+ * @return
+ */
+ @GetMapping("getVolunteerDetail/{id}")
+ public Result getVolunteerDetail(@PathVariable("id") String id){
+ VolunteerInfoDTO data = volunteerInfoService.getVolunteerDetail(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody VolunteerInfoDTO dto){
+ //效验数据
+ //ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ //2019-12-10 09:16:39
+// Long userId = SecurityUser.getUserId();
+// dto.setRegistTime(new Date());
+// dto.setRevision(1);
+// dto.setCreatedBy(userId.toString());
+// dto.setCreatedTime(new Date());
+// dto.setUpdatedTime(new Date());
+// dto.setUpdatedBy(userId.toString());
+// volunteerInfoService.save(dto);
+ return new Result();
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ VolunteerInfoDTO data = volunteerInfoService.get(id);
+ return new Result().ok(data);
+ }
+
+ /**
+ * 志愿者 申请审批
+ * 通过 更新user表 和 志愿者表
+ * 不通过 更新user表
+ *
+ * 向用户标签表epdc_user_tag 和 用户标签关系表epdc_user_tag_relation 添加用户身份
+ *
+ * 消息进行推送
+ * @param dto 志愿者表id，是否通过，审核不通过的原因
+ * @return
+ */
+ @PostMapping("volunteerInfoCheck")
+ public Result volunteerInfoCheck(@RequestBody VolunteerInfoDTO dto){
+ Long userId = SecurityUser.getUserId();
+ Date date = new Date();
+ dto.setAuditor(userId);
+ dto.setAuditTime(date);
+ dto.setUpdatedBy(userId.toString());
+ dto.setUpdatedTime(date);
+ //效验数据
+ //ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ String auditStatus = dto.getAuditStatus(); //申请是否通过
+ if (auditStatus.equals("1")){ //通过
+ volunteerInfoService.updateVolunteerInfo(dto);//修改志愿者表 是否通过字段及更新时间
+ VolunteerInfoDTO data = volunteerInfoService.get(dto.getId());//查询志愿者表，该志愿者的最新信息
+
+ //向标签表中，查询唯一志愿者标签：tag_code = volunteer
+ UserTagDTO userTag = volunteerInfoService.volunteerTagQuery("volunteer");
+ UserTagRelationDTO userTagRelationDTO = new UserTagRelationDTO();//添加：用户标签关系表epdc_user_tag_relation
+ userTagRelationDTO.setUserId(data.getUserId());
+ userTagRelationDTO.setTagId(userTag.getId());
+ userTagRelationService.save(userTagRelationDTO);
+ }else if (auditStatus.equals("2")){ //不通过
+ volunteerInfoService.updateVolunteerInfo(dto);//修改志愿者表 字段为：审核人 审核时间 审核状态 审核不通过原因
+ }
+ return new Result();
+ }
+
+ /**
+ * 积分调整，对用户表总积分数进行修改
+ * 向积分日志表插入积分调整信息
+ * @param map 志愿者表id，志愿者用户id，志愿者表总积分，积分日志表积分操作
+ * @return
+ */
+ @PostMapping("pointsAdjust")
+ public Result pointsAdjust(@RequestBody Map map){
+
+ return new Result();
+ }
+
+ //-----------------------------------------------------------------------------
+ @PutMapping
+ public Result update(@RequestBody VolunteerInfoDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ volunteerInfoService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ volunteerInfoService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = volunteerInfoService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, VolunteerInfoExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
new file mode 100644
index 000000000..15a5f6e88
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.UserTagDTO;
+import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.entity.VolunteerInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Mapper
+public interface VolunteerInfoDao extends BaseDao {
+ /**
+ * 志愿者申请，根据用户表基础信息 赋默认值
+ * @param id
+ * @return VolunteerInfoDTO
+ * @author zy
+ * @date 2019-12-11
+ */
+ VolunteerInfoDTO getVolunteerUserDefaultValue(String id);
+
+ /**
+ * 根据查询条件，返回首页 志愿者信息列表
+ * @param params
+ * @return
+ */
+ List volunteerInfoList(Map params);
+
+ /**
+ * 根据志愿者ID，查询志愿者 单条详情
+ * 积分需要连user表查询
+ *
+ * @param id
+ * @return VolunteerInfoDTO
+ * @author generator
+ * @date 2019-12-11
+ */
+ VolunteerInfoDTO getVolunteerDetail(String id);
+
+ /**
+ * 根据查询条件，返回首页 志愿者信息列表总数
+ * @param params
+ * @return
+ */
+ int volunteerInfoCount(Map params);
+
+ /**
+ * 自定义 志愿者表修改方法
+ * @param dto
+ */
+ void updateVolunteerInfo(VolunteerInfoDTO dto);
+
+ /**
+ * 向标签表中，查询唯一志愿者标签：tag_code = volunteer
+ * @param tagCode
+ * @return
+ */
+ UserTagDTO volunteerTagQuery(String tagCode);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java
new file mode 100644
index 000000000..cede16abb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java
@@ -0,0 +1,157 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Component
+public class VolunteerInfoRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
new file mode 100644
index 000000000..0f2369cf1
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *