From 57d98932c3820b60743699c890ff5cf45f3ca8a2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 18:00:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 22e000d..a511412 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
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +48,8 @@
@Resource
private PartyBuildingService partyBuildingService;
@Resource
+ private PartyBuildingWestService partyBuildingWestService;
+ @Resource
private UserService userService;
@Resource
private CheckService checkService;
@@ -73,7 +76,7 @@
return R.fail("类型不能为空");
}
partyBuildingComPbDynVO.setStatus(2);
- return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
+ return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
}
@ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@@ -110,7 +113,7 @@
@ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
@GetMapping("infodynamic")
public R infoYnamic(@RequestParam("id") Long id) {
- R r = partyBuildingService.infoYnamic(id);
+ R r = partyBuildingWestService.infoYnamic(id);
if (R.isOk(r)) {
if (ObjectUtils.isEmpty(id) || 0 == id) {
return R.fail("主键id不能为空");
@@ -128,7 +131,7 @@
comPbDynUserVO.setCreateAt(new Date());
comPbDynUserVO.setDynId(id);
comPbDynUserVO.setUserId(userId);
- R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
+ R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
if (R.isOk(r1)) {
partyBuildingComPbDynVO.setIsAdd(1);
} else {
@@ -275,10 +278,8 @@
@ApiOperation(value = "新增党员")
@PostMapping("addpartybuildingmember")
public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- Long communityId = this.getCommunityId();
Long userId = this.getUserId();
partyBuildingMemberVO.setUserId(userId);
- partyBuildingMemberVO.setCommunityId(communityId);
R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
if (R.isOk(r)) {
R r1 = userService.updateUserPartyStatus(this.getUserId());
@@ -290,7 +291,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);
}
@@ -303,6 +304,16 @@
@ApiOperation(value = "查询当前用户党员信息")
@GetMapping("/getPartyMember")
public R getPartyMember(@RequestParam("type")Integer type){
- return partyBuildingService.getPartyMember(this.getUserId(),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