From aba489c74e27e36ece27c5e1b8f591560775cf90 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 08 七月 2021 10:12:28 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 a764df9..4751bc3 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,8 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
+ 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){
@@ -403,7 +405,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 +433,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());
@@ -456,7 +455,7 @@
});
}
if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
- taskCompleteDTO.getVosList().forEach(e->{
+ taskCompleteDTO.getVideoList().forEach(e->{
createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
});
}
@@ -468,7 +467,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