From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 fdc397b..0cd7897 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
@@ -231,6 +231,10 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
+ 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){
@@ -262,7 +266,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);
}
@@ -279,7 +283,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)){
@@ -291,6 +295,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()));
@@ -403,7 +408,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();
@@ -431,11 +436,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());
@@ -468,7 +470,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