议事议题优化

linwei

2024-02-23 33dc5038638f6b5e9f7f0b9165905e56797ec990

议事议题优化

 src/main/java/org/springblade/modules/article/controller/ArticleController.java

@@ -18,6 +18,7 @@

import javax.validation.Valid;
import java.util.Date;
import java.util.List;

/**
 * @author zhongrj
@@ -33,6 +34,7 @@

    /**
     * 查询资讯分页信息
     *
     * @param article  资讯对象
     * @param query    查询参数
     * @return
@@ -42,8 +44,14 @@
        return R.data(articleService.selectArticlePage(Condition.getPage(query), article));
    }

    @GetMapping("/getArticleByDistrictId")
    public R<List<ArticleVO>> getArticleByDistrictId(ArticleVO article) {
        return R.data(articleService.getArticleByDistrictId(article));
    }

    /**
     * 查询资讯分页信息-app
     *
     * @param article  资讯对象
     * @param query    查询参数
     * @return
@@ -55,6 +63,7 @@

    /**
     * 敏感词预警
     *
     * @param article  资讯对象
     * @param query    查询参数
     * @return
@@ -66,6 +75,7 @@

    /**
     * 查询资讯分页信息(角色权限)
     *
     * @param article  资讯对象
     * @param query    查询参数
     * @return
@@ -82,6 +92,7 @@

    /**
     * 查询资讯分页信息(角色权限)附带点赞评论数
     *
     * @param article  资讯对象
     * @param query    查询参数
     * @return
@@ -136,6 +147,7 @@

    /**
     * 修改资讯信息
     *
     * @param article 资讯对象
     */
    @PostMapping("/update")
@@ -164,6 +176,7 @@

    /**
     * 删除资讯信息
     *
     * @param ids 资讯主键id,id集合
     */
    @PostMapping("/remove")
@@ -189,6 +202,7 @@

    /**
     * 查询个人资讯
     *
     * @param article
     * @param query
     * @return

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java

@@ -57,4 +57,6 @@
    ArticleVO getArticleOne(ArticleVO article);

    String getDistrictId(String houseCode);

    List<ArticleVO> getArticleByDistrictId(ArticleVO article);
}

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml

@@ -535,4 +535,59 @@
        WHERE jda.address_code = #{houseCode}

    </select>
    <select id="getArticleByDistrictId" resultType="org.springblade.modules.article.vo.ArticleVO"
            parameterType="org.springblade.modules.article.vo.ArticleVO">
        SELECT
        ja.*,
        br.`village_name` communityName,
        br.town_name streetName
        FROM
        jczz_article ja
        LEFT JOIN jczz_district jd ON ja.district_id = jd.id
        LEFT JOIN blade_region br on br.`code` = jd.community_code
        where 1=1
        and ja.is_deleted = 0
        <if test="article.propertyFlag!=null ">
            <if test="article.communityName!=null and article.communityName!=''">
                and br.`village_name` like concat('%',#{article.communityName},'%')
            </if>

            <if test="article.streetName!=null and article.streetName!=''">
                and br.town_name like concat('%',#{article.streetName},'%')
            </if>
        </if>

        <if test="article.title!=null and article.title!=''">
            and ja.title like concat('%',#{article.title},'%')
        </if>
        <if test="article.sourceName!=null and article.sourceName!=''">
            and ja.source_name like concat('%',#{article.sourceName},'%')
        </if>
        <if test="article.startTime!=null and article.startTime!=''">
            and ja.create_time&gt;=#{article.startTime}
        </if>
        <if test="article.endTime!=null and article.endTime!=''">
            and ja.create_time&lt;=#{article.endTime}
        </if>
        <if test="article.publish!=null and article.publish!=''">
            and ja.publish = #{article.publish}
        </if>
        <if test="article.articleType!=null and article.articleType!=''">
            and ja.article_type like concat('%',#{article.articleType},'%')
        </if>
        <if test="article.type != null ">and ja.type = #{article.type}</if>

        <if test="article.keyword!=null and article.keyword!=''">
            AND CONCAT(ja.title,ja.source_name)
            LIKE CONCAT ('%', #{article.keyword},'%')
        </if>
        <if test="article.districtIdList != null and article.districtIdList.size() > 0 ">
            and (ja.article_range like
            <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
            </foreach>
            )
        </if>
        order by ja.create_time desc

    </select>
</mapper>

 src/main/java/org/springblade/modules/article/service/ArticleService.java

@@ -5,6 +5,8 @@
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.vo.ArticleVO;

import java.util.List;

/**
 * @author zhongrj
 * 资讯服务接口层
@@ -61,4 +63,6 @@
    Boolean upcomment(String ids, String type);

    ArticleVO getArticleOne(ArticleVO article);

    List<ArticleVO> getArticleByDistrictId(ArticleVO article);
}

 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java

@@ -170,4 +170,9 @@
        ArticleVO articleVO = baseMapper.getArticleOne(article);
        return articleVO;
    }

    @Override
    public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
        return baseMapper.getArticleByDistrictId(article);
    }
}