From b4a814c5233885cc5df6ac76d6b8f9b5958c603c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 11:20:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 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 36d7e9f..434c8dd 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
@@ -1,7 +1,9 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
import cn.hutool.crypto.digest.MD5;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoExpertDTO;
@@ -13,7 +15,10 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.api.ComSanShuoExpertApi;
import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.entity.ComEvent;
+import com.panzhihua.service_community.entity.ComSanshuoEvent;
import com.panzhihua.service_community.entity.ComSanshuoExpert;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
@@ -24,6 +29,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -43,6 +49,8 @@
private ComStreetDAO comStreetDAO;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComEventMapper comEventMapper;
/**
@@ -58,7 +66,7 @@
if (nonNull(comSanshuoExpertDTO.getUnit())){
String id = comSanshuoExpertDTO.getUnit();
String[] split = id.split(",");
- comSanshuoExpertDTO.setUnitId(split[split.length]);
+ comSanshuoExpertDTO.setUnitId(split[split.length-1]);
}
expert.setId(Snowflake.getId());
expert.setCreateTime(new Date());
@@ -69,6 +77,8 @@
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
}
+ expert.setStatus(1);
+ expert.setDelFlag(1);
int insert = comSanshuoExpertDao.insert(expert);
if (insert>0){
try {
@@ -120,6 +130,10 @@
}
}
}
+ if (loginUserInfo.getAccount().equals("admin") || loginUserInfo.getAccount().equals("xiqu")){
+ id=null;
+ range=null;
+ }
return R.ok(comSanshuoExpertDao.expertPage(new Page(page,size),keyWord,range,id));
}
@@ -148,7 +162,7 @@
}
}
}
- return R.ok();
+ return R.ok(expertShowVOS);
}
/**
@@ -165,10 +179,15 @@
if (i==2){
//设置行业分中心为childList
vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
+ vo.setName("行业分中心");
}else if (i==3){
vo.setChildList(comSanshuoIndustryCenterDao.streetList());
+ vo.setName("街道调解站");
}else if (i==4){
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
+ vo.setName("社区调解站");
+ }else if(i==1){
+ vo.setName("三说话会堂");
}
list.add(vo);
}
@@ -219,4 +238,70 @@
}
+ /**
+ * 小程序获取专家列表
+ * */
+ @Override
+ public R selectExpertList() {
+ List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStatus, 1).eq(ComSanshuoExpert::getDelFlag, 1));
+ //设置成功率
+ for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {
+ //查询成功率
+ 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));
+ }
+ }else {
+ comSanshuoExpert.setCount(0);
+ }
+
+ }
+ return R.ok(comSanshuoExperts);
+ }
+
+
+ /**
+ * 专家风采列表
+ * */
+ @Override
+ public R expertShowList(Integer level, Long id) {
+ 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 );
+ }
+ List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
+ for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {
+ //获取成功率
+ //查询成功率
+ 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));
+ }
+ }else {
+ comSanshuoExpert.setCount(0);
+ }
+ }
+ return R.ok(comSanshuoExperts);
+ }
+
+
}
--
Gitblit v1.7.1