From 195ff66ae94553cda99e0188fb9b322206aaebe3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 21:17:45 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 9af9c1f..5afa76a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -28,6 +28,7 @@
import com.panzhihua.service_community.api.ComSanShuoEventTransferRecordController;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComEventMapper;
+import com.panzhihua.service_community.dao.ComSanshuoExpertDao;
import com.panzhihua.service_community.dao.ComStreetDAO;
import com.panzhihua.service_community.entity.*;
import com.panzhihua.service_community.model.dos.ComActDO;
@@ -37,6 +38,7 @@
import org.apache.commons.lang3.RandomUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.*;
@@ -82,11 +84,12 @@
@Resource
private CommediateTypeService commediateTypeService;
+ @Resource
+ private ComSanshuoExpertDao comSanshuoExpertDao;
+
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) {
- log.info("=================当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId());
- log.info("=====================当前的userType1:="+comEvent.getUserType());
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
@@ -135,8 +138,6 @@
}
}
IPage<ComEvent> list=null;
- log.info("=====================当前的userType2:="+comEvent.getUserType());
- log.info("=====================是否专家账号查看"+isExpertCheck);
//是否为专家查看自己发布的事件
if (isExpertCheck && comEvent.getUserType()!=1){
if (nonNull(comEventMapper.listEventIds(expertId))){
@@ -798,15 +799,17 @@
comEventDetailVO.setImages(comEventRequestImageVO);
map.put("specter", specter);
map.put("eventDetail", comEventDetailVO);
+ List<ComEventTransferRecord> archiveLog=new ArrayList<>();
List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id).orderByDesc(ComEventTransferRecord::getCreateAt));
transferRecord.forEach(comEventTransferRecord -> {
List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()).notIn(ComEventResource::getStatus,(1)).eq(ComEventResource::getTransferId, comEventTransferRecord.getId()));
List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
comEventTransferRecord.setImages(ImageVO);
if (comEventTransferRecord.getEventStatus().equals(7)){
- map.put("archiveLog", comEventTransferRecord);
+ archiveLog.add(comEventTransferRecord);
}
});
+ map.put("archiveLog", archiveLog);
//迭代器迭代删除归档记录
Iterator<ComEventTransferRecord> iterator = transferRecord.iterator();
while (iterator.hasNext()){
@@ -860,7 +863,7 @@
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
if (loginUserInfoVO.getType().equals(13) || loginUserInfoVO.getType().equals(11)){
ComSanshuoExpert expert=new ComSanshuoExpert();
- //专家账号权限(后台)
+ //专家后台账号
if (nonNull(loginUserInfoVO.getPhone())){
expert = comSanShuoExpertService.getOne(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getPhone, loginUserInfoVO.getPhone()));
}else{
@@ -892,18 +895,19 @@
comEvent.setUserType(5);
comEvent.setCommunityIds(cids);
}
- if (isExpertCheck && comEvent.getUserType()!=1){
- if (nonNull(comEventMapper.listEventIds(expertId))){
+ if (isExpertCheck){
+ if(nonNull(comEventMapper.listEventIds(expertId))){
List<Long> eventIds = comEventMapper.listEventIds(expertId);
+ //获取该专家的所有事件
comEvent.setEventIds(eventIds);
-
}
}
if (nonNull(loginUserInfoVO.getAccount())){
- if (loginUserInfoVO.getAccount().equals("admin") && loginUserInfoVO.getStreetId().equals(Constants.ADMIN_STREET_ID)){
- comEvent.setUserType(null);
+ if (loginUserInfoVO.getAccount().equals("admin")){
+ comEvent.setUserType(9);
}
}
+ log.info("当前userType===="+comEvent.getUserType());
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
@@ -963,6 +967,8 @@
vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
}
}
+ vo.setExpert(comSanshuoExpertDao.selectExpertCount(indexDataDTO));
+ //查询当前级别下的专家
//折线图X轴
List<Date> dates = pastTwelveMoth();
vo.setX(getYAndM(dates));
@@ -981,13 +987,13 @@
@Override
public R eventIndexData(Integer type) {
//获取事件总数
- Integer eventCount = comEventMapper.selectCount(new QueryWrapper<ComEvent>().notIn("event_process_status", (7), (8)));
+ Integer eventCount = comEventMapper.selectCount(new QueryWrapper<ComEvent>().notIn("event_process_status",(9)));
if (type.equals(1)){
//受理级别占比
List<EventRateVO> eventRateVOS = comEventMapper.eventRate();
for (EventRateVO eventRateVO : eventRateVOS) {
if (nonNull(eventRateVO)){
- eventRateVO.setName(typeToName(eventRateVO.getType()));
+ eventRateVO.setName(typeToName(eventRateVO.getCurrentProcessType()));
if (nonNull(eventCount) && !eventCount.equals(0)){
//计算占比
eventRateVO.setRate(NumberUtil.div(eventRateVO.getCount(),eventCount,2));
@@ -1029,13 +1035,23 @@
comEventMapper.updateLog(id,comEvent.getSpecialistId());
}
+ @Override
+ public R listStreetScreen() {
+ return R.ok(comStreetDAO.selectList(new QueryWrapper<ComStreetDO>().eq("app_id", "wx0cef797390444b75")));
+ }
+
+ @Override
+ public R listCommunityScreen() {
+ return null;
+ }
+
public String typeToName(Integer type){
switch (type){
case 1:
return "行业分中心受理";
- case 2:
- return "街道调解站受理";
case 3:
+ return "街道调解站受理";
+ case 2:
return "社区调解站受理";
case 4:
return "区三说会堂受理";
--
Gitblit v1.7.1