puhanshu
2021-12-31 187a5be77d7da76fc0d668fa2435985e1c475a43
大屏事件分页参数修改
2个文件已修改
15 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
@@ -29,6 +29,9 @@
    @ApiModelProperty(value = "字符串类型查询参数", example = "10")
    private String param2;
    @ApiModelProperty(value = "数字类型查询参数", example = "10")
    private Integer param3;
    @ApiModelProperty(value = "单个社区id")
    private Long communityId;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -1117,6 +1117,12 @@
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1 AND e.event_type IN ( 1, 2, 3, 5, 6 )
        AND e.event_status = 2 AND egd.grid_community_id = ${pageBaseDTO.communityId}
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 1">
            AND event_deal_status = 4
        </if>
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 2">
            AND event_deal_status != 4
        </if>
        UNION ALL SELECT
        CASE
        WHEN classify_id = 4 THEN 1
@@ -1132,5 +1138,11 @@
        ELSE 2 END `status`
        FROM com_act_easy_photo WHERE community_id = ${pageBaseDTO.communityId} AND `status` IN (1,2,4)
        AND del_tag = 0 AND classify_id IN (1,3,4,5,6,7,8)
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 1">
            AND handle_status = 2
        </if>
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 2">
            AND handle_status != 2
        </if>
    </select>
</mapper>