From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java | 6 ++++--
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 7 +++++++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 5 +++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 11 +++++++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java | 3 +++
7 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 68c7931..408f5c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -98,6 +98,9 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
@ApiModelProperty(value = "当前页数",example="1")
private Long pageNum;
@@ -145,5 +148,7 @@
@ApiModelProperty("党员活动是否个人发布 1 是 0 否")
private Integer isPerson;
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
index cdc32ec..1779942 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -82,4 +82,7 @@
@ApiModelProperty(value = "封面模式：1-小图展示 2-大图展示")
private Integer coverMode;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
index 1f7af6e..0fb9f9b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -86,6 +86,9 @@
@ApiModelProperty("社区id")
private Long communityId;
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
@ApiModelProperty("活动党员列表")
private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 72f3fae..3f73767 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -50,12 +50,19 @@
"count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
"a.participant_max,\n" +
"a.sign_up_begin,\n" +
- "a.sign_up_end\n" +
+ "a.sign_up_end,\n" +
+ "ca.name as communityName \n" +
"FROM\n" +
"com_act_activity a \n" +
"join sys_user u on a.sponsor_id=u.user_id\n" +
"left join com_act_act_sign s on a.id=s.activity_id \n"+
- " where a.community_id=#{comActActivityVO.communityId}" +
+ "left join com_act ca on a.community_id=ca.community_id \n"+
+ " where 1=1 " +
+
+ "<if test='comActActivityVO.choice == 0 '>" +
+ "AND a.community_id=#{comActActivityVO.communityId}\n" +
+ " </if> " +
+
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>" +
" and a.activity_name like concat(#{comActActivityVO.activityName},'%') \n" +
" </if> " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index 0042cb5..a8ad7c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -35,8 +35,10 @@
"FROM\n" +
"com_act_dyn d\n" +
"LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
- "WHERE\n" +
- "d.community_id=#{comActDynVO.communityId}\n" +
+ "WHERE 1=1 \n" +
+ "<if test='comActDynVO.choice == 0 '>" +
+ "and d.community_id=#{comActDynVO.communityId}\n" +
+ " </if> " +
"<if test='comActDynVO.title != null and comActDynVO.title.trim() != ""'>" +
"AND d.title like concat(#{comActDynVO.title},'%') \n" +
" </if> " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
index 47463fc..ce0922b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -143,4 +143,12 @@
int updateStatusToActiveOrEnd();
@Select("select type,name from sys_user where user_id=#{createBy}")
LoginUserInfoVO selectUserInfoByUserId(Long createBy);
+
+ /**
+ * 根据社区id查询社区名称
+ * @param communityId 社区id
+ * @return 社区名字
+ */
+ @Select("select name from com_act where community_id=#{communityId}")
+ String selectCommunityNameByCommunityId(Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index d0ad472..69e93d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -49,6 +49,7 @@
@Resource
private ComPbMemberDAO comPbMemberDAO;
+
/**
* 查询某个党员加入的所有党员活动
*
@@ -158,6 +159,12 @@
partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
partyBuildingActivityVO.setIsPerson(isPerson);
partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());
+
+ //查询社区名称
+ if(partyBuildingActivityVO.getCommunityId() != null){
+ partyBuildingActivityVO.setCommunityName(comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
+ }
+
return R.ok(partyBuildingActivityVO);
}
--
Gitblit v1.7.1