服务范围优化

puhanshu

2022-08-16 e9458be7ac912388ac734a70b8d2e4810c5e7cba

服务范围优化

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

@@ -55,6 +55,7 @@
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
            neighborCircleAppDTO.setCheckUnitId(loginUserInfo.getCheckUnitId());
        }
        return communityService.pageRelationList(neighborCircleAppDTO);
    }

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

@@ -52,6 +52,9 @@
    private Integer orderType;
    @ApiModelProperty("清单状态")
    private Integer status;

    @ApiModelProperty(value = "单位id", hidden = true)
    private Long checkUnitId;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

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

@@ -711,9 +711,12 @@
        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
        LEFT JOIN com_act_activity t ON canc.id = t.relation_id
        where is_del = 2 and canc.status = 2 and canc.community_id = ${neighborCircleAppDTO.communityId} AND t.id IS NULL
        where is_del = 2 and canc.status = 2 and canc.solve_status in (2,3,4) and canc.community_id = ${neighborCircleAppDTO.communityId} AND t.id IS NULL
        <if test='neighborCircleAppDTO.topicId != null '>
            and canc.topic_id = #{neighborCircleAppDTO.topicId}
        </if>
        <if test='neighborCircleAppDTO.checkUnitId != null '>
            and canc.solve_unit_id = #{neighborCircleAppDTO.checkUnitId}
        </if>
        <if test='neighborCircleAppDTO.belongType != null '>
            and canc.belong_type = #{neighborCircleAppDTO.belongType}
@@ -725,17 +728,6 @@
        </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>
        <if test="neighborCircleAppDTO.solveStatus !=null">
            <if test="neighborCircleAppDTO.solveStatus ==1">
                and canc.solve_status in (0,1)
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==2">
                and canc.solve_status =2
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==3">
                and canc.solve_status in(3,4)
            </if>
        </if>
        order by canc.create_at desc
    </select>