Merge branch 'huacheng_shuangzheng' into huacheng_test

101captain

2022-06-17 1f615d5c6ac7b116c0bb3f075331197f284b998c

Merge branch 'huacheng_shuangzheng' into huacheng_test

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

@@ -119,7 +119,6 @@
            comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        comActActivityVO.setIsApplets(1);
        comActActivityVO.setAreaCode(this.getAreaCode());
        Integer status = comActActivityVO.getStatus();
        if (null != status && status.intValue() == 4) {
            comActActivityVO.setIsIng(1);
@@ -356,4 +355,14 @@
        }
        return communityService.listActivitySign(activitySignVO);
    }
    @ApiOperation(value = "新增服务活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
        comActActivityVO.setStatus(2);
        comActActivityVO.setHasPrize(0);
        return communityService.addActivity(comActActivityVO);
    }
}

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

@@ -40,6 +40,7 @@
    public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
        }
        return communityService.pageNeighborByApp(neighborCircleAppDTO);

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

@@ -288,7 +288,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,4 +303,14 @@
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getUserId(),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);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java

@@ -85,5 +85,34 @@
    private String logo;

    private Integer partyNum;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "帮扶社区id")
    private Long helpCommunityId;
    @ApiModelProperty(value = "帮扶社区名字")
    private String helpCommunityName;
    @ApiModelProperty(value = "帮扶社区手机号")
    private String helpCommunityContacts;
    @ApiModelProperty(value = "帮扶社区联系人")
    private String helpCommunityContactsName;
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    @ApiModelProperty(value = "小区名字")
    private String villageName;

    private String natureName;

    private Integer natureId;

    private String address;
    @ApiModelProperty(value = "管理员名称")
    private String adminName;
    @ApiModelProperty(value = "管理员电话")
    private String adminPhone;
    @ApiModelProperty(value = "其他")
    private String otherMark;
    @ApiModelProperty(value = "单位所属")
    private String belongTo;
}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java

@@ -80,5 +80,34 @@

    @ApiModelProperty(value = "党组织logo")
    private String logo;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "帮扶社区id")
    private Long helpCommunityId;
    @ApiModelProperty(value = "帮扶社区名字")
    private String helpCommunityName;
    @ApiModelProperty(value = "帮扶社区手机号")
    private String helpCommunityContacts;
    @ApiModelProperty(value = "帮扶社区联系人")
    private String helpCommunityContactsName;
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    @ApiModelProperty(value = "小区名字")
    private String villageName;

    private String natureName;

    private Integer natureId;

    private String address;
    @ApiModelProperty(value = "管理员名称")
    private String adminName;
    @ApiModelProperty(value = "管理员电话")
    private String adminPhone;
    @ApiModelProperty(value = "其他")
    private String otherMark;
    @ApiModelProperty(value = "单位所属")
    private String belongTo;
}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java

@@ -84,5 +84,8 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "技能特长")
    private String specialtyName;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java

@@ -40,6 +40,9 @@
    @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
    private Integer belongType;

    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -43,6 +43,10 @@
    @ApiModelProperty(value = "接单人id", example = "1")
    private Long solveId;

    @ApiModelProperty(value = "查看求助列表 默认传1")
    private Integer isHelp;

    private String phone;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -219,6 +219,9 @@
    @ApiModelProperty("区域划分")
    private String areaName;

    @ApiModelProperty("是否单位管理员 1是 0否")
    private Integer isCheckUnitAdmin;

    public String retrieveRelationName() {
        return this.type == 3 ? relationName : name;
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java

@@ -98,4 +98,32 @@

    @ApiModelProperty(value = "地址")
    private String address;


    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "帮扶社区id")
    private Long helpCommunityId;
    @ApiModelProperty(value = "帮扶社区名字")
    private String helpCommunityName;
    @ApiModelProperty(value = "帮扶社区手机号")
    private String helpCommunityContacts;
    @ApiModelProperty(value = "帮扶社区联系人")
    private String helpCommunityContactsName;
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    @ApiModelProperty(value = "小区名字")
    private String villageName;

    private String natureName;

    private Integer natureId;
    @ApiModelProperty(value = "管理员名称")
    private String adminName;
    @ApiModelProperty(value = "管理员电话")
    private String adminPhone;
    @ApiModelProperty(value = "其他")
    private String otherMark;
    @ApiModelProperty(value = "单位所属")
    private String belongTo;
}

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

@@ -180,7 +180,7 @@
    @ApiModelProperty("活动参加志愿者人员集合")
    private List<ActivitySignVO> activityVolunteerList;

    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动 5服务活动")
    private Integer type;

    @ApiModelProperty("活动创建时间")
@@ -228,7 +228,6 @@
    private Integer canCancel;

    @ApiModelProperty("取消活动扣除积分数目")
    @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
    private Integer cancelDeduct;

    @ApiModelProperty("用户已参与次数")
@@ -241,7 +240,6 @@
    private Integer codeType;

    @ApiModelProperty("活动类型")
    @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
    private String activityType;

    private String areaCode;
@@ -289,4 +287,8 @@
    private Integer isArticle;

    private String jumpArticleUrl;
    @ApiModelProperty("关联服务id")
    private Long relationId;
    @ApiModelProperty("关联手机")
    private String phone;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java

@@ -78,4 +78,7 @@
    private Integer belongType;
    @ApiModelProperty("处理状态 0 否 1是")
    private Integer solveStatus;

    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -113,8 +113,10 @@

    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("处理状态 0 否 1是")
    @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
    private Integer solveStatus;
    @ApiModelProperty("接单类型 1单位 2个人")
    private Integer orderType;
    @ApiModelProperty("接单状态 0 否 1是")
    private Integer orderStatus;
    @ApiModelProperty("接单人id")
@@ -123,5 +125,23 @@
    private String solveContent;
    @ApiModelProperty("反馈图片")
    private String solveUrl;

    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
    @ApiModelProperty("实际服务时长")
    private String realServiceTime;
    @ApiModelProperty("评价内容")
    private String comment;
    @ApiModelProperty("评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date commentTime;
    @ApiModelProperty("说明")
    private String instruction;
    @ApiModelProperty("求助党员类型 1全部 2指定")
    private Integer helpMemberType;
    @ApiModelProperty("求助指定党员数组")
    private String helpMemberContent;
    @ApiModelProperty("求助党组织类型 1全部 2指定")
    private Integer helpOrgType;
    @ApiModelProperty("求助指定党组织数组")
    private String helpOrgContent;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -106,5 +106,28 @@
    private Long releaseId;

    private Integer status;
    @ApiModelProperty("接单类型 1单位 2个人")
    private Integer orderType;
    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
    @ApiModelProperty("实际服务时长")
    private String realServiceTime;
    @ApiModelProperty("评价内容")
    private String comment;
    @ApiModelProperty("评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date commentTime;
    @ApiModelProperty("说明")
    private String instruction;
    @ApiModelProperty("求助党员类型 1全部 2指定")
    private Integer helpMemberType;
    @ApiModelProperty("求助指定党员数组")
    private String helpMemberContent;
    @ApiModelProperty("求助党组织类型 1全部 2指定")
    private Integer helpOrgType;
    @ApiModelProperty("求助指定党组织数组")
    private String helpOrgContent;
    @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
    private Integer belongType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java

@@ -29,17 +29,32 @@

    @ApiModelProperty("接单状态 0 否 1是")
    private Integer orderStatus;

    @ApiModelProperty("处理状态 0 否 1是")
    @ApiModelProperty("接单类型 1单位 2个人")
    private Integer orderType;
    @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
    private Integer solveStatus;

    @ApiModelProperty("接单人id")
    private Long solveId;
    @ApiModelProperty("反馈内容")
    private String solveContent;
    @ApiModelProperty("反馈图片")
    private String solveUrl;

    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
    @ApiModelProperty("实际服务时长")
    private String realServiceTime;
    @ApiModelProperty("评价内容")
    private String comment;
    @ApiModelProperty("说明")
    private String instruction;
    @ApiModelProperty("求助党员类型 1全部 2指定")
    private Integer helpMemberType;
    @ApiModelProperty("求助指定党员数组")
    private String helpMemberContent;
    @ApiModelProperty("求助党组织类型 1全部 2指定")
    private Integer helpOrgType;
    @ApiModelProperty("求助指定党组织数组")
    private String helpOrgContent;

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）

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

@@ -118,4 +118,12 @@

    @ApiModelProperty(value = "其他备注")
    private String otherRemark;
    @ApiModelProperty(value = "报道单位下沉小区")
    private String unitVillageName;
    @ApiModelProperty(value = "报道单位服务社区")
    private String unitHelpCommunityName;
    @ApiModelProperty(value = "报道单位社区电话")
    private String unitHelpCommunityContacts;
    @ApiModelProperty(value = "帮扶社区联系人")
    private String unitHelpCommunityContactsName;
}

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

@@ -614,4 +614,10 @@

    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type);

    @GetMapping("/partybuildIng/memberDetail")
    public R memberDetail(@RequestParam("id")Long id);

    @GetMapping("/comPbCheckUnit/detailByPhone")
    public R detailByPhone(@RequestParam("phone") String phone);
}

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

@@ -1039,4 +1039,17 @@
    public R checkMember(@RequestParam("idCard")String idCard){
        return partyBuildingService.checkMember(idCard);
    }

    @OperLog(operModul = "党员管理", operType = 1)
    @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/member")
    public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        //partyBuildingMemberVO.setCommunityId(this.getCommunityId());
        return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
    }
    @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return partyBuildingService.memberDetail(id);
    }
}

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

@@ -56,6 +56,8 @@

        "<if test='comActActivityVO.communityId != null and comActActivityVO.communityId!=0'>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
        +
            "<if test='comActActivityVO.phone != null and comActActivityVO.phone!=&quot;&quot;'>" + "AND a.phone = ${comActActivityVO.phone} " + " </if> "
            +
        "<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
        +


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

@@ -46,13 +46,6 @@
     */
    IPage<ComActNeighborCircleAppVO> selectSolve(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);

    @Select("<script> " + "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content,canc.status "
        + ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName,canc.refuse_reason "
        + ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type,order_status,solve_status,solve_id,solve_content,solve_url,order_time,solve_time,t.name as solveName,canc.release_id from com_act_neighbor_circle as canc "
        + " left join sys_user as su on su.user_id = canc.release_id  "
        + " left join sys_user as t on t.user_id = canc.solve_id  "
        + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId} and canc.is_del = 2"
        + " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);

    IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -247,4 +247,8 @@
    private Integer isArticle;

    private String  jumpArticleUrl;

    private Long relationId;

    private String phone;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java

@@ -152,6 +152,20 @@

    private Date solveTime;

    private Date commentTime;

    private String comment;

    private Integer orderType;

    private Integer helpMemberType;

    private String helpMemberContent;

    private Integer helpOrgType;

    private String helpOrgContent;

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone

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

@@ -974,6 +974,9 @@
        if(comActNeighborCircleDO.getOrderStatus()!=null){
            comActNeighborCircleDO.setOrderTime(new Date());
        }
        if(StringUtils.isNotEmpty(comActNeighborCircleDO.getComment())){
            comActNeighborCircleDO.setCommentTime(new Date());
        }
        return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml

@@ -36,23 +36,7 @@
    <select id="pageNeighborByApp" parameterType="com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO"
            resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO">
        SELECT
        canc.id,
        canc.release_content,
        canc.release_images,
        canc.comment_num,
        canc.fabulous_num,
        canc.forward_num,
        canc.views_num,
        canc.is_boutique,
        canc.create_at,
        canc.refuse_reason,
        canc.reply_at,
        canc.last_comment_num,
        canc.last_fabulous_num,
        canc.last_views_num,
        canc.type,
        canc.topic_id,
        canc.hot_num,
        canc.*,
        su.nick_name as name,
        su.community_id,
        ca.`name` as communityName,
@@ -63,7 +47,7 @@
        left join sys_user as su on su.user_id = canc.release_id
        left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
        left join com_act as ca on ca.community_id = canc.community_id
        where canc.status = 2 and is_del = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
        where is_del = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
        <if test='neighborCircleAppDTO.topicId != null '>
            and canc.topic_id = #{neighborCircleAppDTO.topicId}
        </if>
@@ -74,6 +58,9 @@
            and (canct.`name` like concat ('%',#{neighborCircleAppDTO.keyWord},'%') or
            su.nick_name like concat ('%',#{neighborCircleAppDTO.keyWord},'%') or
             canc.release_content like concat ('%',#{neighborCircleAppDTO.keyWord},'%'))
        </if>
        <if test="neighborCircleAppDTO.isHelp ==1">
            and (canc.help_member_content like concat ('%',#{neighborCircleAppDTO.phone},'%') or canc.help_org_content like concat ('%',#{neighborCircleAppDTO.phone},'%') )
        </if>
        order by canc.create_at desc
    </select>
@@ -214,4 +201,20 @@
        </where>  order by create_at desc
    </select>

    <select id="neighborDetailByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO">
        SELECT
            canc.*,
            su.nick_name as name,
            su.community_id,
            ca.`name` as communityName,
            canct.name as topicName,
            su.image_url as headUrl
        FROM
            com_act_neighbor_circle AS canc
                left join sys_user as su on su.user_id = canc.release_id
                left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
                left join com_act as ca on ca.community_id = canc.community_id
        where canc.id =#{circleId}
    </select>

</mapper>

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

@@ -90,6 +90,18 @@
    public R detailById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.detailById(id);
    }
    /**
     * description  detailById  查询详情
     *
     * @param phone
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @GetMapping("/detailByPhone")
    public R detailByPhone(@RequestParam("phone") String phone) {
        return this.comPbCheckUnitService.detailByPhone(phone);
    }

    /**
     * description  queryByPage  查询列表

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

@@ -785,4 +785,8 @@
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(userId,type);
    }
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return comPbMemberService.memberDetail(id);
    }
}

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

@@ -193,7 +193,7 @@
     * @param id
     * @return
     */
    List<PartyBuildingMemberVO> getDetailByApp(Long id);
    PartyBuildingMemberVO getDetailByApp(Long id);

    PartyBuildingMemberVO selectDetail(@Param("userId") Long userId,@Param("type")Integer type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java

@@ -5,6 +5,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -69,5 +70,33 @@
    private String logo;

    private Integer partyNum;

    private String specialtyName;

    private Long helpCommunityId;

    private String helpCommunityName;

    private String helpCommunityContacts;

    private String helpCommunityContactsName;

    private Long villageId;

    private String villageName;

    private String natureName;

    private Integer natureId;

    private String address;

    private String adminName;

    private String adminPhone;

    private String otherMark;

    private String belongTo;
}


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

@@ -87,4 +87,11 @@
     */
    R importCheckUnit(List<ComPbCheckUnitExcelVO> list, Long communityId, Long userId);

    /**
     * 手机号查询单位详情
     * @param phone
     * @return
     */
    R detailByPhone(String phone);

}

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

@@ -252,4 +252,6 @@
    R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO);

    R getPartyMember(Long userId,Integer type);

    R memberDetail(Long id);
}

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

@@ -5,6 +5,7 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbCheckUnitTypeEnum;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.utlis.StringUtils;
@@ -16,6 +17,7 @@
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
@@ -45,6 +47,8 @@
    private ComPbMemberDAO comPbMemberDAO;
    @Resource
    private ComPbMemberRoleDAO comPbMemberRoleDAO;
    @Resource
    private ComPbMemberService comPbMemberService;

    /**
     * description  queryByPage  分页查询
@@ -74,6 +78,7 @@
     * @date 2022-02-16 16:22:26
     */
    @Override
    @Transactional
    public R insert(AddComPbCheckUnitDto comPbCheckUnit) {
        ComPbCheckUnit entity = new ComPbCheckUnit();
        BeanUtils.copyProperties(comPbCheckUnit, entity);
@@ -219,4 +224,13 @@
        }
        return R.ok();
    }

    @Override
    public R detailByPhone(String phone) {
        List<ComPbCheckUnit> comPbCheckUnits=this.baseMapper.selectList(new QueryWrapper<ComPbCheckUnit>().lambda().eq(ComPbCheckUnit::getAdminPhone,phone));
        if(!comPbCheckUnits.isEmpty()){
            return R.ok(comPbCheckUnits.get(0));
        }
        return R.ok();
    }
}

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

@@ -1121,4 +1121,9 @@

        return R.ok(comPbMemberDAO.selectDetail(userId,type));
    }

    @Override
    public R memberDetail(Long id) {
        return R.ok(comPbMemberDAO.getDetailByApp(id));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml

@@ -18,22 +18,17 @@
    <!--查询单个-->
    <select id="queryById" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
        cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
        , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`
        cpcu.*
        ,(select count(id) from com_pb_member where audit_result = 1 and check_unit_id = cpcu.id) as count
        from com_pb_check_unit as cpcu
        left join com_act as ca on ca.community_id = cpcu.community_id
        where cpcu.id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
        cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
        , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`,ca.area_code,cs.name as streetName,cpcu.address
        cpcu.*
        from com_pb_check_unit as cpcu
        left join com_act as ca on ca.community_id = cpcu.community_id
        left join com_street cs on ca.street_id = cs.street_id
        <where>
            <if test="dto.type != null">
                and cpcu.`type` = #{dto.type}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -687,7 +687,7 @@
    <select id="getPbMemberByApplets" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, u.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
        m.specialty_name, m.position_two, IFNULL(m.org_Name,cpo.`name`) as orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
        TIMESTAMPDIFF(
        YEAR,
@@ -733,5 +733,10 @@
        where t.user_id = #{userId}
          and t.type = #{type}
    </select>
    <select id="getDetailByApp" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select t.*,t1.village_name as unitVillageName,t1.help_community_name as helpCommunityName,t1.help_community_contacts as helpCommunityContacts,t1.help_community_contacts_name as helpCommunityContactsName,t1.nature_name,t2.name as villageName
        from com_pb_member t left join com_pb_check_unit t1 on t.check_unit_id = t1.id
        left join com_mng_village t2 on t.village_id = t2.village_id where t.id = #{id}
    </select>
</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -258,6 +258,13 @@
    ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);

    /**
     * 查询单位管理员
     * @param phone
     * @return
     */
    Integer selectOrgAdmin(@Param("phone") String phone);

    /**
     * 根据社区名称查询区县社区联动关系
     * @param relationName
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -434,6 +434,13 @@
                }
                loginUserInfoVO.setRelationName(acidMember.getRelationName());
            }
            Integer count=userDao.selectOrgAdmin(phone);
            if(count>0){
                loginUserInfoVO.setIsCheckUnitAdmin(1);
            }
            else {
                loginUserInfoVO.setIsCheckUnitAdmin(0);
            }
            //是否网格员
            int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
            if (easyPhotoMember > 0) {

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -558,4 +558,7 @@
        select t.district_name from com_mng_struct_area_district t left join com_street t1 on t.district_adcode  = t1.area_code where t1.street_id =#{streetId}
    </select>

    <select id="selectOrgAdmin" resultType="Integer">
        select count(*) from com_pb_check_unit where admin_phone = #{phone}
    </select>
</mapper>