From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index f5a68ec..db59fdf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -259,17 +259,7 @@
@ApiOperation(value = "编辑党员")
@PutMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- if (partyBuildingMemberVO.getIsPb() != null) {
- Long id = partyBuildingMemberVO.getId();
- if (partyBuildingMemberVO.getIsPb() == 1) {
- if (null == id || 0 == id) {
- return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
- }
return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
- }
- return partyBuildingService.deleteprepartybuildingmember(id);
- }
- return R.fail();
}
@ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
@@ -285,8 +275,8 @@
@ApiOperation(value = "新增党员")
@PostMapping("addpartybuildingmember")
public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- Long communityId = this.getCommunityId();
- partyBuildingMemberVO.setCommunityId(communityId);
+ Long userId = this.getUserId();
+ partyBuildingMemberVO.setUserId(userId);
R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
if (R.isOk(r)) {
R r1 = userService.updateUserPartyStatus(this.getUserId());
@@ -298,7 +288,7 @@
@ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
@PostMapping("/page/member")
public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- partyBuildingMemberVO.setCommunityId(this.getCommunityId());
+ //partyBuildingMemberVO.setCommunityId(this.getCommunityId());
return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
}
@@ -308,4 +298,19 @@
return communityService.getCommunityLists();
}
+ @ApiOperation(value = "查询当前用户党员信息")
+ @GetMapping("/getPartyMember")
+ public R getPartyMember(@RequestParam("type")Integer type){
+ return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
+ }
+ @ApiOperation(value = "查询报道单位详情")
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailById(@RequestParam("phone") String phone) {
+ return partyBuildingService.detailByPhone(phone);
+ }
+ @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return partyBuildingService.memberDetail(id);
+ }
}
--
Gitblit v1.7.1