From 780bf6eb11cc2d2d3c0feb4637e3daefdffccf2c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 07 七月 2022 11:26:24 +0800
Subject: [PATCH] 问题清单bug处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 13 +++++++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 4 ++++
4 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
index e008a9a..9bae473 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -129,5 +129,6 @@
private String helpOrgContent;
@ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
private Integer belongType;
+ private Long solveUnitId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
index 84ed8c8..f479bd1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -168,6 +168,10 @@
private Long solveUnitId;
+ private String realServiceTime;
+
+ private String targetServiceTime;
+
@Override
public String toString() {
return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 3d4a3b0..42b9d5e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.PageVO;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
@@ -77,6 +78,8 @@
private ComActNeighborCircleDAO comActNeighborCircleDAO;
@Resource
private ComActActivityDAO comActActivityDAO;
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
/**
* 分页查询邻里圈列表
*
@@ -710,6 +713,16 @@
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
vo.setImageUrl(user.getImageUrl());
+ if(comActNeighborCircleDO.getSolveId()!=null){
+ AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
+ comActNeighborCircleDO.setSolveName(user1.getName());
+ }
+ if(comActNeighborCircleDO.getSolveUnitId()!=null){
+ ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(comActNeighborCircleDO.getSolveUnitId());
+ if(comPbCheckUnit!=null){
+ comActNeighborCircleDO.setSolveName(comPbCheckUnit.getName());
+ }
+ }
// 查询话题名称
if (comActNeighborCircleDO.getTopicId() != null) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
index b3ce0fc..383b2cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -47,7 +47,7 @@
left join sys_user as su on su.user_id = canc.release_id
left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
left join com_act as ca on ca.community_id = canc.community_id
- where is_del = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
+ where is_del = 2 and canc.status = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
<if test='neighborCircleAppDTO.topicId != null '>
and canc.topic_id = #{neighborCircleAppDTO.topicId}
</if>
--
Gitblit v1.7.1