From 3d2dccde51582e3a58d2afe4731ec1ad04229ee4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 09:25:46 +0800
Subject: [PATCH] 预约登记功能修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index c12f6cb..72b059a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -65,7 +65,7 @@
comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId());
comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId());
comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br);
- comActReserveOperationRecordDO.setReserveTime(DateUtil.date());
+ comActReserveOperationRecordDO.setCreateAt(DateUtil.date());
comActReserveOperationRecordDO.setReserveContent(CANCEL);
comActReserveOperationRecordDO.setPhone(comActReserveRecordDO.getPhone());
comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.qx);
@@ -127,7 +127,7 @@
//添加操作记录
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,reserveRecordDO.getId(),reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId);
+ ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId,null);
}
});
return R.ok();
@@ -215,20 +215,21 @@
makeHandleDTO.getIds().forEach(id -> {
ComActReserveRecordDO reserveRecordDO = this.baseMapper.selectById(id);
if(reserveRecordDO != null){
+ Date reserveTime = DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format);
//判断处理是否通过
if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId);
+ ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId,reserveTime);
}else if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.no)){
reserveRecordDO.setStatus(ComActReserveRecordDO.status.sb);
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId);
+ ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId,null);
}
reserveRecordDO.setActRemark(remark);
- reserveRecordDO.setReserveTime(DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format));
+ reserveRecordDO.setReserveTime(reserveTime);
reserveRecordDO.setUpdateAt(nowDate);
reserveRecordDO.setUpdateBy(userId);
updateList.add(reserveRecordDO);
--
Gitblit v1.7.1