From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 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 28e62d4..16880f7 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
@@ -177,19 +177,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 +198,7 @@
if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
}
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ eventVisitingTasksMapper.deleteById(id);
return null;
}
@@ -231,7 +227,10 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- eventVisitingTasksDetailsVO.setVisiterPhone(eventVisitingTasksDO.getVisiterTele());
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
+ eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ }
JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
if(jsonObject != null && jsonObject.get("check") != null){
@@ -263,7 +262,7 @@
if(StringUtils.isEmpty(idstr)){
continue;
}
- String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
+ String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
if(!StringUtils.isEmpty(error)){
rt.append(error);
}
@@ -280,7 +279,7 @@
return page.getRecords();
}
- private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
+ private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{
Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
if(CollectionUtils.isEmpty(map)){
@@ -292,6 +291,7 @@
return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+ visitingTasksDO.setGridId(gridId);
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
// visitingTasksDO.setGridMemberCommunity(communityId);
// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
@@ -367,7 +367,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();
}
@@ -379,7 +379,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());
@@ -404,7 +404,7 @@
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());
+ start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
int rt = eventVisitingTasksMapper.start(start);
if(rt > 0){
return R.ok();
@@ -432,11 +432,8 @@
EventVisitingTasksDO complete = new EventVisitingTasksDO();
BeanUtils.copyProperties(taskCompleteDTO,complete);
- if(taskCompleteDTO.getException() == 0){
- complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
- }else{
- complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
- }
+ complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
+
complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
@@ -469,7 +466,7 @@
complete.setGridMemberName(map.get("name").toString());
complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
- int rt = eventVisitingTasksMapper.complete(complete);
+ int rt = eventVisitingTasksMapper.updateById(complete);
if(rt > 0){
return R.ok();
}
--
Gitblit v1.7.1