From 3c3010efa34de5e16f43ab03b5bb1dd84110f8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 22 十一月 2021 11:08:08 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
index 121dc4a..1c2ff77 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -241,6 +241,7 @@
if(!list.isEmpty()){
comActReserveDO=list.get(0);
}
+ comActReserveCommitVO.setId(comActReserveDO.getId());
if(comActReserveDO!=null){
List<QuestnaiteSubVO> questnaiteSubVOS = JSON.parseArray(comActReserveCommitVO.getJsonObject(),QuestnaiteSubVO.class);
if(!questnaiteSubVOS.isEmpty()){
@@ -316,21 +317,16 @@
comActReserveMapper.updateById(comActReserveDO);
//新增用户答题记录
ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO();
- userAnswerDO.setContent(comActReserveCommitVO.getContent());
- userAnswerDO.setName(comActReserveCommitVO.getName());
+ userAnswerDO.setContent(comActReserveCommitVO.getContent()!=null?comActReserveCommitVO.getContent():"");
+ userAnswerDO.setName(comActReserveCommitVO.getName()!=null?comActReserveCommitVO.getName():"");
userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId());
- userAnswerDO.setPhone(comActReserveCommitVO.getPhone());
+ userAnswerDO.setPhone(comActReserveCommitVO.getPhone()!=null?comActReserveCommitVO.getPhone():"");
userAnswerDO.setReserveId(questId);
- userAnswerDO.setReserveTime(comActReserveCommitVO.getReserveTime());
- userAnswerDO.setType(comActReserveCommitVO.getType());
+ userAnswerDO.setReserveTime(comActReserveCommitVO.getReserveTime()!=null?comActReserveCommitVO.getReserveTime():new Date());
+ userAnswerDO.setType(comActReserveCommitVO.getType()!=null? comActReserveCommitVO.getType() : 2);
userAnswerDO.setCreateAt(nowDate);
userAnswerDO.setJsonObject(comActReserveCommitVO.getJsonObject());
- if(comActReserveCommitVO.getType()==ComActReserveRecordDO.type.yy){
- userAnswerDO.setStatus(ComActReserveRecordDO.status.dcl);
- }
- else {
- userAnswerDO.setStatus(ComActReserveRecordDO.status.cg);
- }
+ userAnswerDO.setStatus(ComActReserveRecordDO.status.cg);
comActReserveRecordService.saveOrUpdate(userAnswerDO);
//给答题记录赋值预约登记记录id
@@ -346,9 +342,9 @@
comActReserveOperationRecordDO.setCreateAt(DateUtil.date());
comActReserveOperationRecordDO.setReserveTime(comActReserveCommitVO.getReserveTime());
comActReserveOperationRecordDO.setReserveContent(COMMIT);
- comActReserveOperationRecordDO.setPhone(comActReserveCommitVO.getPhone());
+ //comActReserveOperationRecordDO.setPhone(comActReserveCommitVO.getPhone());
comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.ytj);
- comActReserveOperationRecordDO.setRemark(comActReserveCommitVO.getContent());
+ //comActReserveOperationRecordDO.setRemark(comActReserveCommitVO.getContent());
comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO);
return R.ok("提交成功");
}
--
Gitblit v1.7.1