议事议题优化

linwei

2024-02-23 bc887a864d795aa2b555597960904f3d01c5f014

议事议题优化

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

@@ -58,5 +58,5 @@

    String getDistrictId(String houseCode);

    List<ArticleVO> getArticleByDistrictId(ArticleVO article);
    List<ArticleVO> getArticleByDistrictId(@Param("article") ArticleVO article);
}

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

@@ -113,12 +113,12 @@

            <if test="article.districtId != null and article.districtId != ''">
                and (ja.article_range like concat('%',#{article.districtId},'%')
                or ja.article_range is null)
                or ja.article_range is null or ja.article_range  = '')
            </if>

            <if test="article.userId != null">
                and (jpd.appoint_user like concat('%',#{article.userId},'%')
                or jpd.appoint_user is null)
                and (jpd.user_ids like concat('%',#{article.userId},'%')
                OR jpd.user_ids IS NULL or jpd.user_ids  = '')
            </if>

            <if test="article.building != null and article.building != ''">
@@ -545,8 +545,15 @@
        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
        LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
        where 1=1
        and ja.is_deleted = 0

        <if test="article.eventType != null">
            and jpd.event_type = #{article.eventType}
            and jpd.end_time is not null
        </if>

        <if test="article.propertyFlag!=null ">
            <if test="article.communityName!=null and article.communityName!=''">
                and br.`village_name` like concat('%',#{article.communityName},'%')

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

@@ -173,6 +173,9 @@

    @Override
    public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
        List<String> objects = new ArrayList<>();
        objects.add(article.getDistrictId());
        article.setDistrictIdList(objects);
        return baseMapper.getArticleByDistrictId(article);
    }
}

 src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java

@@ -202,4 +202,6 @@

    private String taskId;

    private Integer articleId;

}

 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml

@@ -26,6 +26,7 @@
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="article_id" property="articleId"/>
    </resultMap>

    <!--自定义分页查询-->

 src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.xml

@@ -166,6 +166,7 @@
                </choose>
            </if>
        </where>
        order by jpc.create_time desc
    </select>

    <resultMap type="org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO"
@@ -347,7 +348,8 @@


    <!--导出消防自查信息-->
    <select id="exportTaskPlaceSelfCheck" resultType="org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel">
    <select id="exportTaskPlaceSelfCheck"
            resultType="org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel">
        select
        jpc.id,
        case when jpc.status=1 then '待审核'