lidongdong
2024-06-14 6e21e9ed8272fdf1679fb122421cbaba68db1860
花城 新增社区工作人员详情接口
9个文件已修改
91 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -498,6 +498,21 @@
        return R.ok();
    }
    /**
     * 获取动作人员详情
     * @param communityId
     * @param phone
     * @return
     */
    @ApiOperation(value = "社区工做人员详情")
    @PostMapping("/getComPbServiceTeamData")
    public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
                                     @RequestParam("phone") String phone)
    {
        return partyBuildingService.getComPbServiceTeamData(communityId,phone);
    }
    @ApiOperation(value = "获取用户电子档案", response = UserArchivesVO.class)
    @PostMapping("getUserArchives")
    public R getUserArchives() {
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -461,6 +461,12 @@
    @PostMapping("/partybuildIng/pageserviceteam")
    R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
    @PostMapping("/partybuildIng/getComPbServiceTeamData")
    public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
                                     @RequestParam("phone") String phone);
    /**
     * 创建党员活动 小程序创建党员活动
     *
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -687,6 +687,21 @@
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }
    /**
     * 获取动作人员详情
     * @param communityId
     * @param phone
     * @return
     */
    @ApiOperation(value = "社区工做人员详情")
    @PostMapping("/getComPbServiceTeamData")
    public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
                                     @RequestParam("phone") String phone)
    {
        return partyBuildingService.getComPbServiceTeamData(communityId,phone);
    }
    @ApiOperation(value = "分页查询物业党员先锋", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteamProperty")
    public R pageServiceTeamProperty(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -603,6 +603,13 @@
        return comPbServiceTeamService.PageComPbServiceTeamDTO(pageComPbServiceTeamDTO);
    }
    @PostMapping("getComPbServiceTeamData")
    public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
                                     @RequestParam("phone") String phone)
    {
        return comPbServiceTeamService.getComPbServiceTeamData(communityId,phone);
    }
    /**
     * 删除服务团队人员
     *
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
@@ -44,4 +44,8 @@
    List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);
    IPage<ComPbServiceTeamVO> pageServiceTeamProperty(Page page, @Param("pageComPbServiceTeamDTO")PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
    ComPbServiceTeamDO getComPbServiceTeamData(@Param("communityId") String communityId,
                                               @Param("phone") String phone);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java
@@ -3,6 +3,8 @@
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO;
import org.apache.ibatis.annotations.Param;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -55,4 +57,9 @@
     * @return 查询结果
     */
    R getTotlePerson(String param, Long communityId);
    R getComPbServiceTeamData(String communityId,String phone);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -119,7 +119,7 @@
        page.setCurrent(pageNum);
        IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
        if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
        iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
            iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
        }
        return R.ok(iPage);
    }
@@ -159,4 +159,9 @@
        List<ComPbServiceTeamVO> comPbServiceTeamVOS = comPbServiceTeamDAO.getTotlePerson(param, communityId);
        return R.ok(comPbServiceTeamVOS);
    }
    @Override
    public R getComPbServiceTeamData(String communityId, String phone) {
        return R.ok(comPbServiceTeamDAO.getComPbServiceTeamData(communityId,phone));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml
@@ -39,6 +39,26 @@
            AND t1.job LIKE concat( #{pageComPbServiceTeamDTO.job}, '%')
        </if>
    </select>
    <select id="getComPbServiceTeamData" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComPbServiceTeamVO">
        SELECT t1.*, t2.`name` AS communityName
        FROM com_pb_service_team t1
        LEFT JOIN com_act t2 ON t1.community_id = t2.community_id
        <where>
            1=1
            <if test=" communityId != null and communityId != '' ">
                AND t1.community_id = #{communityId}
            </if>
            <if test="phone != null and phone != '' ">
                AND t1.phone = #{phone}
            </if>
        </where>
    </select>
    <select id="pageServiceTeamProperty"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
        select * from com_pb_service_team where property_id=#{pageComPbServiceTeamDTO.propertyId}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -476,14 +476,16 @@
            if(count>0){
                loginUserInfoVO.setIsCheckUnitAdmin(1);
            }
            else {
                loginUserInfoVO.setIsCheckUnitAdmin(0);
            }
            Long checkUnitId=userDao.selectCheckUnitId(phone);
            if(checkUnitId!=null){
                loginUserInfoVO.setCheckUnitId(checkUnitId);
            }
            else {
                loginUserInfoVO.setIsCheckUnitAdmin(0);
            }
//            else {
//                loginUserInfoVO.setIsCheckUnitAdmin(0);
//            }
            //是否网格员
            int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
            if (easyPhotoMember > 0) {