From f58561357b9d7a47cf32e1aa368498677b043f30 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 09:44:00 +0800
Subject: [PATCH] 预约登记代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7dbf26e..08cdbe0 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
@@ -215,15 +215,15 @@
if(reserveRecordDO != null){
//判断处理是否通过
if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
- reserveRecordDO.setStatus(ComActReserveRecordDO.status.yycg);
+ reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.yycg,userId);
+ ,"社区管理员处理预约成功",remark,ComActReserveOperationRecordDO.status.cg,userId);
}else if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.no)){
- reserveRecordDO.setStatus(ComActReserveRecordDO.status.yysb);
+ reserveRecordDO.setStatus(ComActReserveRecordDO.status.sb);
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,id,reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.yysb,userId);
+ ,"社区管理员处理预约失败",remark,ComActReserveOperationRecordDO.status.sb,userId);
}
reserveRecordDO.setActRemark(remark);
reserveRecordDO.setReserveTime(DateUtils.stringToDate(makeHandleDTO.getMakeTime(),DateUtils.ymdhms_format));
--
Gitblit v1.7.1