From ffb18ccfe6750f4a65bce6e02e7f6edb54a5d76f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 23:45:38 +0800
Subject: [PATCH] [修改] 三说代码事件流程代码提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 5 +++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 13 +++++++++++--
5 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
index a7c0a22..f6dc2b9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -148,4 +148,5 @@
private Long pageNo;
private Long pageSize;
+ private String keyword;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
index b5713ba..99db91c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -161,4 +161,9 @@
private List<ComEventRequestImageVO> images;
@TableField(exist = false)
private String icon;
+ /**调解事件类型*/
+ @TableField(exist = false)
+ private String eventCategoryName;
+ @TableField(exist = false)
+ private String keyword;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 4e2c998..24a63b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -70,6 +70,9 @@
@Resource
private UserService userService;
+ @Resource
+ private CommediateTypeService commediateTypeService;
+
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination) {
IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination);
@@ -81,6 +84,8 @@
List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
comEvent1.setImages(comEventRequestImageVO);
comEvent1.setIcon(userService.getUserInfoByUserId(comEvent1.getRequestUserId().toString()).getData().getImageUrl());
+ ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
+ comEvent1.setEventCategoryName(category.getName());
});
return R.ok(list);
}
@@ -101,10 +106,14 @@
if (comEvent.getRequestUserCommunity() != null) {
ComActDO community = comActDAO.selectById(comEvent.getRequestUserCommunity());
comEvent.setCurrentOrgName(community.getName());
+ comEvent.setCurrentOrgId(community.getCommunityId().toString());
+ comEvent.setCurrentProcessType(2);
}
if (!StringUtils.isEmpty(comEvent.getCenterId())) {
ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
comEvent.setCurrentOrgName(center.getName());
+ comEvent.setCurrentOrgId(center.getId().toString());
+ comEvent.setCurrentProcessType(1);
}
comEvent.setUserEventStatus(2);
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.UNDO.getCode());
@@ -307,9 +316,9 @@
public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
ComEvent comEvent = baseMapper.selectById(comEventArchiveVO.getId());
if (comEvent.getEventSucceed() == 2) {
- comEvent.setEventProcessStatus(6);
+ comEvent.setEventProcessStatus(7);
} else {
- comEvent.setEventProcessStatus(5);
+ comEvent.setEventProcessStatus(6);
}
comEvent.setResult(comEventArchiveVO.getResult());
baseMapper.updateById(comEvent);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
index 73b486a..8529573 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -56,6 +56,9 @@
SELECT <include refid="columns" />
FROM com_sanshuo_event_info
<where>
+ <if test="comEvent.keyword != null">
+ ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword})
+ </if>
<if test="comEvent.eventCategory != null">
AND event_category = #{comEvent.eventCategory}
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java
index a2c3564..d0339fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java
@@ -44,7 +44,8 @@
void pageByComEvent() {
Page pagination = new Page(1, 10);
ComEvent comEvent=new ComEvent();
- comEvent.setCreateBy(1l);
+ // comEvent.setCreateBy(1l);
+ comEvent.setKeyword("学园社区");
R data = comEventService.pageByComEvent(comEvent, pagination);
log.info(JSONObject.toJSONString(data));
}
--
Gitblit v1.7.1