From 9f69e3d2248902722c2a489ba9e14c3c24e4600d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 12:05:37 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
index 7f8b07b..d1c4af4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
@@ -67,9 +67,11 @@
public R addFmsServiceAdmin(AddFmsServiceAdminDTO adminDTO) {
ComFmsService comFmsService = new ComFmsService();
BeanUtils.copyProperties(adminDTO, comFmsService);
- comFmsService.setServiceStatus(ComFmsService.ServiceStatus.dpj);
+ comFmsService.setServiceStatus(ComFmsService.ServiceStatus.ywc);
+ comFmsService.setApprovalAt(new Date());
int num = this.baseMapper.insert(comFmsService);
if (num > 0) {
+ //服务记录
ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
comFmsServiceRecord.setServiceId(comFmsService.getId());
comFmsServiceRecord.setContent(adminDTO.getServiceProcess());
@@ -77,6 +79,13 @@
comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.WCFW);
comFmsServiceRecord.setCreatedBy(adminDTO.getCreatedBy());
comFmsServiceRecordDAO.insert(comFmsServiceRecord);
+ //默认好评
+ ComFmsServiceEvaluations evaluation = new ComFmsServiceEvaluations();
+ evaluation.setServiceId(comFmsService.getId());
+ evaluation.setStarLevel(5);
+ evaluation.setEvaluateContent("系统默认好评！");
+ evaluation.setUserId(comFmsService.getUserId());
+ comFmsServiceEvaluationsDAO.insert(evaluation);
return R.ok();
}
return R.fail("操作失败，请重新尝试");
@@ -115,14 +124,12 @@
comFmsService.setUpdatedBy(adminDTO.getUpdatedBy());
int num = this.baseMapper.updateById(comFmsService);
if (num > 0) {
- if (adminDTO.getIsPass()) {
- ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
- comFmsServiceRecord.setServiceId(comFmsService.getId());
- comFmsServiceRecord.setContent(adminDTO.getContent());
- comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.SHTG);
- comFmsServiceRecord.setCreatedBy(adminDTO.getUpdatedBy());
- comFmsServiceRecordDAO.insert(comFmsServiceRecord);
- }
+ ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
+ comFmsServiceRecord.setServiceId(comFmsService.getId());
+ comFmsServiceRecord.setContent(adminDTO.getContent());
+ comFmsServiceRecord.setStage(adminDTO.getIsPass() ? ComFmsServiceRecord.Stage.SHTG : ComFmsServiceRecord.Stage.HSBTG);
+ comFmsServiceRecord.setCreatedBy(adminDTO.getUpdatedBy());
+ comFmsServiceRecordDAO.insert(comFmsServiceRecord);
return R.ok();
}
return R.fail("操作失败，请重新尝试");
@@ -196,7 +203,7 @@
comFmsService.setCommunityId(communityId);
comFmsService.setCreatedBy(userId);
comFmsService.setUpdatedBy(userId);
- comFmsService.setServiceStatus(ComFmsService.ServiceStatus.dpj);
+ comFmsService.setServiceStatus(ComFmsService.ServiceStatus.ywc);
int num = this.baseMapper.insert(comFmsService);
if (num > 0) {
ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
@@ -205,6 +212,14 @@
comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.WCFW);
comFmsServiceRecord.setCreatedBy(userId);
comFmsServiceRecordDAO.insert(comFmsServiceRecord);
+
+ //默认好评
+ ComFmsServiceEvaluations evaluation = new ComFmsServiceEvaluations();
+ evaluation.setServiceId(comFmsService.getId());
+ evaluation.setStarLevel(5);
+ evaluation.setEvaluateContent("系统默认好评！");
+ evaluation.setUserId(comFmsService.getUserId());
+ comFmsServiceEvaluationsDAO.insert(evaluation);
}
});
return R.ok();
--
Gitblit v1.7.1