From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:48:24 +0800
Subject: [PATCH] #feat 修改别名
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 464e6d1..9410fbd 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
@@ -175,6 +175,13 @@
//街道后台
range=3;
id=loginUserInfo.getStreetId();
+ }else if (loginUserInfo.getType().equals(12)){
+ range=2;
+ id=comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount,loginUserInfo.getAccount() )).getId();
+ }else if (loginUserInfo.getType().equals(3)){
+ //社区后台账号
+ range=4;
+ id=loginUserInfo.getCommunityId();
}
}
}
@@ -352,17 +359,15 @@
Integer count = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6));
Integer successCount = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6).eq(ComEvent::getEventResult, 2));
comSanshuoExpert.setCount(count);
- if (nonNull(count) && !count.equals(0)){
- comSanshuoExpert.setCount(count);
- if (nonNull(successCount) && !count.equals(successCount)){
- //计算成功率
- comSanshuoExpert.setRate(NumberUtil.div(successCount, count,2));
- }else {
- comSanshuoExpert.setRate(new BigDecimal(0));
+ if (nonNull(successCount) && nonNull(count)){
+ if (!successCount.equals(0) && !count.equals(0)){
+ //计算成功率
+ comSanshuoExpert.setRate(NumberUtil.div(successCount, count,2));
}
}else {
- comSanshuoExpert.setCount(0);
+ comSanshuoExpert.setRate(new BigDecimal(0));
}
+
}
return R.ok(comSanshuoExperts);
}
@@ -417,20 +422,20 @@
}
@Override
- public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO) {
+ public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size) {
if (nonNull(level)){
if (level.equals(1)){
//三说会堂权限，查看所有
- return R.ok(comSanshuoExpertDao.selectList(null));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,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())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId()));
}else if (level.equals(3)){
//街道
- return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStreetId,loginUserInfoVO.getStreetId())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId()));
}else if(level.equals(4)){
- return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getCommunityId,loginUserInfoVO.getCommunityId())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId()));
}
}
return null;
--
Gitblit v1.7.1