CeDo
2021-06-04 7e2b1cce36643fe48aec347e8ec1bbf3d25c3d4e
Merge branch 'test_future_wangge' into test
2个文件已修改
10 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1400,7 +1400,7 @@
        Integer eventDealStatus = -1;
        //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
        if(eventDO.getInvalid()==false){
        if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
            eventDealStatus = 7;//7已失效
        }else if(event_status ==2 && event_process_status == 1 && process_type == 1) {
            eventDealStatus = 1;//"待处理"
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -429,6 +429,14 @@
            <if test="pageEventManageDTO.communityId!=null">
                AND egd.grid_community_id = #{pageEventManageDTO.communityId}
            </if>
            <if test='pageEventManageDTO.keyWord != null and pageEventManageDTO.keyWord != &quot;&quot;'>
                AND (
                e.grid_member_name like concat('%', #{pageEventManageDTO.keyWord},'%') OR
                e.event_title like concat('%', #{pageEventManageDTO.keyWord},'%') OR
                e.happen_address like concat('%', #{pageEventManageDTO.keyWord},'%')
                e.order_sn like concat('%', #{pageEventManageDTO.keyWord},'%')
                )
             </if>
            <if test="pageEventManageDTO.eventDealStatus!=null">
                AND e.event_deal_status = #{pageEventManageDTO.eventDealStatus}
            </if>