From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 eb97d3e..8eee21d 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
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
+import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO;
+import com.panzhihua.service_community.entity.ComFmsTeamMember;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +55,8 @@
private ComFmsServiceRecordDAO comFmsServiceRecordDAO;
@Resource
private ComFmsServiceEvaluationsDAO comFmsServiceEvaluationsDAO;
+ @Resource
+ private ComFmsTeamMemberDAO comFmsTeamMemberDAO;
/**
* 后台新增微服务
@@ -63,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());
@@ -73,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("操作失败，请重新尝试");
@@ -111,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("操作失败，请重新尝试");
@@ -192,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();
@@ -201,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();
@@ -273,17 +292,17 @@
comFmsService.setCreatedBy(userInfo.getUserId());
comFmsService.setUpdatedBy(userInfo.getUserId());
comFmsService.setUserId(userInfo.getUserId());
- comFmsService.setUserName(userInfo.getName());
+ comFmsService.setUserName(userInfo.getNickName());
comFmsService.setPhone(userInfo.getPhone());
- int num = this.baseMapper.insert(comFmsService);
+ int num = this.baseMapper.addBracelet(comFmsService);
if (num > 0) {
ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
- comFmsServiceRecord.setServiceId(comFmsService.getId());
+ comFmsServiceRecord.setServiceId(Long.valueOf(baseMapper.getLastId()));
comFmsServiceRecord.setContent(adminDTO.getServiceContent());
comFmsServiceRecord.setImage(adminDTO.getServiceImage());
comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.TJFWSQ);
comFmsServiceRecord.setCreatedBy(userInfo.getUserId());
- comFmsServiceRecordDAO.insert(comFmsServiceRecord);
+ comFmsServiceRecordDAO.insertOneBatch(comFmsServiceRecord);
return R.ok();
}
return R.fail("操作失败，请重新尝试");
@@ -323,6 +342,13 @@
Page page = new Page<>();
page.setSize(adminDTO.getPageSize());
page.setCurrent(adminDTO.getPageNum());
+ LoginUserInfoVO userInfo = adminDTO.getUserInfo();
+ ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>()
+ .eq(ComFmsTeamMember::getPhone, userInfo.getPhone())
+ .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId()));
+ if (nonNull(comFmsTeamMember)) {
+ adminDTO.setMemberId(comFmsTeamMember.getId());
+ }
return R.ok(this.baseMapper.pageDealFmsService(page, adminDTO));
}
@@ -341,7 +367,11 @@
if (isNull(comFmsService.getMemberId())) {
return R.fail("还未分配服务人员");
}
- if (!comFmsService.getMemberId().equals(adminDTO.getUserId())) {
+ LoginUserInfoVO userInfo = adminDTO.getUserInfo();
+ ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>()
+ .eq(ComFmsTeamMember::getPhone, userInfo.getPhone())
+ .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId()));
+ if (isNull(comFmsTeamMember) || !comFmsService.getMemberId().equals(comFmsTeamMember.getId())) {
return R.fail("不是指定的分配服务人员");
}
Boolean isEnd = adminDTO.getIsEnd();
--
Gitblit v1.7.1