修改三资公开查询分类问题

lidongdong

2023-06-30 909ba96fae94fff45db3570b162ed9dbb22310e2

修改三资公开查询分类问题

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java

@@ -43,14 +43,14 @@
    @ApiOperation(value = "分页查询花城资讯分类列表", response = ComActDynTypeVO.class)
    @PostMapping("/type/page")
    public R page(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        comActDynTypeDTO.setCommunityId(0L);
        comActDynTypeDTO.setCommunityId("0");
        return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
    }

    @ApiOperation(value = "查询花城资讯分类列表", response = ComActDynTypeVO.class)
    @PostMapping("/type/list")
    public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        comActDynTypeDTO.setCommunityId(0L);
        comActDynTypeDTO.setCommunityId("0");
        return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -202,6 +202,12 @@
            <version>1.13.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-annotation</artifactId>
            <version>3.4.1</version>
            <scope>compile</scope>
        </dependency>

    </dependencies>


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java

@@ -1,7 +1,9 @@
package com.panzhihua.common.model.vos.community;

import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -127,4 +129,10 @@
     * */
    @ApiModelProperty("图片链接")
    private String imageUrl;

    @TableField(exist = false)
    private String typeS;

    @TableField(exist = false)
    private List<String> typeList;
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -747,19 +747,22 @@
    @ApiOperation(value = "分页查询社区动态", response = ComActDynVO.class)
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
//        if(StringUtils.isEmpty(comActDynVO.getCommunityId()))
//        {
//            LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
//            if(loginUserInfoVO.getCommunityId()!=null && loginUserInfoVO.getCommunityId()>0 )
//            {
//                comActDynVO.setCommunityId(loginUserInfoVO.getCommunityId()+"");
//            }
//
//            if(loginUserInfoVO.getStreetId()!=null && loginUserInfoVO.getStreetId()>0 )
//            {
//                comActDynVO.setStreetId(loginUserInfoVO.getStreetId());
//            }
//        }
        if(StringUtils.isEmpty(comActDynVO.getTypeS()) || "1".equals(comActDynVO.getTypeS()) )
        {
            if(StringUtils.isEmpty(comActDynVO.getCommunityId()))
            {
                LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
                if(loginUserInfoVO.getCommunityId()!=null && loginUserInfoVO.getCommunityId()>0 )
                {
                    comActDynVO.setCommunityId(loginUserInfoVO.getCommunityId()+"");
                }

                if(loginUserInfoVO.getStreetId()!=null && loginUserInfoVO.getStreetId()>0 )
                {
                    comActDynVO.setStreetId(loginUserInfoVO.getStreetId());
                }
            }
        }

        Integer category = comActDynVO.getCategory();
        if (isNull(category)) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml

@@ -223,9 +223,25 @@
        <if test="comActDynVO.status != null and comActDynVO.status != '' ">
            AND d.`status` = #{comActDynVO.status}
        </if>
        <if test="comActDynVO.type != null and comActDynVO.type != '' ">
            AND d.type = #{comActDynVO.type}

        <if test="comActDynVO.typeS == null or comActDynVO.typeS != '2' ">
            <if test="comActDynVO.type != null and comActDynVO.type != '' ">
                AND d.type = #{comActDynVO.type}
            </if>
        </if>

         <if test="comActDynVO.typeS != null and comActDynVO.typeS == '2' ">
             AND d.type in (SELECT id FROM `com_act_dyn_type` WHERE name in
             <foreach collection="comActDynVO.typeList" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>

             <if test="comActDynVO.communityId != null and comActDynVO.communityId != '' ">
                 and community_id in (${comActDynVO.communityId})
             </if>)
        </if>


        <if test="comActDynVO.publishAtBegin != null and comActDynVO.publishAtBegin != '' ">
            AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} AND #{comActDynVO.publishAtEnd}
        </if>