huanghongfa
2021-07-09 7678929a4c276657e78e1ac8ffa2805ad03dde0e
修改bug
2个文件已修改
10 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
@@ -288,4 +288,7 @@
    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "是否查询全部(1.是 2.否)", hidden = false, example = "true")
    private Integer isAll;
}
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -72,6 +72,9 @@
            <if test="pageEventDTO.eventDealStatus!=null">
                AND event_deal_status = #{pageEventDTO.eventDealStatus}
            </if>
            <if test="pageEventDTO.isAll!=null and pageEventDTO.isAll = 1">
                AND event_deal_status in (1,2,4)
            </if>
            <if test="pageEventDTO.revokeType!=null">
                AND ( revoke_type = #{pageEventDTO.revokeType} OR revoke_type is null )
            </if>
@@ -226,9 +229,7 @@
                AND update_at <![CDATA[<=]]> #{pageEventDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventDTO.sortColumns!=null">
            ORDER BY ${pageEventDTO.sortColumns} ${pageEventDTO.sortType}
        </if>
        order by event_deal_status asc,create_at desc
    </select>
    <select id="findPublicityByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
            parameterType="com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO">