From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
index 94ccd4b..2934883 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
@@ -113,6 +113,11 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ String phone = comActMessageVO.getPhone();
+ if(ObjectUtils.isEmpty(phone)) {
+ IPage<PageComActMessageVO> iPage=null;
+ return R.ok(iPage);
+ }
IPage<PageComActMessageVO> iPage = comActMessageDAO.pageSendMeMessageApplets(page, comActMessageVO);
List<PageComActMessageVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
@@ -149,6 +154,22 @@
records.forEach(comActMessageVO1 -> {
Long id = comActMessageVO1.getId();
List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
+ if(list!=null&& list.size()>0) {
+ list.forEach(vo -> {
+ Long type = comActMessageVO1.getType();
+ if (type == 1) {
+ ComPbServiceTeamVO team = comActMessageDAO.selectComPbServiceTeamById(comActMessageVO1.getSendtoUserId());
+ if (!ObjectUtils.isEmpty(team)) {
+ vo.setUserJob(team.getJob());
+ }
+ } else if (type == 2) {
+ PartyCommitteeVO party = comActMessageDAO.selectPartyCommitteeById(comActMessageVO1.getSendtoUserId());
+ if (!ObjectUtils.isEmpty(party)) {
+ vo.setUserJob(party.getPosition());
+ }
+ }
+ });
+ }
comActMessageVO1.setBackList(list);
});
iPage.setRecords(records);
@@ -189,6 +210,7 @@
records.forEach(comActMessageVO1 -> {
Long id = comActMessageVO1.getId();
List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
+
comActMessageVO1.setBackList(list);
});
iPage.setRecords(records);
@@ -220,4 +242,15 @@
return R.ok();
}
+ @Override
+ public R detailMessage(Long id) {
+ ComActMessageDO comActMessageDO = comActMessageDAO.selectById(id);
+ PageComActMessageVO vo=new PageComActMessageVO();
+ BeanUtils.copyProperties(comActMessageDO, vo);
+ List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
+ vo.setBackList(list);
+ // TODO Auto-generated method stub
+ return R.ok(vo);
+ }
+
}
--
Gitblit v1.7.1