From d5bf966a2819c7eb5d38d25727c2ebff44a920f4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 20 十月 2022 12:04:52 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 aa6f4cc..156ffe4 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;
@@ -35,8 +36,10 @@
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
+import org.checkerframework.checker.units.qual.A;
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.*;
@@ -81,6 +84,9 @@
@Resource
private CommediateTypeService commediateTypeService;
+
+ @Resource
+ private ComSanshuoExpertDao comSanshuoExpertDao;
@Override
@@ -487,7 +493,9 @@
//失败后转交三说会堂
comEvent.setSolve(0);
comEvent.setDistribution(0);
- comEvent.setConciliation(0);
+ //comEvent.setConciliation(0);
+ comEvent.setEventProcessStatus(2);
+ comEvent.setArchive(0);
//comEvent.setChangeExpert(0);
}
else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
@@ -674,6 +682,8 @@
comEvent.setCurrentOrgId(comActDO.getStreetId().toString());
//生成一次流转记录
comEvent.setCurrentEventProcessResult("专家上报到社区");
+ //更改当前处理部门
+ comEvent.setCurrentOrgName(comActDO.getName()+"调解站");
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
comEventTransferRecord.setToId(Long.parseLong(comEvent.getCurrentOrgId()));
comEventTransferRecord.setReportLevel(4);
@@ -687,6 +697,7 @@
comEvent.setSpecialistId(99999L);
//生成一次流转记录
comEvent.setCurrentEventProcessResult("专家上报到行业分中心");
+ comEvent.setCurrentOrgName(expert.getUnit());
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
comEventTransferRecord.setToId(expert.getIndustryCenterId());
comEventTransferRecord.setReportLevel(3);
@@ -699,6 +710,7 @@
//生成一次流转记录
comEvent.setReportHall(1);
comEvent.setCurrentEventProcessResult("行业分中心上报到区三说会堂");
+ comEvent.setCurrentOrgName("区三说会堂");
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
comEventTransferRecord.setToId(99999L);
comEventTransferRecord.setReportLevel(5);
@@ -712,6 +724,7 @@
comEvent.setCurrentOrgId(comActDO.getStreetId().toString());
//生成一次流转记录
comEvent.setCurrentEventProcessResult("社区报到街道");
+ comEvent.setCurrentOrgName(comStreetDAO.selectById(comActDO.getStreetId()).getName()+"调解站");
comEventTransferRecord.setFromId(comEvent.getRequestUserCommunity());
comEventTransferRecord.setToId(comActDO.getStreetId());
comEventTransferRecord.setReportLevel(2);
@@ -721,6 +734,7 @@
comEvent.setCurrentProcessType(4);
comEvent.setReportHall(1);
comEvent.setCurrentOrgId("99999");
+ comEvent.setCurrentOrgName("区三说会堂");
//生成一次流转记录
comEvent.setCurrentEventProcessResult("街道上报到区三说会堂");
comEventTransferRecord.setFromId(Long.parseLong(comEvent.getCurrentOrgId()));
@@ -794,15 +808,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()){
@@ -900,6 +916,7 @@
comEvent.setUserType(9);
}
}
+ log.info("当前userType===="+comEvent.getUserType());
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
@@ -959,6 +976,8 @@
vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
}
}
+ vo.setExpert(comSanshuoExpertDao.selectExpertCount(indexDataDTO));
+ //查询当前级别下的专家
//折线图X轴
List<Date> dates = pastTwelveMoth();
vo.setX(getYAndM(dates));
@@ -983,7 +1002,7 @@
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));
@@ -1027,21 +1046,21 @@
@Override
public R listStreetScreen() {
- return R.ok(comStreetDAO.selectList(new QueryWrapper<ComStreetDO>().eq("app_id", "wx0cef797390444b75")));
+ return R.ok(comStreetDAO.selectList(new QueryWrapper<ComStreetDO>().eq("app_id", "wx0cef797390444b75").in("name",("大宝鼎街道"),("格里坪镇"),("河门口街道"),("清香坪街道"),("陶家渡街道"),("玉泉街道"))));
}
@Override
public R listCommunityScreen() {
- return null;
+ return R.ok(comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId, "wx0cef797390444b75").in(ComActDO::getStreetId,("1552661139563876352"),("1552661132500668416"),("1552661143879815168"),("1552661138704044032"),("1552661135428292608"),("1552661136451702784"))));
}
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