From 83479607bc5ffea9ad5e9be36088c7f742ba00d9 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 11:03:17 +0800
Subject: [PATCH] 实有人口导入，走访导出
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 051eb33..a00d99b 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
@@ -11,6 +11,7 @@
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.helper.AESUtil;
@@ -175,19 +176,34 @@
@Transactional
@Override
- public R delete(String ids, Long communityId) {
- String[] idarr = ids.split(",");
+ 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;
}
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id",Long.valueOf(id)).eq("grid_member_community",communityId));
- if(eventVisitingTasksDO == null){
- throw new RuntimeException("无权限");
+ String error = toDelete(Long.valueOf(id));
+ if(!StringUtils.isEmpty(error)){
+ rt.append(rt);
}
eventVisitingTasksMapper.deleteById(Long.valueOf(id));
}
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分删除失败:"+rt.toString());
+ }
return R.ok();
+ }
+
+ private String toDelete(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null){
+ return "["+id+"]数据不存在;";
+ }
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
+ }
+ return null;
}
@Override
@@ -215,7 +231,11 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
+ JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
+ if(jsonObject != null && jsonObject.get("check") != null){
+ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
+ }
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -223,19 +243,27 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R add(String ids, Long communityId, Long userId) throws Exception {
- Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
- if(CollectionUtils.isEmpty(map)){
- return R.fail("网格员不存在");
- }
- String[] id = ids.split(",");
+ public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
+
+// Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
+// if(CollectionUtils.isEmpty(map)){
+// return R.fail("网格员不存在");
+// }
+
+ StringBuilder rt = new StringBuilder();
+ String[] id = idDTO.getId().split(",");
for(String idstr:id){
if(StringUtils.isEmpty(idstr)){
continue;
}
- addVisitingTask(Long.valueOf(idstr),map,communityId,userId);
+ String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
+ if(!StringUtils.isEmpty(error)){
+ rt.append(error);
+ }
}
-
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分新增失败"+rt.toString());
+ }
return R.ok();
}
@@ -245,17 +273,16 @@
return page.getRecords();
}
+ private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
-
- private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{
+ Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
+ if(CollectionUtils.isEmpty(map)){
+ return "被访问人ID["+id+"]不存在;";
+ }
Integer count = eventVisitingTasksMapper.countNoneComplete(id);
if(count > 0){
- return;
- }
- Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
- if(CollectionUtils.isEmpty(map)){
- return ;
+ return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
@@ -293,6 +320,7 @@
}
eventVisitingTasksMapper.insert(visitingTasksDO);
+ return null;
}
private List<String> getOption(String label) {
--
Gitblit v1.7.1