diff --git a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java index 6bb2d401..de5763f4 100644 --- a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java +++ b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java @@ -165,7 +165,12 @@ public class UserBehaviorAop { behaviorDto.setBehavior(behaviorCode); behaviorDto.setReferenceId(referenceId); behaviorDto.setUserId(userId); - behaviorDto.setGridId(Long.parseLong(gridId)); + try { + behaviorDto.setGridId(Long.parseLong(gridId)); + }catch (Exception e){ + //如果网格ID获取失败 赋值为0L + behaviorDto.setGridId(0L); + } behaviorDto.setOperationTime(new Date()); log.info("动作发送信息：动作编码："+behaviorCode+" 用户ID："+userId+",业务ID："+referenceId+",网格ID："+gridId+",操作时间："+behaviorDto.getOperationTime()); //发送mq diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java index a2ba7ae8..469cfea3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java @@ -93,4 +93,9 @@ public class EpdcCompleteUserInfoDTO implements Serializable { * 自我介绍 */ private String introduce; + + /** + * 志愿者标签 + */ + private String volunteerTagId; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 517bb39d..25b5f75e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -415,4 +415,16 @@ public class ApiAppUserController { } return appUserService.getPointsByUserId(userDetail); } + + /** + * 志愿者标签 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/1/25 15:03 + */ + @GetMapping("volunteer/tags") + public Result> getVolunteerTags() { + return appUserService.listOfVolunteerTags(); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 039d76d8..c7b33fa9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -369,7 +369,7 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); - /* + /** * 志愿者列表 v2 * @param dto * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -380,7 +380,7 @@ public interface UserFeignClient { Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto); - /* + /** * 志愿者列表 * @param dto * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -594,4 +594,14 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/verificationqrcode/getuserinfobycode", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto); + /** + * 志愿者标签 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/1/25 15:03 + */ + @GetMapping("app-user/epdc-app/volunteerinfo/tags") + Result> getVolunteerTags(); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 0423fd86..e49cd132 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -288,4 +288,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByCode", formDto); } + + @Override + public Result> getVolunteerTags() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerTags", null); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 00361109..4e44115b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -261,7 +261,7 @@ public interface AppUserService { */ Result getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto); - /* + /** * 志愿者列表 v2 * @param tokenDto * @param dto @@ -272,7 +272,7 @@ public interface AppUserService { Result listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); - /* + /** * 志愿者列表 * @param tokenDto * @param dto @@ -362,7 +362,7 @@ public interface AppUserService { **/ Result> gridRanking(EpdcScreenGridRankingFormDTO dto); /** - * @Description 以人找房 + * @Description 以人找房 * @Author songyunpeng * @Date 2020/9/19 * @Param [dto] @@ -370,7 +370,7 @@ public interface AppUserService { **/ Result> selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); /** - * @Description 以房找人接口 + * @Description 以房找人接口 * @Author songyunpeng * @Date 2020/9/19 * @Param [dto] @@ -378,7 +378,7 @@ public interface AppUserService { **/ Result> selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto); /** - * @Description 以人找人接口 + * @Description 以人找人接口 * @Author songyunpeng * @Date 2020/9/19 * @Param [dto] @@ -386,7 +386,7 @@ public interface AppUserService { **/ Result> selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto); /** - * @Description + * @Description * @Author songyunpeng * @Date 2020/12/9 * @Param [userDetail] @@ -401,4 +401,13 @@ public interface AppUserService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getPointsByUserId(TokenDto userDetail); + + /** + * 志愿者标签 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/1/25 15:03 + */ + Result> listOfVolunteerTags(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 6a5ca76f..e44a9900 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -892,6 +892,7 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); + dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId()); // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) { dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); @@ -1648,4 +1649,9 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.getPointsByUserId(userDetail.getUserId()); } + @Override + public Result> listOfVolunteerTags() { + return userFeignClient.getVolunteerTags(); + } + } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java index 972c386e..b5a75faf 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java @@ -207,4 +207,9 @@ public class GroupBuyInfoDTO implements Serializable { */ List images; + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; + } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java index 0dec3d14..77910054 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java @@ -140,4 +140,10 @@ public class EpdcAddGroupBuyInfoFormDTO implements Serializable { private Boolean isConReview = false; -} \ No newline at end of file + /** + * 取货方式：1-包邮，2-自提 + */ + @NotNull(message = "取货方式不能为空") + private Integer pickupMethod; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java index 7e14aa79..31507c89 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java @@ -93,4 +93,9 @@ public class EpdcSelectGroupBuyDetailResultDTO implements Serializable { */ private List groupBuyPriceNumber; -} \ No newline at end of file + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java index 99eb0f01..18f74b3a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java @@ -65,6 +65,9 @@ public class EpdcSelectGroupBuyInfoListResultDTO implements Serializable { */ private String topFlag; + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; - -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java index 5c65483e..b5bbf2ba 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java @@ -65,4 +65,9 @@ public class EpdcSelectMyGroupBuyJoinInfoListResultDTO implements Serializable { */ private List groupBuyImg; -} \ No newline at end of file + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java index a2b2b59a..76cc31c4 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java @@ -65,5 +65,9 @@ public class EpdcSelectMyGroupBuyPublishInfoListResultDTO implements Serializabl */ private List groupBuyImg; + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java index 84d67481..0be337c5 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java @@ -53,4 +53,9 @@ public class EpdcSelectSdsInfoListResultDTO implements Serializable { * 出发时间 */ private Date departureTime; -} \ No newline at end of file + + /** + * 订单状态：0-进行中，1-已结束 + */ + private Integer status; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java index a10021f1..cf1b5a53 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -165,6 +166,9 @@ public class GroupBuyInfoEntity extends BaseEpdcEntity { */ private String cancelReason; - + /** + * 取货方式：1-包邮，2-自提 + */ + private Integer pickupMethod; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java index 85642796..2ebe3e27 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java @@ -198,6 +198,16 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl5){ + return new Result().error("人数价格信息最多填写五条"); + } + if(formDTO.getGroupBuyImg()!=null && formDTO.getGroupBuyImg().size()>3){ + return new Result().error("图片最多上传三张"); + } + //内容审核 - start Boolean isConReview = formDTO.getIsConReview(); List textList = new ArrayList<>(); @@ -223,15 +233,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl5){ - return new Result().error("人数价格信息最多填写五条"); - } - if(formDTO.getGroupBuyImg()!=null && formDTO.getGroupBuyImg().size()>3){ - return new Result().error("图片最多上传三张"); - } + //插入或更新后插入价格人数和图片表 insertPriceNumAndImgs(groupBuyInfoEntity.getId(),formDTO.getGroupBuyImg(),formDTO.getGroupBuyPriceNumber()); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java index 4e954c16..9c85d988 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java @@ -164,6 +164,9 @@ public class SdsInfoServiceImpl extends BaseServiceImpl().error("未查找到该顺道捎信息"); + } sdsInfoEntity.setBrowseNum(sdsInfoEntity.getBrowseNum()==null?1:sdsInfoEntity.getBrowseNum()+1); updateById(sdsInfoEntity); return new Result().ok(this.baseDao.getSdsDetail(id)); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml index 7b59e177..a8747743 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml @@ -133,14 +133,7 @@ - - - - - - - - + @@ -151,10 +144,10 @@ - - - - + + + + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml index 38155591..5422635c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml @@ -8,13 +8,14 @@ + - + SELECT + COUNT(t.userId) + FROM (SELECT + u.ID as userId, + u.NICKNAME as nickname, + u.REGISTER_TIME as registerTime, + u.FACE_IMG as faceImg + FROM + ( + select u.ID, + u.NICKNAME , + u.FACE_IMG, + if(u.DEPT_ID is null or u.DEPT_ID= '0',ug.GRID_ID,u.DEPT_ID) as GRID_ID, + u.REGISTER_TIME from epdc_user u + LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID)ug ON ug.USER_ID = u.ID AND ug.DEL_FLAG = '0' + where u.DEL_FLAG ='0' and u.PARTY_FLAG = '0' AND u.STATE = '1' and (u.IDENTITY_NO is null or u.IDENTITY_NO = '') + )u + WHERE + + u.GRID_ID = #{gridId} + + u.GRID_ID in + + #{item} + + + + GROUP BY + u.ID + ORDER BY u.REGISTER_TIME DESC) t diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 02fb796f..29569058 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -110,9 +110,11 @@ u.POINTS points, date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString, v.REGIST_TIME registTime, - v.VOLUNTEER_ORDER volunteerOrder + v.VOLUNTEER_ORDER volunteerOrder, + vt.TAG_ID FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID + left join epdc_volunteer_tag_relation vt on vt.VOLUNTEER_ID = v.ID and vt.DEL_FLAG = '0' where v.ID = #{id} @@ -202,8 +204,10 @@ @@ -225,12 +229,17 @@ v.VOLUNTEER_SIGNATURE volunteerSignature FROM epdc_volunteer_info v + LEFT JOIN epdc_volunteer_tag_relation vt ON vt.VOLUNTEER_ID = v.ID + AND vt.DEL_FLAG = '0' WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 AND v.VOLUNTEER_NICKNAME like concat('%', #{nickname}, '%') + + AND vt.TAG_ID = #{volunteerTagId} + ORDER BY v.VOLUNTEER_ORDER ASC ,CONVERT(v.VOLUNTEER_NICKNAME USING gbk) LIMIT #{pageIndex},#{pageSize} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml new file mode 100644 index 00000000..09ddc12b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagRelationDao.xml new file mode 100644 index 00000000..40ec1ae6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagRelationDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + UPDATE epdc_volunteer_tag_relation SET DEL_FLAG = '1' WHERE VOLUNTEER_ID = #{volunteerId} + + + diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index f00ae6bb..6fb239c0 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -115,6 +115,7 @@ + alimaven