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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 661630f..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
@@ -494,7 +494,8 @@
comEvent.setSolve(0);
comEvent.setDistribution(0);
//comEvent.setConciliation(0);
- comEvent.setEventProcessStatus(3);
+ comEvent.setEventProcessStatus(2);
+ comEvent.setArchive(0);
//comEvent.setChangeExpert(0);
}
else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
@@ -681,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);
@@ -694,6 +697,7 @@
comEvent.setSpecialistId(99999L);
//生成一次流转记录
comEvent.setCurrentEventProcessResult("专家上报到行业分中心");
+ comEvent.setCurrentOrgName(expert.getUnit());
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
comEventTransferRecord.setToId(expert.getIndustryCenterId());
comEventTransferRecord.setReportLevel(3);
@@ -706,6 +710,7 @@
//生成一次流转记录
comEvent.setReportHall(1);
comEvent.setCurrentEventProcessResult("行业分中心上报到区三说会堂");
+ comEvent.setCurrentOrgName("区三说会堂");
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
comEventTransferRecord.setToId(99999L);
comEventTransferRecord.setReportLevel(5);
@@ -719,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);
@@ -728,6 +734,7 @@
comEvent.setCurrentProcessType(4);
comEvent.setReportHall(1);
comEvent.setCurrentOrgId("99999");
+ comEvent.setCurrentOrgName("区三说会堂");
//生成一次流转记录
comEvent.setCurrentEventProcessResult("街道上报到区三说会堂");
comEventTransferRecord.setFromId(Long.parseLong(comEvent.getCurrentOrgId()));
@@ -1039,12 +1046,12 @@
@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 R.ok(comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId, "wx0cef797390444b75")));
+ 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){
--
Gitblit v1.7.1