Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -1,8 +1,10 @@
package com.panzhihua.applets.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -37,16 +39,20 @@
    private PartyBuildingService partyBuildingService;
    @Resource
    private UserService userService;
    @Resource
    private CheckService checkService;

    @ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
        Long communityId = this.getCommunityId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo != null){
            partyBuildingComPbDynVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        Integer type = partyBuildingComPbDynVO.getType();
        if (ObjectUtils.isEmpty(type)) {
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setCommunityId(communityId);
        partyBuildingComPbDynVO.setStatus(2);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }
@@ -54,8 +60,12 @@
    @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long communityId = this.getCommunityId();
        partyBuildingActivityVO.setCommunityId(communityId);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo != null){
            partyBuildingActivityVO.setCommunityId(loginUserInfo.getCommunityId());
        }
//        Long communityId = this.getCommunityId();
//        partyBuildingActivityVO.setCommunityId(communityId);
        Integer status = partyBuildingActivityVO.getStatus();
        if (null!=status&&status.intValue()==4) {
            partyBuildingActivityVO.setIsAppliets(1);
@@ -71,15 +81,24 @@
            if (ObjectUtils.isEmpty(id)||0==id) {
                return R.fail("主键id不能为空");
            }
            Long userId = this.getUserId();
            ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
            comPbDynUserVO.setCreateAt(new Date());
            comPbDynUserVO.setDynId(id);
            comPbDynUserVO.setUserId(userId);
            R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
            Long userId = null;
            LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
            if(loginUserInfo != null){
                userId = loginUserInfo.getUserId();
            }

            PartyBuildingComPbDynVO partyBuildingComPbDynVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),PartyBuildingComPbDynVO.class);
            if (R.isOk(r1)) {
                partyBuildingComPbDynVO.setIsAdd(1);
            if(userId != null){
                ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
                comPbDynUserVO.setCreateAt(new Date());
                comPbDynUserVO.setDynId(id);
                comPbDynUserVO.setUserId(userId);
                R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
                if (R.isOk(r1)) {
                    partyBuildingComPbDynVO.setIsAdd(1);
                }else{
                    partyBuildingComPbDynVO.setIsAdd(0);
                }
            }else{
                partyBuildingComPbDynVO.setIsAdd(0);
            }
@@ -106,8 +125,12 @@
    @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        Long communityId =this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
//        Long communityId =this.getCommunityId();
//        partyCommitteeVO.setCommunityId(communityId);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo != null){
            partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
    }

@@ -156,6 +179,11 @@
    @ApiOperation(value = "创建党员活动")
    @PostMapping("activityinfo")
    public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
        //        微信内容审核
        String msg = comPbActivityDTO.getRichText();
        if (!checkService.checkMessage(msg)) {
            return R.fail("内容违规");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
@@ -186,10 +214,25 @@
    @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo != null){
            pageComPbServiceTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        }
//        pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }

    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
//        Long communityId = this.getCommunityId();
//        log.info("社区所有党组织社区id【{}】", communityId);
//        if(communityId != null){
//            comListPartyDTO.setCommunityId(communityId);
//        }
        return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
    }

    public static void main(String[] args) {
        Date date = new Date();
        String dateFormat = String.format("%tF %tT ", date, date);