From d890012cee164443d15c080aaa9b8a86badec01a Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:52:54 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 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 fee4da7..a300fa5 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
@@ -76,13 +76,13 @@
expert.setId(Snowflake.getId());
expert.setCreateTime(new Date());
if (expert.getLevel()==2){
- expert.setIndustryCenterId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setIndustryCenterId(Long.parseLong(expert.getUnitId()));
expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==3){
- expert.setStreetId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setStreetId(Long.parseLong(expert.getUnitId()));
expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==4){
- expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setCommunityId(Long.parseLong(expert.getUnitId()));
expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
}
expert.setStatus(1);
@@ -254,28 +254,28 @@
* 小程序获取专家列表
* */
@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));
- }
+ public R selectExpertList(Integer type,Long id,Long cid) {
+ List<ComSanshuoExpert> list=new ArrayList<>();
+ if (type.equals(1)){
+ //行业分中心下属专家
+ list=comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().
+ eq(ComSanshuoExpert::getStatus, 1).
+ eq(ComSanshuoExpert::getDelFlag,1 ).
+ eq(ComSanshuoExpert::getIndustryCenterId, id));
+ }else {
+ if (nonNull(id)){
+ list=comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().
+ eq(ComSanshuoExpert::getStatus, 1).
+ eq(ComSanshuoExpert::getDelFlag,1 ).
+ eq(ComSanshuoExpert::getCommunityId, id));
}else {
- comSanshuoExpert.setCount(0);
+ list=comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().
+ eq(ComSanshuoExpert::getStatus, 1).
+ eq(ComSanshuoExpert::getDelFlag,1 ).
+ eq(ComSanshuoExpert::getCommunityId,cid ));
}
-
}
- return R.ok(comSanshuoExperts);
+ return R.ok(list);
}
--
Gitblit v1.7.1