活动

huanghongfa

2021-01-20 23e9f7463069b31b5455c0d85deec5245bd18359

活动

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,6 +24,23 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -403,7 +420,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="32090000" />
      <workItem from="1611019208339" duration="37662000" />
    </task>
    <servers />
  </component>
@@ -443,10 +460,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611110375184">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611121032525">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611110375184" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611121032525" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -455,54 +472,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="244" key="GridCell.Tab.0.bottom" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.0.center" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.0.left" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.0.right" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.1.bottom" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.1.center" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.1.left" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.1.right" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.2.bottom" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.2.center" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.2.left" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="244" key="GridCell.Tab.2.right" timestamp="1611110873391">
    <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611125142716">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="244" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611110873391" />
    <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611125142716" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -523,10 +540,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611044794794" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611112062666">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611123292963">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611112062666" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611123292963" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -535,10 +552,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="131" y="82" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1610606891357" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1609148997036">
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1611121937197">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1609148997036" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1611121937197" />
    <state x="425" y="187" key="run.anything.popup" timestamp="1608280452280">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -549,15 +566,6 @@
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1610961524558" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java</url>
          <line>137</line>
          <option name="timeStamp" value="13" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />

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

@@ -65,6 +65,10 @@
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setIsApplets(1);
        Integer status = comActActivityVO.getStatus();
        if (status.intValue()==4) {
            comActActivityVO.setIsIng(1);
        }
        return communityService.pageActivity(comActActivityVO);
    }


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

@@ -53,29 +53,45 @@
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long communityId = this.getCommunityId();
        partyBuildingActivityVO.setCommunityId(communityId);
        Integer status = partyBuildingActivityVO.getStatus();
        if (null!=status&&status.intValue()==4) {
            partyBuildingActivityVO.setIsAppliets(1);
        }
        return partyBuildingService.pageActivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        return partyBuildingService.infoYnamic(id);
        R r = partyBuildingService.infoYnamic(id);
        if (R.isOk(r)) {
            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);
             partyBuildingService.addDynUser(comPbDynUserVO);
        }
        return r;
    }

    @ApiOperation(value = "增加阅读记录")
    @PostMapping("adddynuser")
    public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Long id = partyBuildingComPbDynVO.getId();
        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);
        return partyBuildingService.addDynUser(comPbDynUserVO);
    }
//    @ApiOperation(value = "增加阅读记录")
//    @PostMapping("adddynuser")
//    public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
//        Long id = partyBuildingComPbDynVO.getId();
//        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);
//        return partyBuildingService.addDynUser(comPbDynUserVO);
//    }

    @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
    @PostMapping("pagepartycommittee")

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

@@ -171,13 +171,15 @@
    @ApiOperation(value = "我的活动",response =ComActActivityVO.class )
    @GetMapping("listactivity")
    public R listActivity() {
        Long userId = this.getUserId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
        R r=communityService.listActivity(userId);
        if (R.isOk(r)) {
            comActActivityVOS =(List<ComActActivityVO>) r.getData();
        }
        R r1=partyBuildingService.listActivity(userId);
        R r1=partyBuildingService.listActivity(userId,communityId);
        if (R.isOk(r1)) {
            List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
            comActActivityVOS.addAll(data);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -126,12 +126,15 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "是否是小程序访问 1 是 0 不是",hidden = true)
    @ApiModelProperty(value = "是否是小程序访问 1 是 ",hidden = true)
    private Integer isApplets;

    @ApiModelProperty("活动积分")
    private Integer integral;

    @ApiModelProperty(value = "是不是请求进行中 1 是",hidden = true)
    private Integer isIng;



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -92,6 +92,9 @@
    @ApiModelProperty(value = "活动报名人员id集合",hidden = true)
    private List<Long> userIds;

    @ApiModelProperty("是否是小程序请求")
    private Integer isAppliets;





 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -232,10 +232,11 @@
    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id  同一用户在不同社区都是党员
     * @return  党建活动列表
     */
    @PostMapping("/partybuildIng/listactivity")
    R listActivity(@RequestParam("userId") Long userId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId")Long communityId);

    /**
     * 党员活动人员参入列表

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java

@@ -164,6 +164,7 @@
    @PutMapping("menu")
    @OperLog(operModul = "角色管理",operType = 2)
    public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){
        menuRoleVO.setCommunityId(this.getCommunityId());
        return userService.putMenuRole(menuRoleVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -56,9 +56,12 @@
            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>" +
            " and a.activity_name like concat(#{comActActivityVO.activityName},'%')  \n" +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0'>" +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng==null'>" +
            "AND a.`status` = #{comActActivityVO.status} \n" +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng!=null and comActActivityVO.isIng==1'>" +
            "AND a.`status` in (3,4) \n" +
            " </if> " +
            "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>" +
            "AND a.`status` != 1 \n" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -98,6 +98,15 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
        List<ComActActivityVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActActivityVO1 -> {
                Integer status = comActActivityVO1.getStatus();
                if (status.intValue()==3) {
                    comActActivityVO1.setStatus(4);
                }
            });
        }
        return R.ok(iPage);
    }

@@ -250,6 +259,10 @@
            }else{
                comActActivityVO.setType(2);
            }
            Integer status = comActActivityVO.getStatus();
            if (status.intValue()==3) {
                comActActivityVO.setStatus(4);
            }
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -329,11 +329,12 @@
    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id
     * @return  党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId){
        return  comBpActivityService.listActivity(userId);
    public R listActivity(@RequestParam("userId") Long userId,@RequestParam("communityId")Long communityId){
        return  comBpActivityService.listActivity(userId,communityId);
        
    }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java

@@ -81,9 +81,12 @@
            "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>" +
            "and name = #{partyBuildingActivityVO.name} \n" +
            " </if> " +
            "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0'>" +
            "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0' and partyBuildingActivityVO.isAppliets ==null " +
            "AND `status` = #{partyBuildingActivityVO.status} \n" +
            " </if> " +
            "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>" +
            "AND `status` in (3,4) \n" +
            " </if> " +
            "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>" +
            "AND release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n" +
            "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java

@@ -64,4 +64,6 @@
            "WHERE\n" +
            "m.activity_id =#{id}")
    List<Long> selectAllPartyBuildingActivityMembers(Long id);
    @Select("select m.id from sys_user u join com_pb_member m on u.id_card=m.id_card and u.community_id=#{communityId} and u.user_id=#{userId} ")
    Long selectMemberIdByUserId(@Param("userId") Long userId, @Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java

@@ -4,7 +4,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.service_dangjian.dao.ComBpActivityDAO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -71,9 +70,10 @@
    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id
     * @return  党建活动列表
     */
    R listActivity(Long userId);
    R listActivity(Long userId, Long communityId);
    /**
     * 党员活动人员参入列表
     * @param id 活动id

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -221,8 +221,12 @@
            DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
            records.forEach(partyBuildingActivityVO1 -> {
                Date activityTimeBegin = partyBuildingActivityVO1.getActivityTimeBegin();
                Integer status = partyBuildingActivityVO1.getStatus();
                if (!ObjectUtils.isEmpty(activityTimeBegin)) {
                    partyBuildingActivityVO1.setActivityTimeBeginFormat(formatTo.format(activityTimeBegin));
                }
                if(status.intValue()==3){
                    partyBuildingActivityVO1.setStatus(4);
                }
            });
        }
@@ -252,22 +256,32 @@
     * 用户的所有党建活动
     *
     * @param userId 用户id
     * @param communityId 社区id
     * @return 党建活动列表
     */
    @Override
    public R listActivity(Long userId) {
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, userId));
    public R listActivity(Long userId, Long communityId) {
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
        if (ObjectUtils.isEmpty(memberId)) {
            return R.fail();
        }
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, memberId));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            return R.fail();
        }
        List<Long> collect = comPbActivityMemberDOS.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
        List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();

        comPbActivityDOS.forEach(comPbActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            Integer status = comPbActivityDO.getStatus();
            if (status.intValue()==3) {
                status=4;
            }
            comActActivityVO.setType(3);
            comActActivityVO.setId(comPbActivityDO.getId());
            comActActivityVO.setStatus(comPbActivityDO.getStatus());
            comActActivityVO.setStatus(status);
            comActActivityVO.setActivityName(comPbActivityDO.getName());
            comActActivityVO.setCover(comPbActivityDO.getCover());
            comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
@@ -292,6 +306,8 @@
            comPbMemberDOS.forEach(comPbMemberDO -> {
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
                BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO);
                ComPbActivityMemberDO comPbActivityMemberDO1 = comPbActivityMemberDOS.stream().filter(comPbActivityMemberDO -> comPbActivityMemberDO.getMemberId().equals(comPbMemberDO.getId())).collect(Collectors.toList()).get(0);
                partyBuildingMemberVO.setJoinTime(comPbActivityMemberDO1.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }