From f8466a8905261edc14c3d8015748a9a617d8fe3c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 11:10:13 +0800
Subject: [PATCH] 修改综治后台关联市平台网格员以及网格接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index 0cd7897..1219a0d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -22,8 +22,10 @@
import com.panzhihua.common.model.vos.visit.*;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_grid.dao.EventGridDataMapper;
import com.panzhihua.service_grid.dao.EventResourceMapper;
import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
+import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventResourceService;
@@ -34,6 +36,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toCollection;
import javax.annotation.Resource;
import java.util.*;
@@ -41,6 +45,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @auther lyq
@@ -59,6 +64,9 @@
@Resource
private EventResourceService eventResourceService;
+
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -177,19 +185,15 @@
@Transactional
@Override
public R delete(IdDTO idDTO, Long communityId) {
- StringBuilder rt = new StringBuilder();
- String[] idarr = idDTO.getId().split(",");
- for(String id:idarr){
- if(StringUtils.isEmpty(id)){
- continue;
+ String[] ids = idDTO.getId().split(",");
+ for(String id:ids){
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
+ if(eventVisitingTasksDO != null){
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return R.fail("您选择的走访任务中有已走访的不可删除");
+ }
+ eventVisitingTasksMapper.deleteById(id);
}
- String error = toDelete(Long.valueOf(id));
- if(!StringUtils.isEmpty(error)){
- rt.append(rt);
- }
- }
- if(!StringUtils.isEmpty(rt)){
- return R.fail("部分删除失败:"+rt.toString());
}
return R.ok();
}
@@ -202,7 +206,7 @@
if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
}
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ eventVisitingTasksMapper.deleteById(id);
return null;
}
@@ -245,7 +249,7 @@
eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));
-
+ eventVisitingTasksDetailsVO.setHappentAddress(eventVisitingTasksDO.getAddress());
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -294,8 +298,17 @@
if(count > 0){
return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
}
+
+
+
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
visitingTasksDO.setGridId(gridId);
+ //查询网格
+ EventGridDataDO gridDataDO = eventGridDataMapper.selectById(gridId);
+ if(gridDataDO != null){
+ visitingTasksDO.setGridMemberCommunity(gridDataDO.getGridCommunityId());
+ visitingTasksDO.setGridMemberStreet(gridDataDO.getGridStreetId());
+ }
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
// visitingTasksDO.setGridMemberCommunity(communityId);
// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
@@ -371,7 +384,7 @@
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
if(rt > 0){
return R.ok();
}
@@ -383,7 +396,7 @@
public R reset(IdDTO idDTO) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
return R.fail("当前状态不可恢复");
}
int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
--
Gitblit v1.7.1