Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

 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)
@@ -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);
    }
}