From 3c917ce09089dda25db584f31e7f44527d4be455 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 5198dd9..8aea961 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;
@@ -217,7 +218,9 @@
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
- eventVisitingTasksDetailsVO.setOption(jsonObject.get("check") == null ?null:jsonObject.get("check").toString());
+ if(jsonObject != null && jsonObject.get("check") != null){
+ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
+ }
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -225,12 +228,12 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R add(String ids, Long communityId, Long userId) throws Exception {
+ 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("网格员不存在");
}
- String[] id = ids.split(",");
+ String[] id = idDTO.getId().split(",");
for(String idstr:id){
if(StringUtils.isEmpty(idstr)){
continue;
@@ -246,8 +249,6 @@
IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
return page.getRecords();
}
-
-
private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{
--
Gitblit v1.7.1