From 6dab1ffef0f1a307aa5bbad22bd62b9e66b075af Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 17 Nov 2020 17:53:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E6=9C=8D=E5=8A=A1/us?= =?UTF-8?q?erresiinfo/getuserresiinfo=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/UserWechatDao.java | 2 + .../service/impl/UserBaseInfoServiceImpl.java | 12 +++--- .../main/resources/mapper/UserResiInfoDao.xml | 38 ++++++++----------- .../main/resources/mapper/UserWechatDao.xml | 20 ++++++++++ 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java index ef513d0ac7..d0f6b2def7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java @@ -75,4 +75,6 @@ public interface UserWechatDao extends BaseDao{ **/ List selectResiAndStrangerInfo(@Param("userIds") List userIds, @Param("realName")String realName); + //临时用下in + List selectNotInUserBaseInfoTemp(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 7143b7d171..326e74912d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -166,7 +166,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userWechatDTOList=userWechatDao.selectAll(); + List userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp(); List userIdList=new ArrayList<>(); for(UserWechatDTO userWechatDTO:userWechatDTOList){ userIdList.add(userWechatDTO.getUserId()); @@ -202,12 +202,12 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl SELECT - uri.id, - uc.USER_ID, + ubi.USER_ID, uri.REG_MOBILE, - uri.SURNAME, - uri.`NAME`, - uri.STREET, - uri.DISTRICT, + ubi.SURNAME, + ubi.`NAME`, + ubi.STREET, + ubi.DISTRICT, uri.RESI_VISIT_ID, - uri.BUILDING_ADDRESS, - CONCAT( - uri.STREET, - '-', - uri.SURNAME, - ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END ) + ubi.BUILDING_ADDRESS, + CONCAT( + ubi.STREET, + '-', + ubi.SURNAME, + ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) ) AS show_name, uw.HEAD_IMG_URL AS head_photo - FROM - user_customer uc - LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID ) - LEFT JOIN user_wechat uw ON (uc.USER_ID = uw.USER_ID) + user_base_info ubi + LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' ) + LEFT JOIN user_wechat uw ON ( uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' ) WHERE - uc.DEL_FLAG = '0' - AND uri.DEL_FLAG = '0' - AND uc.CUSTOMER_ID = #{customerId} - AND uc.USER_ID = #{userId} - AND uw.DEL_FLAG = '0' - AND uw.USER_ID = #{userId} + ubi.USER_ID =#{userId} + AND ubi.DEL_FLAG = '0' diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index 98a5c58075..5797e95eef 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -115,4 +115,24 @@ ORDER BY base.REAL_NAME , wechat.NICKNAME + + + From b7e0eff9937bbe4b8093801f7637e2d74bba321b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 18 Nov 2020 10:54:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9userResiInfoDao.selectUse?= =?UTF-8?q?rResiInfoDTO,=E5=A4=B4=E5=83=8F=E5=8F=96user=5Fbase=5Finfo?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserResiInfoDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 1203a01e12..23f27f4af8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -66,11 +66,10 @@ ubi.SURNAME, ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) ) AS show_name, - uw.HEAD_IMG_URL AS head_photo + ubi.HEAD_IMG_URL AS head_photo FROM user_base_info ubi LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' ) - LEFT JOIN user_wechat uw ON ( uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' ) WHERE ubi.USER_ID =#{userId} AND ubi.DEL_FLAG = '0' From cdd0b6f3637e8c7148d027337ed1392518792f1a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 10:56:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BE=BD=E7=AB=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/AddUserPartyBadgeFormDTO.java | 24 +++++++++++++++ .../com/epmet/controller/BadgeController.java | 30 ++++++++++++++----- .../src/main/java/com/epmet/dao/BadgeDao.java | 12 +++++++- .../java/com/epmet/service/BadgeService.java | 16 +++++++--- .../epmet/service/impl/BadgeServiceImpl.java | 17 ++++++++++- .../src/main/resources/mapper/BadgeDao.xml | 11 +++++++ 6 files changed, 96 insertions(+), 14 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java new file mode 100644 index 0000000000..912e2deb07 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/11/4 9:47 + */ +@NoArgsConstructor +@Data +public class AddUserPartyBadgeFormDTO implements Serializable { + + private static final long serialVersionUID = -6890701885153412660L; + /** + * 用户Id + */ + @NotBlank(message = "用户Id不能为空") + private String userId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 7a880540bd..5841af3353 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -167,15 +167,29 @@ public class BadgeController { } /** - * @param gridIdList - * @author yinzuomei - * @description 根据网格id, 查询每个网格有多少个徽章申请单 - * @Date 2020/11/12 15:51 - **/ - @PostMapping("querygridauditingbadgecount") - public Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList){ + * @param gridIdList + * @author yinzuomei + * @description 根据网格id, 查询每个网格有多少个徽章申请单 + * @Date 2020/11/12 15:51 + **/ + @PostMapping("querygridauditingbadgecount") + public Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList) { return new Result>().ok(badgeService.queryGridAuditingBadgeCount(gridIdList)); } - + /** + * desc: 党员认证通过后，添加党员 徽章记录 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author LiuJanJun + * @date 2020/11/18 10:28 上午 + */ + @PostMapping("adduserpartybadgerecord") + public Result audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + badgeService.addUserPartyBadgeRecord(tokenDto, formDTO); + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index 64356f9b56..1b4e35cef4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -166,5 +166,15 @@ public interface BadgeDao extends BaseDao { * @description 根据网格id, 查询每个网格有多少个徽章申请 * @Date 2020/11/12 15:59 **/ - List queryGridAuditingBadgeCount(@Param("gridIdList") List gridIdList); + List queryGridAuditingBadgeCount(@Param("gridIdList") List gridIdList); + + /** + * desc: 获取党员徽章Id + * + * @param customerId + * @return java.lang.String + * @author LiuJanJun + * @date 2020/11/18 10:43 上午 + */ + String getPartyBadgeId(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index b409d5709b..c62354b135 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.BadgeDTO; -import com.epmet.dto.form.AddBadgeFormDTO; -import com.epmet.dto.form.BadgeAuditFormDTO; -import com.epmet.dto.form.BadgeFormDTO; -import com.epmet.dto.form.EditBadgeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.BadgeEntity; @@ -187,4 +184,15 @@ public interface BadgeService extends BaseService { * @Date 2020/11/12 15:56 **/ List queryGridAuditingBadgeCount(List gridIdList); + + /** + * desc: 添加用户党员徽章记录 + * + * @param tokenDto + * @param formDTO + * @return java.lang.Boolean + * @author LiuJanJun + * @date 2020/11/18 10:32 上午 + */ + Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 0c52da11ba..a0b24549e3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -420,10 +420,25 @@ public class BadgeServiceImpl extends BaseServiceImpl imp **/ @Override public List queryGridAuditingBadgeCount(List gridIdList) { - if(CollectionUtils.isEmpty(gridIdList)){ + if (CollectionUtils.isEmpty(gridIdList)) { return new ArrayList<>(); } return baseDao.queryGridAuditingBadgeCount(gridIdList); } + /** + * desc: 添加用户党员徽章记录 + * + * @param tokenDto + * @param formDTO + * @return java.lang.Boolean + * @author LiuJanJun + * @date 2020/11/18 10:32 上午 + */ + @Override + public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) { + String badgeId = baseDao.getPartyBadgeId(tokenDto.getCustomerId()); + return null; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index b5a72206b6..faf3ef9c00 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -267,4 +267,15 @@ group by m.GRID_ID + + \ No newline at end of file From a2c9ccd62624e4904119fcbc47db7cf32bea5166 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 18 Nov 2020 11:30:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8F=90=E4=BE=9B=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=E5=8F=96?= =?UTF-8?q?user=5Fbase=5Finfo=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/EpmetUserOpenFeignClient.java | 4 +- .../com/epmet/controller/UserController.java | 2 +- .../main/resources/mapper/UserBaseInfoDao.xml | 40 +++++++++---------- .../main/resources/mapper/UserResiInfoDao.xml | 6 +-- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index f58c03e801..8655418acc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -232,7 +232,7 @@ public interface EpmetUserOpenFeignClient { * * @param tokenDTO * @return com.epmet.commons.tools.utils.Result - * @Author zhangyong + * @Author zhangyong 直接取的 user_base_info * @Date 14:10 2020-07-30 **/ @PostMapping("/epmetuser/userbaseinfo/selectuserbaseinfo") @@ -317,7 +317,7 @@ public interface EpmetUserOpenFeignClient { /** * @Author sun - * @Description 居民端-查询用户基础信息 + * @Description 居民端-查询用户基础信息 返回值只有userId 、openId **/ @PostMapping(value = "epmetuser/user/getuserbasicinfo") Result getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index a524f9f0c9..a5959e0825 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -146,7 +146,7 @@ public class UserController { /** * @Author sun - * @Description 居民端-查询用户基础信息 + * @Description 居民端-查询用户基础信息 返回值只有userId 、openId **/ @PostMapping("getuserbasicinfo") public Result getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml index cc86f83ccd..fcfbf02d64 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml @@ -28,28 +28,24 @@ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 23f27f4af8..c1f0edfce6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -124,13 +124,11 @@ uri.STREET, '-', uri.SURNAME, - ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END ) + ( CASE WHEN uri.GENDER = '1' THEN '先生' WHEN uri.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) ) AS show_name, - uw.HEAD_IMG_URL as head_photo + uri.HEAD_IMG_URL as head_photo FROM user_resi_info uri - left join user_wechat uw on(uri.user_id=uw.USER_ID) WHERE uri.DEL_FLAG = '0' - and uw.DEL_FLAG='0' AND uri.USER_ID in #{userId}