bug修改

puhanshu

2022-08-05 dfd80c77abd68b95a8fc1e832d36d6f756083e04

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -6,10 +6,12 @@

import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
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 +49,8 @@
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private UserService userService;
    @Resource
    private CheckService checkService;
@@ -73,7 +77,7 @@
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setStatus(2);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }

    @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@@ -110,7 +114,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 +132,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 {
@@ -292,6 +296,13 @@
        return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
    }

    @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/registerMember")
    public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {
        pageMemberForInviteDTO.setAppid(this.getAppId());
        return partyBuildingService.pageRegisterMember(pageMemberForInviteDTO);
    }

    @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
    @GetMapping("/community/list")
    public R getCommunityLists() {
@@ -301,7 +312,7 @@
    @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")