From 8c1ad63332a511455c65fb84d8e930f57934198a Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期四, 24 六月 2021 15:07:54 +0800
Subject: [PATCH] 走访任务
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 c9c64f1..32a10c3 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
@@ -224,11 +224,11 @@
return ;
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
- visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
- visitingTasksDO.setGridMemberCommunity(communityId);
- visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
- visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
- visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
+// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
+// visitingTasksDO.setGridMemberCommunity(communityId);
+// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
+// visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
+// visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
visitingTasksDO.setVisiterName(map.get("name").toString());
visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
@@ -280,13 +280,23 @@
return R.fail();
}
+ @Transactional(rollbackFor = Exception.class)
@Override
- public R start(Long id) {
+ public synchronized R start(Long id,Long userId) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可开始走访");
}
- int rt = eventVisitingTasksMapper.start(id,EventTasksStatusEnum.JXZ.getCode());
+ Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
+ EventVisitingTasksDO start = new EventVisitingTasksDO();
+ start.setId(id);
+ start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
+ start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
+ start.setGridMember(Long.valueOf(map.get("user_id").toString()));
+ start.setGridMemberName(map.get("name").toString());
+ start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
+ start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
+ int rt = eventVisitingTasksMapper.start(start);
if(rt > 0){
return R.ok();
}
@@ -305,6 +315,22 @@
}else{
taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode());
}
+
+ if(!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())){
+ taskCompleteDTO.getImgList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,1,e);
+ });
+ }
+ if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){
+ taskCompleteDTO.getVosList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,2,e);
+ });
+ }
+ if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
+ taskCompleteDTO.getVosList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,3,e);
+ });
+ }
int rt = eventVisitingTasksMapper.complete(taskCompleteDTO);
if(rt > 0){
return R.ok();
@@ -312,4 +338,14 @@
return R.fail();
}
+ private void createResource(Long id, Long dellUserId, int classification, int type,String url) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setRefId(id);
+ eventResourceDO.setClassification(classification);
+ eventResourceDO.setType(type);
+ eventResourceDO.setCreateBy(dellUserId);
+ eventResourceDO.setUrl(url);
+ eventResourceMapper.insert(eventResourceDO);
+ }
+
}
--
Gitblit v1.7.1