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