Merge branch 'test' of http://121.42.41.42:7070/r/esua-epdc-cloud into test

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class DeptEntityUtils {
 
     @Data
-    public class DeptDto {
+    public static class DeptDto {
         /**
          * 父所有部门ID
          */

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -22,8 +22,8 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
     /**
      * 身份证号码
      */
-    @NotBlank(message = "身份证号码不能为空")
     private String identityNo;
+
     /**
      * 手机号
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -126,7 +126,7 @@ public class ApiActUserRelationController {
      * @date 2019/12/13 14:41
      */
     @GetMapping("clockList")
-    public Result<EpdcAppClockListDTO> getClockList(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) {
+    public Result<EpdcAppClockListDTO> getClockList(@LoginUser TokenDto tokenDto, String actId) {
         Result<AppClockListDTO> result = actUserRelationService.getClockList(actId);
         EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class);
         Result<EpdcAppClockListDTO> result1 = new Result<EpdcAppClockListDTO>();
@@ -144,7 +144,7 @@ public class ApiActUserRelationController {
      * @date 2019/12/13 14:41
      */
     @GetMapping("clockAddressDetail")
-    public Result<AppActInfoDTO> clockAddressDetail(@PathVariable("actId") String actId) {
+    public Result<AppActInfoDTO> clockAddressDetail(String actId) {
         return actUserRelationService.clockAddressDetail(actId);
 
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.service.ActInfoService;
@@ -33,7 +35,8 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("list")
-    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto) {
+    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        formDto.setUserId(tokenDto.getUserId());
         return actInfoService.listItems(formDto);
     }
     /**
@@ -44,7 +47,8 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("signupList")
-    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto) {
+    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        formDto.setUserId(tokenDto.getUserId());
         return actInfoService.signupListItems(formDto);
     }
 
@@ -56,8 +60,11 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("detail/{id}")
-    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id) {
-        return actInfoService.getDetail(id);
+    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
+        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
+        formDto.setId(id);
+        formDto.setUserId(tokenDto.getUserId());
+        return actInfoService.getDetail(formDto);
     }
 
     /**
@@ -68,8 +75,11 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("rejectDetail/{id}")
-    public Result<ActInfoDetailAppResultDTO> rejectDetail(@PathVariable String id) {
-        return actInfoService.getRejectDetail(id);
+    public Result<ActInfoDetailAppResultDTO> rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
+        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
+        formDto.setId(id);
+        formDto.setUserId(tokenDto.getUserId());
+        return actInfoService.getRejectDetail(formDto);
     }
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
@@ -56,11 +58,11 @@ public interface ActInfoFeignClient {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:42
      */
-    @GetMapping(value = "heart/appactinfo/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id);
+    @GetMapping(value = "heart/appactinfo/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
 
-    @GetMapping(value = "heart/appactinfo/rejectdetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id);
+    @GetMapping(value = "heart/appactinfo/rejectdetail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java

@@ -34,12 +34,12 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "signupListItems", formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", id);
+    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", id);
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", formDto);
     }
     @Override
     public Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id) {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.result.*;
 
@@ -40,9 +41,9 @@ public interface ActInfoService {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
      */
-    Result<ActInfoDetailAppResultDTO> getDetail(String itemId);
+    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
 
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(String itemId);
+    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId);
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
@@ -40,12 +41,12 @@ public class ActInfoServiceImpl implements ActInfoService {
     }
 
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(String itemId) {
-        return actInfoFeignClient.getDetail(itemId);
+    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
+        return actInfoFeignClient.getDetail(formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(String itemId) {
-        return actInfoFeignClient.getRejectDetail(itemId);
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
+        return actInfoFeignClient.getRejectDetail(formDto);
     }
     @Override
     public Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId) {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -236,7 +236,6 @@ public class AppUserServiceImpl implements AppUserService {
             return new Result().ok(authorization);
         }
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
-        tokenDto.setUserId(userDto.getId());
 
         String state = userDto.getState();
         authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state);
@@ -853,7 +852,7 @@ public class AppUserServiceImpl implements AppUserService {
         boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
         if (partyFlag) {
             GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO();
-            formDto.setUserId(cachingUserInfoDTO.getId());
+            formDto.setUserId(cachingUserInfoDTO.getUserId());
             formDto.setPartyMember(partyFlag ? NumConstant.ZERO_STR : NumConstant.ONE_STR);
             formDto.setNickname(cachingUserInfoDTO.getNickname());
             formDto.setUserAvatar(cachingUserInfoDTO.getFaceImg());

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java

@@ -42,7 +42,7 @@ public class ActInfoAppFormDTO implements Serializable {
     @Min(value = 1, message = "页码必须大于0")
     private int pageIndex;
 
-    private Long userId;
+    private String userId;
 
     private String id;
     /**

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@@ -66,6 +66,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-common-clienttoken</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java

@@ -52,7 +52,7 @@ public class ActBannerController {
 
     @GetMapping("page")
     public Result<PageData<ActBannerDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<ActBannerDTO> page = actBannerService.page(params);
+        PageData<ActBannerDTO> page = actBannerService.getActBannerPage(params);
         return new Result<PageData<ActBannerDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java

@@ -22,6 +22,8 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
@@ -87,9 +89,9 @@ public class AppActInfoController {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:46
      */
-    @GetMapping("detail/{id}")
-    public Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id) {
-        return this.actInfoService.getDetailByApp(id);
+    @GetMapping("detail")
+    public Result<ActInfoDetailAppResultDTO> getDetail(@RequestBody ActInfoAppFormDTO formDto) {
+        return this.actInfoService.getDetailByApp(formDto);
     }
 
     /**
@@ -99,9 +101,9 @@ public class AppActInfoController {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:46
      */
-    @GetMapping("rejectdetail/{id}")
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id) {
-        return this.actInfoService.getRejectDetailByApp(id);
+    @GetMapping("rejectdetail")
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@RequestBody ActInfoAppFormDTO formDto) {
+        return this.actInfoService.getRejectDetailByApp(formDto);
     }
     /**
      * 项目详情--工作端

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java

@@ -17,10 +17,14 @@
 
 package com.elink.esua.epdc.modules.activity.dao;
 
+import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 爱心互助活动banner 爱心互助活动banner
  *
@@ -29,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ActBannerDao extends BaseDao<ActBannerEntity> {
-	
+    List<ActBannerDTO> getActBannerlist(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -44,6 +44,9 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      */
     PageData<ActBannerDTO> page(Map<String, Object> params);
 
+    PageData<ActBannerDTO> getActBannerPage(Map<String, Object> params);
+
+
     /**
      * 默认查询
      *

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.form.ActInfoFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -95,7 +96,7 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/10 20:54
      */
-    Result<ActInfoDetailAppResultDTO> getDetailByApp(String id);
+    Result<ActInfoDetailAppResultDTO> getDetailByApp(ActInfoAppFormDTO formDto);
     /**
      * 移动端-项目详情
      * @Params: [formDto]
@@ -103,7 +104,7 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/10 20:54
      */
-    Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(String id);
+    Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(ActInfoAppFormDTO formDto);
 
     /**
      * 移动端-项目详情

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -60,6 +60,12 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         );
         return getPageData(page, ActBannerDTO.class);
     }
+    @Override
+    public PageData<ActBannerDTO> getActBannerPage(Map<String, Object> params) {
+        IPage<ActBannerDTO> page = getPage(params);
+        List<ActBannerDTO> list = baseDao.getActBannerlist(params);
+        return new PageData<>(list, page.getTotal());
+    }
 
     @Override
     public List<ActBannerDTO> list(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -162,8 +162,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ActInfoAppResultDTO>> signupListItemsByApp(ActInfoAppFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
-        formDto.setUserId(SecurityUser.getUserId());
-
         formDto.setPageIndex(pageIndex);
         List<ActInfoAppResultDTO> data = baseDao.signupListItemsByApp(formDto);
         return new Result<List<ActInfoAppResultDTO>>().ok(data);
@@ -178,8 +176,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ActInfoAppResultDTO>> listItemsByApp(ActInfoAppFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
-        formDto.setUserId(SecurityUser.getUserId());
-
         formDto.setPageIndex(pageIndex);
         List<ActInfoAppResultDTO> data = baseDao.listItemsByApp(formDto);
         return new Result<List<ActInfoAppResultDTO>>().ok(data);
@@ -208,10 +204,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetailByApp(String id) {
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
-        formDto.setId(id);
-        formDto.setUserId(SecurityUser.getUserId());
+    public Result<ActInfoDetailAppResultDTO> getDetailByApp(ActInfoAppFormDTO formDto) {
+
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String dateString = formatter.format(currentTime);
@@ -220,11 +214,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         return new Result<ActInfoDetailAppResultDTO>().ok(resultDTO);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(String id) {
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
-        formDto.setId(id);
-        formDto.setUserId(SecurityUser.getUserId());
-
+    public Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(ActInfoAppFormDTO formDto) {
         ActInfoDetailAppResultDTO resultDTO = baseDao.getRejectDetailByApp(formDto);
         return new Result<ActInfoDetailAppResultDTO>().ok(resultDTO);
     }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -22,6 +22,38 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getActBannerlist" resultMap="actBannerMap">
+        SELECT
+        banner.ID,
+        banner.ACT_ID,
+        banner.TITLE,
+        banner.BANNER_IMG,
+        banner.BANNER_TYPE,
+        banner.URL,
+        banner.STATUS,
+        banner.STATUS_TIME,
+        banner.BANNER_POSITION,
+        banner.BROWSE_NUM,
+        banner.DEPT_ID,
+        banner.REVISION,
+        banner.DEL_FLAG,
+        banner.CREATED_BY,
+        banner.CREATED_TIME,
+        banner.UPDATED_BY,
+        banner.UPDATED_TIME
+        FROM
+        epdc_act_banner banner
+        WHERE
+        banner.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( banner.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="status != null and status != ''">
+            AND banner.STATUS = #{status}
+        </if>
+        ORDER BY
+        banner.CREATED_TIME DESC
+    </select>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -342,15 +342,14 @@
         end as currentUserStatus,
         IF(clock.clockCount is not null ,'1','0') as signupFlag,
         relation.ID as actUserId,
-
-        IF(volunteer.USER_ID is not null ,'1','0') as userVolunteerFlag
+        IF(volunteer.AUDIT_STATUS is not null and volunteer.AUDIT_STATUS = '1','1','0')  as userVolunteerFlag
         FROM
         epdc_act_info actInfo
         left join epdc_act_user_relation relation on relation.DEL_FLAG = '0'
         and relation.USER_ID = #{userId}
         and actInfo.ID = relation.ACT_ID
         LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
-        LEFT JOIN epdc_volunteer_rank  volunteer ON  volunteer.USER_ID = relation.USER_ID AND volunteer.DEL_FLAG = '0'
+        LEFT JOIN esua_epdc_user.epdc_volunteer_info  volunteer ON  (volunteer.USER_ID = relation.USER_ID OR volunteer.USER_ID =#{userId}) AND volunteer.DEL_FLAG = '0'
         WHERE
         actInfo.DEL_FLAG = '0'
         AND actInfo.ID = #{id}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java

@@ -15,12 +15,12 @@ public enum KpiResultGridDataEnum {
     /***
      * 群众反映问题网格响应率得分
      */
-    GIRD_PROBLEM_RESPONSE_RATE_SCORE("gird_problem_response_rate_score","群众反映问题网格响应率得分"),
+    GRID_PROBLEM_RESPONSE_RATE_SCORE("grid_problem_response_rate_score","群众反映问题网格响应率得分"),
 
     /***
      * 群众反映问题网格办理满意率得分
      */
-    GIRD_PROBLEM_SATISFACTION_RATE_SCORE("gird_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
+    GRID_PROBLEM_SATISFACTION_RATE_SCORE("grid_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
 
 
     private String value;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java

@@ -135,7 +135,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         responseDetail.append(mapBigDecimal.get("peopleReportAmount") + ",");
         responseDetail.append("群众反应问题响应数:" + mapBigDecimal.get("peopleReportRespAmount"));
         dto.setRownum(2);
-        dto.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_RESPONSE_RATE_SCORE.getName());
+        dto.setRule(KpiResultGridDataEnum.GRID_PROBLEM_RESPONSE_RATE_SCORE.getName());
         dto.setDetail(responseDetail.toString());
         listMap.add(dto);
 
@@ -145,7 +145,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         satisfiedDetail.append("调查总数：" + mapBigDecimal.get("total") + ";满意数：" + mapBigDecimal.get("peopleHighEvaluationAmount") + ";基本满意数："
                 + mapBigDecimal.get("peopleMediumEvaluationAmount") + ";不满意数：" + mapBigDecimal.get("peopleLowEvaluationAmount"));
         dto1.setRownum(3);
-        dto1.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_SATISFACTION_RATE_SCORE.getName());
+        dto1.setRule(KpiResultGridDataEnum.GRID_PROBLEM_SATISFACTION_RATE_SCORE.getName());
         dto1.setDetail(satisfiedDetail.toString());
         listMap.add(dto1);
         return listMap;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java

@@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,7 +18,7 @@ public class CachingUserInfoDTO {
     /**
      * 用户ID
      */
-    private String id;
+    private String userId;
 
     /**
      * 昵称

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -46,7 +47,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 姓名
      */
-    private String fullName;
+    private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -81,7 +82,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java

@@ -31,7 +31,7 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable {
 	/**
 	 * 姓名
 	 */
-	private String fullName;
+	private String realName;
 
 	/**
 	 * 性别(0-女，1-男)

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java

@@ -22,7 +22,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 姓名
      */
-    private String fullName;
+    private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -58,7 +58,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -5,16 +5,8 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
@@ -411,7 +403,6 @@ public class EpdcAppUserController {
      */
     @GetMapping("needCachingUserInfoByUserId/{userId}")
     public Result<CachingUserInfoDTO> needCachingUserInfoByUserId(@PathVariable("userId") String userId) {
-        //TODO:尹作梅
-        return null;
+        return userService.cachingUserInfoByUserId(userId);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java

@@ -9,10 +9,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -46,7 +43,7 @@ public class EpdcAppVolunteerInfoController {
      * @return
      */
     @GetMapping("insertVolunteerInfo")
-    public Result<Integer> insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
+    public Result<Integer> insertVolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
         //效验数据
         ValidatorUtils.validateEntity(epdcCompleteVolunteerInfoFormDTO, UpdateGroup.class, DefaultGroup.class);
         Result<Integer> result = volunteerInfoService.insertVolunteerInfo(epdcCompleteVolunteerInfoFormDTO);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -176,4 +176,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/18 14:12
      **/
     CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @Author yinzuomei
+     * @Description 根据用户id查询CachingUserInfoDTO
+     * @Date 2020/1/15 17:43
+     **/
+    CachingUserInfoDTO selectCachingUserInfoDTOByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -46,7 +46,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 姓名
      */
-	private String fullName;
+	private String realName;
 
     /**
      * 性别(0-女，1-男)
@@ -82,7 +82,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 网格ID
      */
-	private Long girdId;
+	private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java

@@ -38,7 +38,7 @@ public class VolunteerInfoExcel {
     private String userId;
 
     @Excel(name = "姓名")
-    private String fullName;
+    private String realName;
 
     @Excel(name = "性别(0-女，1-男)")
     private String sex;
@@ -62,7 +62,7 @@ public class VolunteerInfoExcel {
     private Integer points;
 
     @Excel(name = "网格ID")
-    private Long girdId;
+    private Long gridId;
 
     @Excel(name = "父所有部门ID")
     private String parentDeptIds;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -22,16 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
 import java.util.List;
@@ -289,5 +281,12 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result handleUserPoints(EpdcUserPointsFormDTO formDTO);
 
-
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -34,11 +33,8 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -46,22 +42,14 @@ import com.elink.esua.epdc.dao.*;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
-import com.elink.esua.epdc.exception.UserModuleErrorCode;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.PartyMembersService;
 import com.elink.esua.epdc.service.UserGridRelationService;
@@ -72,7 +60,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户信息表
@@ -111,14 +102,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private AdminFeignClient adminFeignClient;
 
-    private UserDetailRedis userDetailRedis;
-
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
         Long userId = SecurityUser.getUserId();
-        // 查询当前用户所具有的的数据权限
-        UserDetail userDetail = userDetailRedis.get(userId);
         IPage<UserDTO> iPage = this.getPage(params);
         List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
         return new PageData<>(userDtoList, iPage.getTotal());
@@ -366,7 +353,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userEntity.setFaceImg(null);
             userEntity.setId(userId);
             //用户已绑定手机号时不更新手机号
-            if(StringUtils.isNotBlank(existUser.getMobile())){
+            if (StringUtils.isNotBlank(existUser.getMobile())) {
                 userEntity.setMobile(existUser.getMobile());
             }
             this.updateById(userEntity);
@@ -1067,6 +1054,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result();
     }
 
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    @Override
+    public Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            throw new RenException("userId不能为空");
+        }
+        CachingUserInfoDTO cachingUserInfoDTO = baseDao.selectCachingUserInfoDTOByUserId(userId);
+        return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
+    }
+
     /**
      * 根据微信信息查询用户
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -247,7 +247,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setAddress(address);      // 居住地址
 
         // 获取部门信息
-        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGirdId()+"");
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+"");
         ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData();
 
         volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());    // 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -383,7 +383,7 @@
     </select>
 
     <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.dto.CachingUserInfoDTO">
-        <result property="id" column="ID"/>
+        <result property="userId" column="ID"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="faceImg" column="FACE_IMG"/>
@@ -399,6 +399,44 @@
     </resultMap>
     <!--  获取用户缓存信息  -->
     <select id="selectCachingUserInfoDTO" parameterType="map" resultMap="CachingUserInfoDTOMap">
+        SELECT
+        eu.ID,
+        eu.NICKNAME,
+        eu.MOBILE,
+        eu.FACE_IMG,
+        eu.SEX,
+        eu.REAL_NAME,
+        eu.STATE,
+        eu.REMARK,
+        (select r.GRID_ID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
+        )as gridId,
+        (
+        select r.GRID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
+        )as grid
+        FROM
+        epdc_user eu
+        WHERE
+        eu.DEL_FLAG = '0'
+        <if test="openId!=null and openId!=''">
+            and eu.WX_OPEN_ID=#{openId}
+        </if>
+        <if test="unionId!=null and unionId!=''">
+            and eu.WX_UNION_ID=#{unionId}
+        </if>
+    </select>
+
+    <!-- 根据用户id查询CachingUserInfoDTO   -->
+    <select id="selectCachingUserInfoDTOByUserId" parameterType="java.lang.String" resultMap="CachingUserInfoDTOMap">
         SELECT
             eu.ID,
             eu.NICKNAME,
@@ -411,6 +449,7 @@
         (select r.GRID_ID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as gridId,
@@ -418,6 +457,7 @@
             select r.GRID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as grid
@@ -425,11 +465,6 @@
             epdc_user eu
         WHERE
             eu.DEL_FLAG = '0'
-        <if test="openId!=null and openId!=''">
-            and eu.WX_OPEN_ID=#{openId}
-        </if>
-        <if test="unionId!=null and unionId!=''">
-            and eu.WX_UNION_ID=#{unionId}
-        </if>
+            and eu.id=#{userId}
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -6,7 +6,7 @@
     <resultMap type="com.elink.esua.epdc.entity.VolunteerInfoEntity" id="volunteerInfoMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
-        <result property="fullName" column="FULL_NAME"/>
+        <result property="realName" column="REAL_NAME"/>
         <result property="sex" column="SEX"/>
         <result property="birthday" column="BIRTHDAY"/>
         <result property="mobile" column="MOBILE"/>
@@ -14,7 +14,7 @@
         <result property="kindnessTime" column="KINDNESS_TIME"/>
         <result property="participationNum" column="PARTICIPATION_NUM"/>
         <result property="points" column="POINTS"/>
-        <result property="girdId" column="GIRD_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
         <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
         <result property="allDeptIds" column="ALL_DEPT_IDS"/>
@@ -41,7 +41,7 @@
         SELECT
                 v.ID id,
 				v.USER_ID userId,
-				v.FULL_NAME fullName,
+				v.REAL_NAME realName,
 				v.SEX sex,
 				v.BIRTHDAY birthday,
                 date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
@@ -55,8 +55,8 @@
         FROM
         epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID
         where 1=1
-        <if test="fullName !='' and fullName != null">
-            and v.FULL_NAME = #{fullName}
+        <if test="realName !='' and realName != null">
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             and v.MOBILE = #{mobile}
@@ -74,8 +74,8 @@
         FROM
         epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID
 		where 1=1
-        <if test="fullName !='' and fullName != null">
-            and v.FULL_NAME = #{fullName}
+        <if test="realName !='' and realName != null">
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             and v.MOBILE = #{mobile}
@@ -90,7 +90,7 @@
         SELECT
         v.ID id,
         v.USER_ID userId,
-        v.FULL_NAME fullName,
+        v.REAL_NAME realName,
         v.SEX sex,
         v.BIRTHDAY birthday,
         date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
@@ -109,10 +109,10 @@
     <select id="getVolunteerUserDefaultValue" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
         SELECT
             eu.ID userId,
-            eu.REAL_NAME fullName,
+            eu.REAL_NAME realName,
             eu.MOBILE mobile,
             eu.IDENTITY_NO identityNo,
-			eugr.GRID_ID girdId,
+			eugr.GRID_ID gridId,
             eu.PARENT_DEPT_IDS parentDeptIds,
             eu.PARENT_DEPT_NAMES parentDeptNames,
             eu.ALL_DEPT_IDS allDeptIds,
@@ -155,7 +155,7 @@
         SELECT
             m.id,
             m.USER_ID as userId,
-            m.FULL_NAME as fullName,
+            m.REAL_NAME as realName,
             m.SEX,
             DATE_FORMAT(m.BIRTHDAY,'%Y-%m-%d') as birthday,
             m.MOBILE,