From b2d178b267f0eaa12a3d1fd6da8928a9ef5d366b Mon Sep 17 00:00:00 2001 From: zhangtiansen <1292933220@qq.com> Date: 星期三, 19 十月 2022 22:56:34 +0800 Subject: [PATCH] update --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 daec656..b69703e 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 @@ -36,6 +36,7 @@ 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; @@ -492,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)){ @@ -1037,12 +1040,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 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){ @@ -1055,8 +1058,6 @@ return "社区调解站受理"; case 4: return "区三说会堂受理"; - case 5: - return "专家受理"; } return null; } -- Gitblit v1.7.1