From c2c8f1fcd02448bf8ae632c19d9a802b8a1c4024 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 09:49:11 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 22 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 9410fbd..b8f32e9 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
@@ -107,6 +107,10 @@
e.printStackTrace();
}
//生成后台账号
+ //如果是普达社区专家则不生成后台账号
+ if (nonNull(expert.getCommunityId()) && !expert.getCommunityId().equals(10172)){
+ return R.ok();
+ }
AdministratorsUserVO user=new AdministratorsUserVO();
user.setUserId(Snowflake.getId());
user.setAccount(comSanshuoExpertDTO.getAccount());
@@ -115,7 +119,8 @@
user.setType(11);
user.setImageUrl(comSanshuoExpertDTO.getAvatar());
user.setPhone(comSanshuoExpertDTO.getPhone());
- return R.ok(userService.sanShuoAddUser(user));
+ userService.sanShuoAddUser(user);
+ return R.ok();
}
}else {
ComSanshuoExpert expert=new ComSanshuoExpert();
@@ -133,8 +138,10 @@
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()+"调解站");
+ if (nonNull(expert.getUnitId())){
+ expert.setCommunityId(Long.parseLong(expert.getUnitId()));
+ expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
+ }
}
return R.ok(comSanshuoExpertDao.updateById(expert));
}
@@ -191,7 +198,7 @@
range=1;
}
log.info("");
- IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
+ IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level,loginUserInfo.getAppId());
for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
//获取调解次数和成功率
record.setCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId())));
@@ -210,8 +217,8 @@
* 专家风采
* */
@Override
- public R expertShow() {
- List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow();
+ public R expertShow(String appId) {
+ List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow(appId);
for (ExpertShowVO expertShowVO : expertShowVOS) {
if (nonNull(expertShowVO.getLevel())){
if (1==expertShowVO.getLevel()) {
@@ -227,7 +234,7 @@
expertShowVO.setChildList(expertShowVOS1);
}else {
expertShowVO.setName("村/社区调解站调解专家");
- List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity();
+ List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity(appId);
expertShowVO.setChildList(expertShowVOS1);
}
}
@@ -259,7 +266,7 @@
}else if (i==4){
vo.setId(4L);
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
- vo.setName("社区调解站");
+ vo.setName("社区调解室");
}else if(i==1){
vo.setId(1L);
vo.setName("三说会堂");
@@ -290,7 +297,7 @@
List<ExpertRangeVO> list = new ArrayList<>();
ExpertRangeVO vo = new ExpertRangeVO();
vo.setLevel(4);
- vo.setName(comStreetDO.getName() + "调解站");
+ vo.setName(comStreetDO.getName() + "调解室");
vo.setId(loginUserInfo.getCommunityId());
list.add(vo);
return R.ok(list);
@@ -342,15 +349,26 @@
* 专家风采列表
* */
@Override
- public R expertShowList(Integer level, Long id) {
+ public R expertShowList(Integer level, Long id,String appId) {
QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
- wrapper.eq("level",level );
- if (level.equals(2)){
- wrapper.eq("industry_center_id", id);
- }else if (level.equals(3)){
- wrapper.eq("street_id",id );
- }else if (level.equals(4)){
- wrapper.eq("community_id",id );
+ if (level==0){
+ wrapper.eq("app_id",appId );
+ }else {
+ if (level!=7){
+ wrapper.eq("level",level);
+ wrapper.eq("app_id",appId);
+ wrapper.eq("status",1 );
+ wrapper.eq("del_flag",1 );
+ if (level.equals(2)){
+ wrapper.eq("industry_center_id", id);
+ }else if (level.equals(3)){
+ wrapper.eq("street_id",id );
+ }else if (level.equals(4)){
+ wrapper.eq("community_id",id );
+ }
+ }else {
+ wrapper.eq("id",id );
+ }
}
List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {
@@ -422,24 +440,54 @@
}
@Override
- public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size) {
+ public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord) {
if (nonNull(level)){
if (level.equals(1)){
//三说会堂权限，查看所有
- return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId(),keyWord));
}else if (level.equals(2)){
//行业分中心
ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
- return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId()));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId(),keyWord));
}else if (level.equals(3)){
//街道
- return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId()));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId(),keyWord));
}else if(level.equals(4)){
- return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId()));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
}
+ }else {
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
}
return null;
}
+ @Override
+ public R rangeList() {
+ List<ExpertRangeVO> list=new ArrayList<>();
+ for (int i = 1; i < 5; i++) {
+ ExpertRangeVO vo=new ExpertRangeVO();
+ vo.setLevel(i);
+ if (i==2){
+ //设置行业分中心为childList
+ vo.setId(2L);
+ vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
+ vo.setName("行业分中心");
+ }else if (i==3){
+ vo.setId(3L);
+ vo.setChildList(comSanshuoIndustryCenterDao.streetList());
+ vo.setName("街道调解站");
+ }else if (i==4){
+ vo.setId(4L);
+ vo.setChildList(comSanshuoIndustryCenterDao.communityList());
+ vo.setName("社区调解站");
+ }else if(i==1){
+ vo.setId(1L);
+ vo.setName("三说会堂");
+ }
+ list.add(vo);
+ }
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1