From 4c503822ca62b64f986adfe23eb8caf3da62dd47 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 13 Jan 2020 17:30:05 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8F=82=E6=95=B0=E5=85=9A?= =?UTF-8?q?=E5=91=98=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 8 ++++---- .../dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 a9353aafa..4fcc65c04 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 @@ -1107,21 +1107,21 @@ public class AppUserServiceImpl implements AppUserService { formDto.setSex(sex); // 性别 formDto.setBirthday(birthday); // 生日 formDto.setUserId(tokenDto.getUserId()); // 用户ID - //验证是否为志愿者 + // 验证是否为志愿者 Result volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId()); if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) { return new Result().error("志愿者认证失败"); } else if (volunteerCountResult.getData() == 0) { - //添加志愿者 + // 添加志愿者 Result insertCountResult = userFeignClient.insertVolunteerInfo(formDto); } - //调用用户完善个人信息-保存 + // 调用用户完善个人信息-保存 EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class); if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志 } else { - epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value());// 党员标志 + epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志 } Result result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java index 8097369a3..aa350cfbc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java @@ -34,8 +34,8 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable { @NotBlank(message = "手机号不能为空") private String mobile; - @NotBlank(message = "党员标识不能为空") - private String partyFlag; + //@NotBlank(message = "党员标识不能为空") + //private String partyFlag; /** * 身份证号码 From e6466925942247fd6835af9afcbac56e76ce827b Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 14 Jan 2020 13:29:02 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiActUserRelationController.java | 15 --------------- .../service/impl/ActUserClockLogServiceImpl.java | 3 +++ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index 34155f8d2..6c5e989f1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java @@ -111,21 +111,6 @@ public class ApiActUserRelationController { appActUserClockLogDTO.setUserId(tokenDto.getUserId()); return actUserRelationService.activityClock(appActUserClockLogDTO); - /* ArrayList imgList = new ArrayList(); - imgList.add("http://123232323223"); - imgList.add("http://12323232342423423"); - EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO = new EpdcAppActUserClockLogDTO(); - epdcAppActUserClockLogDTO.setActId("122"); - epdcAppActUserClockLogDTO.setClockAddress("打卡描述"); - epdcAppActUserClockLogDTO.setClockLatitude(new BigDecimal(123.122)); - epdcAppActUserClockLogDTO.setClockLongitude(new BigDecimal(123.122)); - epdcAppActUserClockLogDTO.setClockType("0"); - epdcAppActUserClockLogDTO.setImages(imgList); - epdcAppActUserClockLogDTO.setClockAddress("山东省青岛市市北区台东路"); - AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class); - appActUserClockLogDTO.setUserId("3f6448adbfbe736dde333f057a956012"); - return actUserRelationService.activityClock(appActUserClockLogDTO);*/ - } /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index 1f4fdba08..7dfc8504c 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java @@ -238,6 +238,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl Date: Tue, 14 Jan 2020 16:50:51 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcAppActUserCancelsignupDTO.java | 47 +++++++++++++++++++ .../ApiActUserRelationController.java | 11 +++-- .../feign/AppActUserRelationFeignClient.java | 7 +-- ...AppActUserRelationFeignClientFallback.java | 5 +- .../epdc/service/ActUserRelationService.java | 6 +-- .../impl/ActUserRelationServiceImpl.java | 5 +- .../activity/AppActUserCancelsignupDTO.java | 47 +++++++++++++++++++ .../AppActUserRelationController.java | 10 ++-- .../service/ActUserRelationService.java | 6 +-- .../impl/ActUserRelationServiceImpl.java | 5 +- 10 files changed, 126 insertions(+), 23 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java new file mode 100644 index 000000000..f64f33bae --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java @@ -0,0 +1,47 @@ +/** + * 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.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 取消报名参数 + * + * @author wanggongfeng + * @since v1.0.0 2019-12-17 + */ +@Data +public class EpdcAppActUserCancelsignupDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private String userId; + /** + * 活动ID + */ + private String actId; + /** + * 取消报名原因 + */ + private String failureReason; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index 6c5e989f1..f9117cacb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppActUserClockLogDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; @@ -12,6 +13,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO; import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO; import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO; import com.elink.esua.epdc.service.ActUserRelationService; @@ -84,15 +86,16 @@ public class ApiActUserRelationController { * 取消活动报名 * * @param tokenDto - * @param actId + * @param epdcAppActUserCancelsignupDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author wanggongfeng * @date 2019/12/13 14:41 */ @PostMapping("cancelsignup") - public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,String actId) { - return actUserRelationService.activityCancelSignUp(tokenDto.getUserId(),actId); - //return actUserRelationService.activityCancelSignUp("0598a2e20eb2466ef0ebb42e930f3801",actId); + public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { + epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId()); + AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class); + return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java index f492b7bbe..00f257f18 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppActUserClockLogDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; @@ -32,11 +33,11 @@ public interface AppActUserRelationFeignClient { /** * 取消活动报名 - * @param actId + * @param epdcAppActUserCancelsignupDTO * @return */ - @GetMapping("heart/appactuserrelation/activityCancelSignUp/{userId}/{actId}") - Result activityCancelSignUp(@PathVariable("userId") String userId,@PathVariable("actId") String actId); + @GetMapping("heart/appactuserrelation/activityCancelSignUp") + Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO); /** * 活动打卡 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java index 7161b8a2f..3954ce303 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppActUserClockLogDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; @@ -21,8 +22,8 @@ public class AppActUserRelationFeignClientFallback implements AppActUserRelation return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activitySignUp", actUserRelationDTO); } @Override - public Result activityCancelSignUp(String userId,String actId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", userId,actId); + public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", epdcAppActUserCancelsignupDTO); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java index 4b32ecd69..d85f6ba4a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppActUserClockLogDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; @@ -22,12 +23,11 @@ public interface ActUserRelationService { /** * 取消活动报名 - * @param actId - * @param userId + * @param epdcAppActUserCancelsignupDTO * @Author wanggongfeng * @return */ - Result activityCancelSignUp(String userId,String actId); + Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO); /** * 活动打卡 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java index f17240424..26d89d255 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppActUserClockLogDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; @@ -30,8 +31,8 @@ public class ActUserRelationServiceImpl implements ActUserRelationService { } @Override - public Result activityCancelSignUp(String userId,String actId) { - Result dataResult = actInfoFeignClient.activityCancelSignUp(userId,actId); + public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { + Result dataResult = actInfoFeignClient.activityCancelSignUp(epdcAppActUserCancelsignupDTO); return dataResult; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java new file mode 100644 index 000000000..15dc4938c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java @@ -0,0 +1,47 @@ +/** + * 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.activity; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 取消报名参数 + * + * @author wanggongfeng + * @since v1.0.0 2019-12-17 + */ +@Data +public class AppActUserCancelsignupDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private String userId; + /** + * 活动ID + */ + private String actId; + /** + * 取消报名原因 + */ + private String failureReason; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java index 8baf1a43f..3514e776d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.activity.controller; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; @@ -49,12 +50,13 @@ public class AppActUserRelationController { /** * 取消活动报名 - * @param actId + * @param appActUserCancelsignupDTO * @return */ - @GetMapping("activityCancelSignUp/{userId}/{actId}") - public Result activityCancelSignUp(@PathVariable("userId")String userId, @PathVariable("actId")String actId){ - return actUserRelationService.activityCancelSignUp(userId,actId); + @GetMapping("activityCancelSignUp") + public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){ + + return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO); } /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java index 0b56cf4fd..08eb3c127 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.activity.service; import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppClockListDTO; import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; @@ -119,12 +120,11 @@ public interface ActUserRelationService extends BaseService data = baseDao.selectOneActUserRelationInfo(userId,actId); + List data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(),appActUserCancelsignupDTO.getActId()); if(data != null && data.size() > 0){ ActUserRelationDTO actUserRelationDTO = data.get(0); actUserRelationDTO.setStatus("3");//取消报名 + actUserRelationDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());//取消报名原因 //已报名该活动，进行取消报名 //更新活动人员关系表 ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); From 0b0674717d891e2f3bbdcdf097bbef5f357f56a1 Mon Sep 17 00:00:00 2001 From: rongchao Date: Wed, 15 Jan 2020 09:08:59 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docker-compose/prod/nginx/docker-compose.yml | 14 ++++++++++++++ .../docker-compose/test/nginx/docker-compose.yml | 15 +++++++++++++++ .../epdc-module/epdc-api/epdc-api-server/pom.xml | 4 ++-- .../src/main/resources/application.yml | 1 + .../epdc-events/epdc-events-server/pom.xml | 4 ++-- .../epdc-group/epdc-group-server/pom.xml | 4 ++-- .../epdc-heart/epdc-heart-server/pom.xml | 4 ++-- .../epdc-module/epdc-job/epdc-job-server/pom.xml | 4 ++-- .../epdc-module/epdc-kpi/epdc-kpi-server/pom.xml | 4 ++-- .../epdc-news/epdc-news-server/pom.xml | 4 ++-- .../epdc-module/epdc-oss/epdc-oss-server/pom.xml | 4 ++-- .../epdc-user/epdc-user-server/pom.xml | 4 ++-- 12 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 esua-epdc/docker-compose/prod/nginx/docker-compose.yml create mode 100644 esua-epdc/docker-compose/test/nginx/docker-compose.yml diff --git a/esua-epdc/docker-compose/prod/nginx/docker-compose.yml b/esua-epdc/docker-compose/prod/nginx/docker-compose.yml new file mode 100644 index 000000000..d0b0da8af --- /dev/null +++ b/esua-epdc/docker-compose/prod/nginx/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + web: + image: nginx + ports: + - 443:443 + volumes: + - /mnt/nginx/html:/usr/share/nginx/html + - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro + - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro + - /mnt/nginx/logs:/var/log/nginx + restart: always + container_name: nginx_master + diff --git a/esua-epdc/docker-compose/test/nginx/docker-compose.yml b/esua-epdc/docker-compose/test/nginx/docker-compose.yml new file mode 100644 index 000000000..cfbdcd268 --- /dev/null +++ b/esua-epdc/docker-compose/test/nginx/docker-compose.yml @@ -0,0 +1,15 @@ +version: '3.7' +services: + web: + image: nginx + ports: + - 443:443 + volumes: + - /opt/docker/nginx/html:/usr/share/nginx/html + - /opt/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro + - /opt/docker/nginx/conf.d:/etc/nginx/conf.d:ro + - /opt/docker/nginx/logs:/var/log/nginx + - /opt/docker/nginx/cert:/etc/nginx/cert:ro + restart: always + container_name: nginx_master + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 80da348b7..64fbdd9cf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -178,7 +178,7 @@ 9040 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_API + EPDC_CONFIG_GROUP true @@ -219,7 +219,7 @@ 9040 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_API + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml index 4892ef7b8..1179d7adb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml @@ -18,3 +18,4 @@ nacos: spring: application: name: epdc-api-server + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index b6e26ed44..52e58d1e3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -178,7 +178,7 @@ 9066 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_EVENTS + EPDC_CONFIG_GROUP true dev @@ -218,7 +218,7 @@ 9066 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_EVENTS + EPDC_CONFIG_GROUP true test diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index 830ffc8fa..86250d311 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -147,7 +147,7 @@ 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_GROUP + EPDC_CONFIG_GROUP true @@ -178,7 +178,7 @@ 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_GROUP + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 49f322adf..48c235cfc 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -152,7 +152,7 @@ 9060 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_HEART + EPDC_CONFIG_GROUP true @@ -184,7 +184,7 @@ 9060 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_HEART + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 8d8c89884..f8248b993 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -168,7 +168,7 @@ 9061 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_JOB + EPDC_CONFIG_GROUP true @@ -198,7 +198,7 @@ 9061 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_JOB + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 0322486d3..647a36cca 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -138,7 +138,7 @@ 9987 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_KPI + EPDC_CONFIG_GROUP true @@ -168,7 +168,7 @@ 9987 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_KPI + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index e59ceab29..96053666d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -133,7 +133,7 @@ 9064 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_NEWS + EPDC_CONFIG_GROUP true @@ -163,7 +163,7 @@ 9064 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_NEWS + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index 0aaefdec5..e02019248 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -181,7 +181,7 @@ 9065 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_OSS + EPDC_CONFIG_GROUP true @@ -211,7 +211,7 @@ 9065 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_OSS + EPDC_CONFIG_GROUP true diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index e459399f2..b52b1d0be 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -144,7 +144,7 @@ 9068 47.104.224.45:8848 513d6635-3cfe-401f-b8b6-a04417288f47 - EPDC_USER + EPDC_CONFIG_GROUP true @@ -174,7 +174,7 @@ 9068 47.104.224.45:8848 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - EPDC_USER + EPDC_CONFIG_GROUP true From 2159caa3b48428575501a8a1c188396684fb7270 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 10:56:43 +0800 Subject: [PATCH 05/11] =?UTF-8?q?get=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiActUserRelationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index f9117cacb..a8acaa43b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/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 getClockList(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) { + public Result getClockList(@LoginUser TokenDto tokenDto, String actId) { Result result = actUserRelationService.getClockList(actId); EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class); Result result1 = new Result(); @@ -144,7 +144,7 @@ public class ApiActUserRelationController { * @date 2019/12/13 14:41 */ @GetMapping("clockAddressDetail") - public Result clockAddressDetail(@PathVariable("actId") String actId) { + public Result clockAddressDetail(String actId) { return actUserRelationService.clockAddressDetail(actId); } From 4616c3cd100826b3cfbc8efba535600f5116ac89 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 14:40:18 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java index f913f911b..b4d4c792e 100644 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java +++ b/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 */ From d7fe4f359a929b500f6f691ee1cde1d87e7223a8 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 15 Jan 2020 15:09:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java | 4 ++-- .../esua/epdc/service/impl/KpiResultGridServiceImpl.java | 4 ++-- .../main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java | 2 +- .../esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java | 2 +- .../java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java | 2 +- .../java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java | 2 +- .../esua/epdc/service/impl/VolunteerInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/VolunteerInfoDao.xml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java index 06a130875..342d357c8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java index 374220910..57b95a2ea 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java +++ b/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 dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGirdId()+""); + Result dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+""); ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData(); volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); // 父所有部门ID 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 cc63523f3..d04a99f38 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 @@ -14,7 +14,7 @@ - + @@ -112,7 +112,7 @@ eu.REAL_NAME fullName, 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, From 9f2ba5c47921e9f63988cc874d8582a3639d5edc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 16:44:46 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/EpdcAppVolunteerInfoController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java index 7e42ed6d5..99306f05f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java +++ b/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 insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) { + public Result insertVolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) { //效验数据 ValidatorUtils.validateEntity(epdcCompleteVolunteerInfoFormDTO, UpdateGroup.class, DefaultGroup.class); Result result = volunteerInfoService.insertVolunteerInfo(epdcCompleteVolunteerInfoFormDTO); From 26dba563f0ad10e2daca608a5159152b3b9dcffa Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 16:59:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?full=5Fname=E5=AD=97=E6=AE=B5=E6=94=B9?= =?UTF-8?q?=E4=B8=BAreal=5Fname=20by=20=E5=BC=A0=E5=8B=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/VolunteerInfoDTO.java | 5 +++-- .../result/EpdcAdjustVolunteerPointsDTO.java | 2 +- .../result/EpdcVolunteerInfoResultDTO.java | 2 +- .../esua/epdc/entity/VolunteerInfoEntity.java | 2 +- .../esua/epdc/excel/VolunteerInfoExcel.java | 2 +- .../main/resources/mapper/VolunteerInfoDao.xml | 18 +++++++++--------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java index 359ff495a..26f803b4b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java +++ b/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-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java index 1696f9f45..27933901e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java +++ b/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-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java index c98ad069d..9b5bc2b5f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java +++ b/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-男) 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 index cb4584672..cf4e9c810 100644 --- 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 @@ -46,7 +46,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女，1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java index b9822bcdd..403771953 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java +++ b/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; 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 d04a99f38..725554e52 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 @@ -6,7 +6,7 @@ - + @@ -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 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} 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 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} 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,7 +109,7 @@ + + +