From bddad8b22f9b505274a8c2904d9d81efda89f497 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 13:08:36 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index d027f9f..464e6d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -87,13 +87,15 @@
expert.setCreateTime(new Date());
if (expert.getLevel()==2){
expert.setIndustryCenterId(Long.parseLong(expert.getUnitId()));
- expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
+ expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName());
}else if(expert.getLevel()==3){
expert.setStreetId(Long.parseLong(expert.getUnitId()));
expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(expert.getUnitId()));
- expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
+ expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解室");
+ }else{
+ expert.setUnit("区三说会堂");
}
expert.setStatus(1);
expert.setDelFlag(1);
@@ -181,6 +183,7 @@
id=null;
range=1;
}
+ log.info("");
IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
//获取调解次数和成功率
@@ -206,7 +209,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();
@@ -413,5 +416,25 @@
// }
}
+ @Override
+ public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO) {
+ if (nonNull(level)){
+ if (level.equals(1)){
+ //三说会堂权限，查看所有
+ return R.ok(comSanshuoExpertDao.selectList(null));
+ }else if (level.equals(2)){
+ //行业分中心
+ ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
+ return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getIndustryCenterId,center.getId())));
+ }else if (level.equals(3)){
+ //街道
+ return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStreetId,loginUserInfoVO.getStreetId())));
+ }else if(level.equals(4)){
+ return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getCommunityId,loginUserInfoVO.getCommunityId())));
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.7.1