12/28 项目分类相关功能修改

101captain

2021-12-28 c9ad444d7d6b113b5f933e3f4f288b760207539d

12/28  项目分类相关功能修改

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

New file
@@ -0,0 +1,66 @@
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * @author zzj
 */
@Data
@ApiModel
public class ComActColumnLevelVO {
    private Long id;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    private String name;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private String createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 修改人
     */
    @ApiModelProperty(value = "修改人")
    private String updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date updateTime;

    /**
     * 状态 0禁用 1启用
     */
    @ApiModelProperty(value = "状态 0禁用 1启用")
    private Integer status;

    /**
     * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    private Long communityId;

    @ApiModelProperty(value = "父类id")
    private Long parentId;
    @ApiModelProperty(value = "二级目录集合")
    List<ComActColumnVO> comActColumnVOList;
}

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

@@ -58,4 +58,6 @@

    private Long communityId;

    @ApiModelProperty(value = "父类id")
    private Long parentId;
}

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

@@ -125,4 +125,10 @@
     */
    @ApiModelProperty(value = "分类名称")
    private String columnName;

    /**
     * 二级分类
     */
    @ApiModelProperty(value = "分类名称")
    private String secondColumnName;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java

@@ -89,4 +89,12 @@
    public R delete(@RequestParam("id") Long id) {
        return this.comActColumnService.delete(id);
    }

    /**
     * 项目分类级联查询
     */
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        return this.comActColumnService.queryLevel(comActColumnVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java

@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActColumnLevelVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActColumn;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 分类列表(ComActColumn)表数据库访问层
@@ -24,4 +28,10 @@
     */
    IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);

    /**
     * 项目级联查询
     * @param comActColumnVO
     * @return
     */
    List<ComActColumnLevelVO> queryLevel(ComActColumnVO comActColumnVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java

@@ -117,4 +117,10 @@
    @ApiModelProperty(value = "分类id")
    private Long columnId;

    /**
     * 二级分类id
     */
    @ApiModelProperty(value = "二级分类id")
    private Long secondColumnId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java

@@ -3,6 +3,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.entity.ComActColumn;

/**
@@ -26,4 +27,10 @@
     * @return
     */
    R delete(Long id);

    /**
     * 项目级联查询
     * @param comActColumnVO
     */
    R queryLevel(ComActColumnVO comActColumnVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
@@ -41,4 +42,9 @@
        return R.ok(comActColumnDao.deleteById(id));
    }

    @Override
    public R queryLevel(ComActColumnVO comActColumnVO) {
        return R.ok(this.comActColumnDao.queryLevel(comActColumnVO));
    }

}

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

@@ -29,8 +29,33 @@
            <if test="commonPage.keyword!=null and commonPage.keyword!=''">
                and name like concat('%',#{commonPage.keyword},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and parent_id = #{commonPage.paramId}
            </if>
        </where>
        order by create_time desc
    </select>

    <resultMap id="levelMap" type="com.panzhihua.common.model.vos.community.ComActColumnLevelVO">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <collection property="comActColumnVOList" column="id=parent_id" ofType="com.panzhihua.common.model.vos.community.ComActColumnVO" javaType="java.util.ArrayList">
            <result property="id" column="sid"/>
            <result property="name" column="sname"/>
        </collection>
    </resultMap>
    <select id="queryLevel" resultMap="levelMap">
        select t.id,t.name,t1.id as sid,t1.name as sname from com_act_column t left join com_act_column t1 on t.id =t1.parent_id
        <where>
            1=1
            <if test="communityId !=null ">
                and t.community_id =#{communityId}
            </if>
            <if test="type !=null ">
                and t.type =#{type}
            </if>
        </where>
        order by t.create_time desc
    </select>

</mapper>

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

@@ -18,7 +18,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        select t.*,t1.name as columnName from com_act_social_project t left join com_act_column t1 on t.column_id = t1.id
        select t.*,t1.name as columnName,t2.name as secondColumnName from com_act_social_project t
        left join com_act_column t1 on t.column_id = t1.id
        left join com_act_column t2 on t.second_column_id = t2.id
        <where>
            1=1
            <if test="commonPage.communityId !=0 and commonPage.communityId ！=null">
@@ -50,9 +52,10 @@
    </select>

    <select id="getByApplet" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        select t.*,t1.phone as streetPhone,t2.name as columnName from com_act_social_project t
        select t.*,t1.phone as streetPhone,t2.name as columnName,t3.name as secondColumnName from com_act_social_project t
        LEFT JOIN com_street t1 on t.street_id = t1.street_id
        LEFT JOIN com_act_column t2 on t.column_id = t2.id
        LEFT JOIN com_act_column t3 on t.second_column_id = t3.id
        where t.id =#{id}
    </select>
</mapper>