张天森
2022-10-20 20c954d18505763c945ba34688ac20d287460970
update
4个文件已修改
17 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10545,6 +10545,6 @@
    @GetMapping("/sanshuo/comEvent/communityList")
    R westList();
    @GetMapping("/sanshuo/expert/backstageList2")
    @GetMapping("/sanshuo/expert/backstageList")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
@@ -68,7 +68,7 @@
     * */
    Integer selectExpertCount(@Param("dto") IndexDateDTO indexDataDTO);
    List<ExpertShowVO> selectExpertVoList(Integer level);
    Integer selectExpertVoList();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -175,7 +175,7 @@
                    id=loginUserInfo.getStreetId();
                }
            }
        }
        }log.info("==================="+loginUserInfo);
        if (loginUserInfo.getAccount().equals("admin")){
            //三说会堂查看所有专家
            id=null;
@@ -206,7 +206,7 @@
            if (nonNull(expertShowVO.getLevel())){
                if (1==expertShowVO.getLevel()) {
                    expertShowVO.setName("区三说会堂调解专家");
                    // expertShowVO.setChildList(comSanshuoExpertDao.selectExpertVoList(expertShowVO.getLevel()));
                    expertShowVO.setCount(comSanshuoExpertDao.selectExpertVoList());
                }else if (2==expertShowVO.getLevel()){
                    expertShowVO.setName("行业分中心调解专家");
                    List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertIndustry();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
@@ -89,7 +89,7 @@
           </if>
    </select>
    <select id="selectExpertIndustry" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.id from com_sanshuo_expert t
        select  count(t.id) as 'count',t1.name,t1.id,t.level from com_sanshuo_expert t
        left join com_sanshuo_industry_center t1 on t.industry_center_id=t1.id
        where t.level=2 and t.status=1 and t.del_flag=1
        group by t1.name
@@ -97,13 +97,13 @@
    <select id="selectExpertStreet" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.street_id as id from com_sanshuo_expert t
        select  count(t.id) as 'count',t1.name,t1.street_id,t.level as id from com_sanshuo_expert t
        left join com_street t1 on t.street_id=t1.street_id
        where t.level=3 and t.status=1 and t.del_flag=1
        group by t1.name
    </select>
    <select id="selectExpertCommunity" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.community_id as id from com_sanshuo_expert t
        select  count(t.id) as 'count',t1.name,t1.community_id,t.level as id from com_sanshuo_expert t
        left join com_act t1 on t.community_id=t1.community_id
        where t.level=4 and t.status=1 and t.del_flag=1
        group by t1.name
@@ -145,4 +145,7 @@
            </if>
        </if>
    </select>
    <select id="selectExpertVoList" resultType="Integer">
        select count(id) from com_sanshuo_expert where level=1
    </select>
</mapper>