From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到，问题清单，需求清单，资源清单接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 35 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java | 11
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml | 45 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 3
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 34 +
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java | 42 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 18 +
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java | 23 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 196 ++++++-----
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 144 ++++----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml | 27 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 58 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 27 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml | 5
43 files changed, 607 insertions(+), 296 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
index 88d9f47..e05b5c5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
@@ -11,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
/**
@@ -76,4 +78,13 @@
comPbCheckUnit.setCommunityId(this.getCommunityId());
return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
}
+
+ @ApiOperation(value = "新增报道单位")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComPbCheckUnitDto comPbCheckUnit) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ comPbCheckUnit.setCreateAt(new Date());
+ comPbCheckUnit.setCreateBy(this.getUserId());
+ return this.comPbCheckUnitService.insert(comPbCheckUnit);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 3df433d..d79aa0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -208,6 +208,7 @@
@GetMapping("topic/list")
public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero
+ ,@RequestParam(value = "belongType",defaultValue = "1",required = false) Integer belongType
,@RequestParam(value = "name",defaultValue = "",required = false) String name) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
@@ -216,7 +217,7 @@
if(isZero == null){
isZero = 2;
}
- return communityService.getNeighborTopicByApp(communityId,isZero,name);
+ return communityService.getNeighborTopicByApp(communityId,isZero,name,belongType);
}
@ApiOperation(value = "用户新增邻里圈话题")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index 2e49d68..f5a68ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -7,6 +7,8 @@
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -50,6 +52,8 @@
private CheckService checkService;
@Resource
private ComPbCheckUnitFeign pbCheckUnitFeign;
+ @Resource
+ private CommunityService communityService;
public static void main(String[] args) {
Date date = new Date();
@@ -118,7 +122,7 @@
}
PartyBuildingComPbDynVO partyBuildingComPbDynVO =
- JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
if (userId != null) {
ComPbDynUserVO comPbDynUserVO = new ComPbDynUserVO();
comPbDynUserVO.setCreateAt(new Date());
@@ -173,7 +177,7 @@
if (R.isOk(r) && activitySignUpDTO.getType().intValue() == 1) {
R r2 = partyBuildingService.activityinfo(id, userId);
PartyBuildingActivityVO partyBuildingActivityVO =
- JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(1);
@@ -182,7 +186,7 @@
sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
sysUserNoticeVO
- .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
+ .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
sysUserNoticeVO.setBusinessId(id);
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -255,9 +259,9 @@
@ApiOperation(value = "编辑党员")
@PutMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- if(partyBuildingMemberVO.getIsPb()!=null){
+ if (partyBuildingMemberVO.getIsPb() != null) {
Long id = partyBuildingMemberVO.getId();
- if(partyBuildingMemberVO.getIsPb()==1){
+ if (partyBuildingMemberVO.getIsPb() == 1) {
if (null == id || 0 == id) {
return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
}
@@ -271,11 +275,12 @@
@ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
@PostMapping("/comPbCheckUnit/list")
public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
- if(comPbCheckUnit.getCommunityId() == null){
+ if (comPbCheckUnit.getCommunityId() == null) {
comPbCheckUnit.setCommunityId(this.getCommunityId());
}
return pbCheckUnitFeign.queryByList(comPbCheckUnit);
}
+
@OperLog(operModul = "党员管理", operType = 1)
@ApiOperation(value = "新增党员")
@PostMapping("addpartybuildingmember")
@@ -284,8 +289,23 @@
partyBuildingMemberVO.setCommunityId(communityId);
R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
if (R.isOk(r)) {
- R r1 = userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard());
+ R r1 = userService.updateUserPartyStatus(this.getUserId());
}
return r;
}
+
+ @OperLog(operModul = "党员管理", operType = 1)
+ @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
+ @PostMapping("/page/member")
+ public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ partyBuildingMemberVO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
+ }
+
+ @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
+ @GetMapping("/community/list")
+ public R getCommunityLists() {
+ return communityService.getCommunityLists();
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java
index 49903b1..7ef8bf0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java
@@ -77,5 +77,11 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java
index 80f3ddd..ccb5bf6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java
@@ -74,5 +74,11 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
index 7dc3d35..c14e2fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
@@ -40,6 +40,18 @@
@ApiModelProperty("用户新增邻里圈话题")
private String topicName;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
/**
* 是否需要审核(1.是 2.否)
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
index 2a79423..2b38ce5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
@@ -27,4 +27,19 @@
@ApiModelProperty("话题id")
private Long id;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ @ApiModelProperty("话题logo")
+ private String logo;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
index 866e807..869a4ea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
@@ -21,4 +21,16 @@
@ApiModelProperty("邻里圈话题名称")
private String name;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
index 199b98f..cf871b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -45,4 +45,6 @@
@ApiModelProperty("关键词")
private String keyWord;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
index ac1168f..66d2f93 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -34,4 +34,16 @@
@ApiModelProperty("关键词")
private String keyWord;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
index 4a8d9e8..ee017c5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
@@ -27,4 +27,16 @@
@ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
private Integer status;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
index 615f77d..1f60b5a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
@@ -74,4 +74,16 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
+
+ @ApiModelProperty(value = "所属社区名称")
+ private String communityName;
+
+ @ApiModelProperty(value = "党员人数")
+ private Integer count;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
index 3132fca..7bb7aad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
@@ -18,6 +18,18 @@
@ApiModelProperty("发布图片")
private String releaseImages;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
@ApiModelProperty(value = "当前登陆人id", hidden = true)
private Long userId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
index 68a8df4..6225467 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -74,4 +74,6 @@
@ApiModelProperty("点赞数")
private Integer lastFabulousNum;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
index 6c7e0cb..0e67fa4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -110,4 +110,7 @@
@ApiModelProperty("热度")
private Long hotNum;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
index 683a1e5..a0d7916 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
@@ -24,4 +24,6 @@
@ApiModelProperty("邻里圈数量")
private Integer count;
+ @ApiModelProperty("话题logo")
+ private String logo;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
index 24906ae..197fae1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
@@ -24,6 +24,18 @@
@ApiModelProperty("驳回原因")
private String refuseReason;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
/**
* 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
index 2b606ca..660afd0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -72,7 +72,7 @@
@ApiModelProperty(value = "职能")
private String function;
- @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ @ApiModelProperty(value = "特长类别（1.统计调查 2.法律援助 3.志愿活动 4.尊老爱幼 5.宣讲宣教 6.心理关爱 7.设施维修 8.其他）")
private Integer specialtyCategory;
@ApiModelProperty(value = "特长描述")
@@ -86,4 +86,10 @@
@ApiModelProperty(value = "活动积分")
private Integer partyInterval;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e872e3f..492d3f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5019,7 +5019,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType);
/**
* 综治后台-查询社区列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index ee328b3..32e0a58 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -602,4 +602,12 @@
*/
@GetMapping("/partybuildIng/checkMember")
R checkMember(@RequestParam("idCard")String idCard);
+
+ /**
+ * 小程序分页查询党员列表
+ * @param partyBuildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ @PostMapping("/partybuildIng/getPagePbMember")
+ R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index aaefa08..09480d4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -34,7 +34,7 @@
/**
* 新增微信用户
- *
+ *
* @param openid
* 微信小程序标志
* @param sessionKey
@@ -49,7 +49,7 @@
/**
* 维护小程序用户基本信息 头像 昵称 性别
- *
+ *
* @param userId
* 数据库用户ID
* @param nickName
@@ -66,7 +66,7 @@
/**
* 维护微信用户手机号
- *
+ *
* @param userId
* 数据库ID
* @param purePhoneNumber
@@ -79,7 +79,7 @@
/**
* 获取平台用户
- *
+ *
* @param userId
* 用户ID
* @return 平台用户信息
@@ -89,7 +89,7 @@
/**
* 获取平台用户
- *
+ *
* @param userName
* 登录账户+_type
* @return 平台用户信息
@@ -99,7 +99,7 @@
/**
* 获取平台所有权限路径url
- *
+ *
* @return 所有url
*/
@PostMapping("/role/getAllMenu")
@@ -116,7 +116,7 @@
/**
* 查询社区的党委角色
- *
+ *
* @param communityId
* 社区id
* @return 党委角色列表
@@ -126,7 +126,7 @@
/**
* 修改用户登录密码
- *
+ *
* @param changePasswordVO
* 新密码
* @return 修改结果
@@ -156,7 +156,7 @@
/**
* 某社区后台人员查询
- *
+ *
* @param param
* 名字
* @param communityId
@@ -168,7 +168,7 @@
/**
* 微心愿搜索社区团队人员列表
- *
+ *
* @param param
* 请求参数
* @param communityId
@@ -180,7 +180,7 @@
/**
* 分页查询人脸识别
- *
+ *
* @param loginUserInfoVO
* 查询参数
* @return 分页集合
@@ -190,7 +190,7 @@
/**
* 编辑人脸采集数据通过、驳回、删除
- *
+ *
* @param loginUserInfoVO
* 操作信息
* @return 操作结果
@@ -200,7 +200,7 @@
/**
* 分页查询人口管理
- *
+ *
* @param userInfoVO
* 查询参数
* @return 分页数据
@@ -210,7 +210,7 @@
/**
* 查询所有人员标签
- *
+ *
* @return 标签集合
*/
@PostMapping("listtag")
@@ -218,7 +218,7 @@
/**
* 人员详情
- *
+ *
* @param userId
* 用户id
* @return 人员详情
@@ -228,7 +228,7 @@
/**
* 设置用户标签
- *
+ *
* @param loginUserInfoVO
* 标签信息
* @return 设置结果
@@ -238,7 +238,7 @@
/**
* 修改用户志愿者状态
- *
+ *
* @param phone
* 志愿者手机号
* @param type
@@ -249,7 +249,7 @@
/**
* 修改用户志愿者状态
- *
+ *
* @param userId
* 用户ID
* @param type
@@ -260,7 +260,7 @@
/**
* 用户绑定社区、小区
- *
+ *
* @param loginUserInfoVO
* 社区小区数据
* @return 绑定结果
@@ -270,7 +270,7 @@
/**
* 用户实名认证
- *
+ *
* @param loginUserInfoVO
* 认证数据
* @return 认证结果
@@ -280,7 +280,7 @@
/**
* 修改用户手机号
- *
+ *
* @param userPhoneVO
* 手机号信息
* @return 修改结果
@@ -290,7 +290,7 @@
/**
* 修改用户信息
- *
+ *
* @param loginUserInfoVO
* 修改内容
* @return 修改结果
@@ -300,7 +300,7 @@
/**
* 家庭成员列表
- *
+ *
* @param userId
* 登录用户
* @return 成员集合
@@ -311,7 +311,7 @@
/**
* 新增家庭成员
- *
+ *
* @param comMngFamilyInfoVO
* 家庭成员基本信息
* @return 增加结果
@@ -321,7 +321,7 @@
/**
* 编辑家庭成员
- *
+ *
* @param comMngFamilyInfoVO
* 家庭成员信息
* @return 编辑结果
@@ -331,7 +331,7 @@
/**
* 新增运营、社区后台账户
- *
+ *
* @param administratorsUserVO
* 账户信息
* @return 新增结果
@@ -362,7 +362,7 @@
/**
* 编辑运营、社区后台账户
- *
+ *
* @param administratorsUserVO
* 编辑账户内容
* @return 编辑结果
@@ -372,7 +372,7 @@
/**
* 删除后台用户
- *
+ *
* @param administratorsUserVO
* 用户主键
* @return 删除结果
@@ -382,7 +382,7 @@
/**
* 角色下拉列表
- *
+ *
* @param communityId
* 对应社区 0 表示运营后台
* @return 角色集合
@@ -392,7 +392,7 @@
/**
* 分页查询后台用户
- *
+ *
* @param administratorsUserVO
* 查询参数
* @return 后台用户
@@ -402,7 +402,7 @@
/**
* 新增角色
- *
+ *
* @param roleVO
* 角色信息
* @return 新增结果
@@ -412,7 +412,7 @@
/**
* 删除角色
- *
+ *
* @param roleVO
* 角色主键
* @return 删除结果
@@ -422,7 +422,7 @@
/**
* 平台菜单列表
- *
+ *
* @param communityId
* 社区id 0 运营平台
* @return 菜单集合
@@ -432,7 +432,7 @@
/**
* 设置角色的权限
- *
+ *
* @param menuRoleVO
* 用户设置的权限id
* @return 设置结果
@@ -442,7 +442,7 @@
/**
* 保存操作日志
- *
+ *
* @param operlog
* 日志内容
* @return 保存结果
@@ -452,7 +452,7 @@
/**
* 分页展示操作日志
- *
+ *
* @param sysOperLogVO
* 分页参数
* @return 分页集合
@@ -462,7 +462,7 @@
/**
* 用户协议
- *
+ *
* @return 协议集合
*/
@PostMapping("listagreement")
@@ -470,7 +470,7 @@
/**
* 编辑用户协议
- *
+ *
* @param sysUserAgreementVO
* 编辑内容
* @return 编辑结果
@@ -480,7 +480,7 @@
/**
* 用户标签
- *
+ *
* @param communityId
* 社区id
* @return 标签集合
@@ -490,7 +490,7 @@
/**
* 新增删除用户标签
- *
+ *
* @param systemmanagementConfigVO
* 操作内容
* @return 操作结果
@@ -500,7 +500,7 @@
/**
* 分页查询小程序用户
- *
+ *
* @param pageUserAppletsBackstageDTO
* 查询参数
* @return 分页集合
@@ -510,7 +510,7 @@
/**
* 编辑用户状态
- *
+ *
* @param pageUserAppletsBackstageDTO
* 启用或者禁用 1 启用 2 禁用
* @return 编辑结果
@@ -520,7 +520,7 @@
/**
* 调试接口--清除昵称、社区、小区
- *
+ *
* @param userId
* 登录用户id
* @return 清除结果
@@ -530,7 +530,7 @@
/**
* 用户协议和隐私政策
- *
+ *
* @param type
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
@@ -540,7 +540,7 @@
/**
* 意见反馈
- *
+ *
* @param sysUserFeedbackDTO
* 反馈内容
* @return 反馈结果
@@ -550,7 +550,7 @@
/**
* 分页通知列表
- *
+ *
* @param pageDTO
* 分页参数
* @return 分页结果
@@ -560,7 +560,7 @@
/**
* 通知已读
- *
+ *
* @param noticeReadDTO
* 通知已读
* @return 修改状态
@@ -570,7 +570,7 @@
/**
* 分页查询用户意见反馈
- *
+ *
* @param pageFeedBackDTO
* 分页查询参数
* @return 意见集合
@@ -580,7 +580,7 @@
/**
* 未读消息汇总
- *
+ *
* @param userId
* 登录用户信息
* @return 未读汇总
@@ -590,7 +590,7 @@
/**
* 反馈意见详情
- *
+ *
* @param id
* 反馈主键
* @return 反馈详情
@@ -600,7 +600,7 @@
/**
* 数据看板
- *
+ *
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
@@ -608,7 +608,7 @@
/**
* 用户菜单获取
- *
+ *
* @param userId
* 登录用户id
* @return 用户菜单
@@ -618,7 +618,7 @@
/**
* 社区管理后台数据看板
- *
+ *
* @param communityId
* 社区id
* @return 看板用户数据
@@ -628,7 +628,7 @@
/**
* 定时任务维护用户持续登录时间
- *
+ *
* @return 维护结果
*/
@PostMapping("timedtaskcontinuouslandingdays")
@@ -636,7 +636,7 @@
/**
* 新增用户通知
- *
+ *
* @param sysUserNoticeVO
* 通知内容
* @return 新增结果
@@ -646,7 +646,7 @@
/**
* 修改用户的党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -656,7 +656,7 @@
/**
* 修改用户的为非党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -666,7 +666,7 @@
/**
* 获取角色的权限配置列表
- *
+ *
* @param roleId
* 角色id
* @return 菜单列表
@@ -676,7 +676,7 @@
/**
* 获取各种协议
- *
+ *
* @param type
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
@@ -686,7 +686,7 @@
/**
* 维护用户最后登录时间
- *
+ *
* @param userId
* 用户主键
* @return 维护结果
@@ -696,7 +696,7 @@
/**
* 删除意见反馈
- *
+ *
* @param id
* 主键
* @return 删除结果
@@ -706,7 +706,7 @@
/**
* 批量导入居民用户
- *
+ *
* @param list
* 居民用户集合
* @param areaName
@@ -718,7 +718,7 @@
/**
* 校验小区是否存在
- *
+ *
* @param areaName
* 小区名字
* @return 校验结果
@@ -728,7 +728,7 @@
/**
* 社区人员详情包括导入人员
- *
+ *
* @param userId
* 人员id
* @return CommunityUserInfoVO
@@ -738,7 +738,7 @@
/**
* 用户搜索了就下载搜索的用户否则下载所有用户
- *
+ *
* @param exportUserDTO
* 用户搜索内容
* @return List<EexcelUserDTO> excel内容
@@ -748,7 +748,7 @@
/**
* 通过手机号码查询用户信息
- *
+ *
* @param phone
* @return
*/
@@ -757,7 +757,7 @@
/**
* 通过账号查询用户信息
- *
+ *
* @param account
* @return
*/
@@ -767,7 +767,7 @@
/**
* 基础数据》居民管理》居民列表
- *
+ *
* @param pageInputUserDTO
* 查询参数
* @return 分页数据
@@ -777,7 +777,7 @@
/**
* 基础数据》居民管理》设置用户标签
- *
+ *
* @param inputUserTagsDTO
* 标签信息
* @return 设置结果
@@ -787,7 +787,7 @@
/**
* 基础数据》居民管理》批量导入居民用户
- *
+ *
* @param list
* 居民用户集合
* @param areaName
@@ -799,7 +799,7 @@
/**
* 基础数据》居民管理》 居民详情
- *
+ *
* @param id
* 人员id
* @return CommunityUserInfoVO
@@ -809,7 +809,7 @@
/**
* 基础数据》居民管理》 导出居民信息
- *
+ *
* @param exportUserDTO
* 用户搜索内容
* @return List<EexcelUserDTO> excel内容
@@ -819,7 +819,7 @@
/**
* 基础数据》特殊群体》分页查询
- *
+ *
* @param pageInputUserDTO
* @return
*/
@@ -828,7 +828,7 @@
/**
* 删除特殊群体用户
- *
+ *
* @param id
* @return
*/
@@ -837,7 +837,7 @@
/**
* 基础数据》特殊群体》分页查询标签列表
- *
+ *
* @param comMngUserTagDTO
* @return
*/
@@ -846,7 +846,7 @@
/**
* 新增或修改特殊群体标签
- *
+ *
* @param comMngTagVO
* @return
*/
@@ -855,7 +855,7 @@
/**
* 删除特殊群体标签
- *
+ *
* @param id
* @return
*/
@@ -864,7 +864,7 @@
/**
* 特殊群体导出
- *
+ *
* @param exportSpecialUserDTO
* @return
*/
@@ -873,7 +873,7 @@
/**
* 查询所有人员标签
- *
+ *
* @return 标签集合
*/
@PostMapping("listtag/getTag")
@@ -881,7 +881,7 @@
/**
* 添加SysUser信息
- *
+ *
* @param storeVO
* sysUser信息
* @return 添加sysUser结果
@@ -891,7 +891,7 @@
/**
* 修改SysUser信息
- *
+ *
* @param storeVO
* sysUser信息
* @return 修改结果
@@ -901,7 +901,7 @@
/**
* 修改用户小程序首页活动提示
- *
+ *
* @param userEditTipsDTO
* 请求参数
* @return 修改结果
@@ -911,7 +911,7 @@
/**
* 获取用户电子档案
- *
+ *
* @param userId
* 家庭成员信息
* @return 结果
@@ -921,7 +921,7 @@
/**
* 编辑用户电子档案
- *
+ *
* @param userArchivesVO
* 编辑的信息
* @return 编辑结果
@@ -931,7 +931,7 @@
/**
* 修改app用户密码
- *
+ *
* @param userInfoAppDTO
* 请求参数
* @return 修改结果
@@ -941,7 +941,7 @@
/**
* 添加网格员
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 结果
@@ -951,7 +951,7 @@
/**
* 分页查询网格员
- *
+ *
* @param memberRelationDTO
* 请求参数
* @return 结果
@@ -961,7 +961,7 @@
/**
* 修改网格员信息
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 修改结果
@@ -971,7 +971,7 @@
/**
* 重置网格员密码
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 重置结果
@@ -981,7 +981,7 @@
/**
* 批量删除网格员
- *
+ *
* @param Ids
* 网格员id集合
* @return 删除结果
@@ -991,7 +991,7 @@
/**
* 批量修改网格员状态
- *
+ *
* @param gridMemberEditDTO
* 请求参数
* @return 修改结果
@@ -1004,7 +1004,7 @@
/**
* 查询社区的收益说明
- *
+ *
* @param communityId
* 社区id
* @return 收益说明
@@ -1020,7 +1020,7 @@
/**
* 根据用户id查询用户openid
- *
+ *
* @param userId
* 用户id
* @return openid
@@ -1030,7 +1030,7 @@
/**
* 查询社区后台工作人员列表
- *
+ *
* @param communityId
* 社区id
* @return 社区后台工作人员列表
@@ -1198,4 +1198,12 @@
*/
@DeleteMapping("/deleteUserCashByPhone")
R deleteUserCashByPhone(@RequestParam("phone") String phone);
+
+ /**
+ * 修改用户党员状态
+ * @param userId 用户id
+ * @return 修改结果
+ */
+ @PostMapping("/update/user/party/status")
+ R updateUserPartyStatus(@RequestParam("userId") Long userId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index e179c8a..daff928 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -28,7 +28,7 @@
/**
* 分页查询邻里圈列表
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈列表
@@ -40,7 +40,7 @@
/**
* 用户发布邻里圈审核
- *
+ *
* @param addNeighborCircleAppDTO
* 邻里圈请求参数
* @return 发布结果
@@ -52,7 +52,7 @@
/**
* 查询邻里圈详情
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈详情
@@ -64,7 +64,7 @@
/**
* 管理后台查询邻里圈列表
- *
+ *
* @param comActNeighborCircleAdminDTO
* 请求参数
* @return 邻里圈列表
@@ -76,7 +76,7 @@
/**
* 后台添加邻里圈
- *
+ *
* @param addNeighborCircleAdminVO
* 请求参数
* @return 邻里圈列表
@@ -88,7 +88,7 @@
/**
* 后台修改邻里圈
- *
+ *
* @param editNeighborCircleAdminVO
* 请求参数
*/
@@ -99,7 +99,7 @@
/**
* 邻里圈_后台删除 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
- *
+ *
* @param id
* 邻里圈id
* @return 邻里圈列表
@@ -112,7 +112,7 @@
/**
* 用户查询邻里圈列表
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈列表
@@ -124,7 +124,7 @@
/**
* 邻里圈点赞
- *
+ *
* @param fabulousAppDTO
* 请求参数
* @return 点赞结果
@@ -136,7 +136,7 @@
/**
* 邻里圈转发
- *
+ *
* @param forwardAppDTO
* 请求参数
* @return 转发结果
@@ -148,7 +148,7 @@
/**
* 邻里圈评论
- *
+ *
* @param commentAppDTO
* 请求参数
* @return 评论结果
@@ -160,7 +160,7 @@
/**
* 邻里圈回复
- *
+ *
* @param replyAppDTO
* 请求参数
* @return 回复结果
@@ -172,7 +172,7 @@
/**
* 定时任务更新邻里圈近3天评论数/点赞数/浏览量
- *
+ *
* @return 执行结果
*/
@PostMapping("timeTaskCircleFlow")
@@ -182,7 +182,7 @@
/**
* 查看邻里圈基础_详情
- *
+ *
* @param id
* 邻里圈id
* @return 邻里圈列表
@@ -194,7 +194,7 @@
/**
* 邻里圈的所有评论_分页
- *
+ *
* @param dto
* 请求参数
* @return 评论列表
@@ -206,7 +206,7 @@
/**
* 评论的状态_修改
- *
+ *
* @param vo
* 请求参数
*/
@@ -218,7 +218,7 @@
/**
* 邻里圈评论_详情
- *
+ *
* @param id
* 评论id
*/
@@ -229,7 +229,7 @@
/**
* 邻里圈评论回复_分页
- *
+ *
* @param dto
* 参数
*/
@@ -240,7 +240,7 @@
/**
* 邻里圈评论回复_基本详情
- *
+ *
* @param id
* 参数
*/
@@ -251,7 +251,7 @@
/**
* 评论的状态_修改
- *
+ *
* @param changeStatusReplyVO
* 参数
*/
@@ -262,7 +262,7 @@
/**
* 邻里圈取消点赞
- *
+ *
* @param fabulousAppDTO
* 请求参数
* @return 取消点赞结果
@@ -274,7 +274,7 @@
/**
* 添加邻里圈浏览记录
- *
+ *
* @param addBrowseAppDTO
* 请求参数
* @return 返回参数
@@ -286,7 +286,7 @@
/**
* 分页查询评论下所有回复
- *
+ *
* @param commentReplyAppDTO
* 请求参数
* @return 回复列表
@@ -298,7 +298,7 @@
/**
* 分页查询邻里圈话题列表
- *
+ *
* @param circleTopicAdminDTO
* 请求参数
* @return 邻里圈话题列表
@@ -310,7 +310,7 @@
/**
* 添加邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 添加结果
@@ -322,7 +322,7 @@
/**
* 编辑邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 编辑结果
@@ -334,14 +334,14 @@
/**
* 小程序查询邻里圈话题列表
- *
+ *
* @param communityId
* 社区id
* @return 邻里圈话题列表
*/
@GetMapping("getNeighborTopicByApp")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name) {
- return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name);
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name,belongType);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 12230d7..83aad2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -57,8 +57,8 @@
+ ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl "
+ " from com_act_neighbor_circle as canc " + " 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 "
- + " where canc.release_id = #{userId} and canc.is_del = 2 and canc.status != 3 order by create_at desc" + " </script>")
- IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page, @Param("userId") Long userId);
+ + " where canc.release_id = #{userId} and canc.is_del = 2 and canc.belong_type = #{belongType} and canc.status != 3 order by create_at desc" + " </script>")
+ IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page, @Param("userId") Long userId,@Param("belongType") Integer belongType);
@Select("select reply.id,reply.comment_id,reply.reply_content,reply.fabulous_num,reply.create_at"
+ ",reply.is_release,su.nick_name as userName,su.image_url as userHeadUrl,su1.nick_name as oldUserName"
@@ -68,19 +68,19 @@
+ " where reply.comment_id = #{commentId} and reply.status = 1")
IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);
- @Select("SELECT id,release_content as content FROM com_act_neighbor_circle WHERE community_id = ${communityId} and status = 2 ORDER BY create_at DESC limit #{pageSize}")
+ @Select("SELECT id,release_content as content FROM com_act_neighbor_circle WHERE community_id = ${communityId} and belong_type = 1 and status = 2 ORDER BY create_at DESC limit #{pageSize}")
List<CarouselInfoVO> screenNeighborCircle(@Param("communityId") Long communityId,
@Param("pageSize") Integer pageSize);
@Select(" SELECT COUNT(id) AS totalNum,"
- + " (SELECT COUNT(id) FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND status = 2 AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
+ + " (SELECT COUNT(id) FROM com_act_neighbor_circle WHERE community_id = ${communityId} and belong_type = 1 AND status = 2 AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
+ " FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND status = 2")
Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
- @Select("SELECT SUM(comment_num) as commentNum,SUM(fabulous_num) as fabulousNum,SUM(forward_num) as forwardNum FROM com_act_neighbor_circle WHERE community_id = ${communityId} and status = 2 ")
+ @Select("SELECT SUM(comment_num) as commentNum,SUM(fabulous_num) as fabulousNum,SUM(forward_num) as forwardNum FROM com_act_neighbor_circle WHERE community_id = ${communityId} and belong_type = 1 and status = 2 ")
Map<String, Object> sumScreenNum(@Param("communityId") Long communityId);
- @Select("SELECT release_images FROM com_act_neighbor_circle WHERE community_id = ${communityId} and status = 2 order by create_at desc limit #{pageSize}")
+ @Select("SELECT release_images FROM com_act_neighbor_circle WHERE community_id = ${communityId} and belong_type = 1 and status = 2 order by create_at desc limit #{pageSize}")
List<String> screenNeighborCircleImgs(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
@Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 "
@@ -89,7 +89,7 @@
+ "UNION ALL "
+ "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
+ "UNION ALL "
- + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 2 "
+ + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 2 and belong_type = 1"
+ "UNION ALL "
+ "SELECT COUNT( e.id ) AS num,'网格事件' AS name FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_process_status = 2 "
+ "UNION ALL "
@@ -102,7 +102,7 @@
+ "UNION ALL "
+ "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
+ "UNION ALL "
- + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 1 "
+ + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 1 and belong_type = 1"
+ "UNION ALL "
+ "SELECT COUNT( e.id ) AS num,'网格事件' AS NAME FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_status = 2 and e.event_deal_status in (1,2,3) "
+ "UNION ALL "
@@ -142,4 +142,4 @@
StatisticsCommVO getNeighborTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
IPage<ComActNeighborCircleAdminVO> indexNeighborList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
-}
\ No newline at end of file
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
index 7b02898..4bf6e69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
@@ -23,7 +23,7 @@
/**
* 分页查询邻里圈话题列表
- *
+ *
* @param circleTopicAdminDTO
* 请求参数
* @return 邻里圈话题列表
@@ -33,12 +33,12 @@
/**
* 小程序查询邻里圈话题列表
- *
+ *
* @param communityId
* 社区id
* @return 邻里圈话题列表
*/
- List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId,@Param("isZero") Integer isZero,@Param("name") String name);
+ List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId,@Param("isZero") Integer isZero,@Param("name") String name,@Param("belongType") Integer belongType);
/**
* 添加邻里圈话题热度
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 2a12a65..cb089b8 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
@@ -8,7 +8,7 @@
import lombok.Data;
/**
- * @auther lyq
+ * @author lyq
* @create 2021-04-28 09:20:49
* @describe 邻里圈表实体类
*/
@@ -131,6 +131,11 @@
*/
private Integer isDel;
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ private Integer belongType;
+
@Override
public String toString() {
return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
@@ -165,4 +170,13 @@
int yes = 1;
int no = 2;
}
-}
\ No newline at end of file
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
index 34749bc..b9d685a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
@@ -10,7 +10,7 @@
import lombok.Data;
/**
- * @auther lyq
+ * @author lyq
* @create 2021-07-06 15:04:37
* @describe 邻里圈话题表实体类
*/
@@ -63,6 +63,16 @@
private Integer count;
/**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ private Integer belongType;
+
+ /**
+ * 话题logo
+ */
+ private String logo;
+
+ /**
* 状态（1.启用 2.禁用）
*/
public interface status{
@@ -75,4 +85,13 @@
return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="
+ createAt + ", createBy=" + createBy + "}";
}
-}
\ No newline at end of file
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
index 49462b8..13c2581 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
@@ -17,7 +17,7 @@
/**
* 分页查询邻里圈话题列表
- *
+ *
* @param circleTopicAdminDTO
* 请求参数
* @return 邻里圈话题列表
@@ -26,7 +26,7 @@
/**
* 添加邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 添加结果
@@ -35,7 +35,7 @@
/**
* 编辑邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 编辑结果
@@ -44,12 +44,12 @@
/**
* 小程序查询邻里圈话题列表
- *
+ *
* @param communityId
* 社区id
* @return 邻里圈话题列表
*/
- R getNeighborTopicByApp(Long communityId,Integer isZero,String name);
+ R getNeighborTopicByApp(Long communityId,Integer isZero,String name,Integer belongType);
/**
* 小程序-用户新增话题
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 8935ff6..c70462f 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
@@ -307,6 +307,7 @@
comActNeighborCircleDO.setLastCommentNum(0);
comActNeighborCircleDO.setLastFabulousNum(0);
comActNeighborCircleDO.setLastViewsNum(0);
+ comActNeighborCircleDO.setBelongType(addVO.getBelongType());
this.baseMapper.insert(comActNeighborCircleDO);
return R.ok();
}
@@ -341,7 +342,7 @@
public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
- neighborCircleAppDTO.getUserId());
+ neighborCircleAppDTO.getUserId(),neighborCircleAppDTO.getBelongType());
if (!neighborCircleIPage.getRecords().isEmpty()) {
for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
// 查询点赞信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
index b086212..f73fa81 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -112,8 +112,8 @@
* @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId,Integer isZero,String name){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name));
+ public R getNeighborTopicByApp(Long communityId,Integer isZero,String name,Integer belongType){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name,belongType));
}
/**
@@ -125,7 +125,8 @@
public R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO){
ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
.lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,circleTopicAppDTO.getCommunityId())
- .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName()));
+ .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName())
+ .eq(ComActNeighborCircleTopicDO::getBelongType,circleTopicAppDTO.getBelongType()));
if(circleTopicDO == null){
circleTopicDO = new ComActNeighborCircleTopicDO();
circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId());
@@ -135,6 +136,7 @@
circleTopicDO.setCount(0);
circleTopicDO.setHotNum(0L);
circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
+ circleTopicDO.setBelongType(circleTopicAppDTO.getBelongType());
this.baseMapper.insert(circleTopicDO);
}
return R.ok(circleTopicDO);
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 2ec5c87..9100ac8 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
@@ -55,20 +55,25 @@
canc.hot_num,
su.nick_name as name,
su.community_id,
+ ca.`name` as communityName,
canct.name as topicName,
su.image_url as headUrl
FROM
com_act_neighbor_circle AS canc
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 canc.status = 2 and is_del = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
<if test='neighborCircleAppDTO.topicId != null '>
and canc.topic_id = #{neighborCircleAppDTO.topicId}
</if>
+ <if test='neighborCircleAppDTO.belongType != null '>
+ and canc.belong_type = #{neighborCircleAppDTO.belongType}
+ </if>
<if test='neighborCircleAppDTO.keyWord != null and neighborCircleAppDTO.keyWord != ""'>
- and (canct.`name` like concat (#{neighborCircleAppDTO.keyWord},'%') or
- su.nick_name like concat (#{neighborCircleAppDTO.keyWord},'%') or
- canc.release_content like concat (#{neighborCircleAppDTO.keyWord},'%'))
+ and (canct.`name` like concat ('%',#{neighborCircleAppDTO.keyWord},'%') or
+ su.nick_name like concat ('%',#{neighborCircleAppDTO.keyWord},'%') or
+ canc.release_content like concat ('%',#{neighborCircleAppDTO.keyWord},'%'))
</if>
order by canc.create_at desc
</select>
@@ -110,6 +115,9 @@
<if test='neighborCircleAdminDTO.status != null '>
and nc.status = #{neighborCircleAdminDTO.status}
</if>
+ <if test='neighborCircleAdminDTO.belongType != null '>
+ and nc.belong_type = #{neighborCircleAdminDTO.belongType}
+ </if>
</where>
order by
case when nc.`status`=1 then 0 else 1 end,
@@ -117,12 +125,12 @@
</select>
<select id="getAllImages" resultType="java.lang.String">
SELECT release_images FROM com_act_neighbor_circle
- WHERE community_id = ${communityId} AND `status` = 2 AND release_images IS NOT NULL AND release_images != ''
+ WHERE community_id = ${communityId} AND `status` = 2 and belong_type = 1 AND release_images IS NOT NULL AND release_images != ''
ORDER BY create_at DESC limit #{pageSize}
</select>
<select id="getContents" resultType="java.lang.String">
SELECT release_content FROM com_act_neighbor_circle
- WHERE community_id = ${communityId} AND `status` = 2 AND release_content IS NOT NULL AND release_content != ''
+ WHERE community_id = ${communityId} AND `status` = 2 and belong_type = 1 AND release_content IS NOT NULL AND release_content != ''
ORDER BY create_at DESC limit #{pageSize}
</select>
<select id="getIndexNeighborBaseData"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
index b9d6e2b..c13f9ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
@@ -26,6 +26,7 @@
canct.`name`,
canct.`status`,
canct.create_at,
+ canct.logo,
( SELECT count( id ) FROM com_act_neighbor_circle WHERE is_del = 2 AND `status` = 2 and topic_id = canct.id) AS `count`,
su.`name` as createBy
FROM
@@ -46,8 +47,8 @@
</select>
<select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">
- SELECT canct.id, canct.`name`, canct.hot_num,( SELECT count( id ) FROM com_act_neighbor_circle WHERE is_del = 2 AND `status` = 2 and topic_id = canct.id) AS `count`
- from com_act_neighbor_circle_topic as canct where canct.`status` = 1 and canct.community_id = ${communityId}
+ SELECT canct.id, canct.`name`,`logo`, canct.hot_num,( SELECT count( id ) FROM com_act_neighbor_circle WHERE is_del = 2 AND `status` = 2 and topic_id = canct.id) AS `count`
+ from com_act_neighbor_circle_topic as canct where canct.`status` = 1 and canct.community_id = ${communityId} and canct.belong_type = #{belongType}
<if test="isZero != null and isZero == 1">
and `count` > 0
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
index e07257f..9e72e1b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -777,4 +777,9 @@
public R checkMember(@RequestParam("idCard")String idCard){
return comPbMemberService.checkMember(idCard);
}
+
+ @PostMapping("/getPagePbMember")
+ public R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
+ return comPbMemberService.getPagePbMember(partyBuildingMemberVO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
index 1677026..bca62e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -179,4 +179,12 @@
* @return 党员导出数据
*/
List<ComDataStatisticsMemberExcelVo> exportDataStatisticsMember(@Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 根据报到单位id查询党员列表
+ * @param page 分页参数
+ * @param partyBuildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ IPage<PartyBuildingMemberVO> getPbMemberByApplets(Page page,@Param("dto") PartyBuildingMemberVO partyBuildingMemberVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java
index 830108d..7da8925 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java
@@ -58,6 +58,14 @@
*/
private Long updateBy;
+ /**
+ * 党组织名称
+ */
+ private String orgName;
+ /**
+ * 党组织logo
+ */
+ private String logo;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
index 8acfd92..cc7f000 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
@@ -131,6 +131,11 @@
private String positionTwo;
/**
+ * 党组织名字
+ */
+ private String orgName;
+
+ /**
* 党员审查结果 0待审核 1 审核通过 3审核失败
*/
public interface AuditResult {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
index 72bff49..fbd0d32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -21,7 +21,7 @@
public interface ComPbMemberService extends IService<ComPbMemberDO> {
/**
* 新增党员
- *
+ *
* @param partyBuildingMemberVO
* 党员基本信息
* @return 新增结果
@@ -30,7 +30,7 @@
/**
* 批量新增党员
- *
+ *
* @param list
* 党员集合
* @return 新增结果
@@ -39,7 +39,7 @@
/**
* 分页党员
- *
+ *
* @param pagePartyOrganizationVO
* 查询信息
* @return 分页数据
@@ -48,7 +48,7 @@
/**
* 编辑党员信息 新增字段均可编辑
- *
+ *
* @param partyBuildingMemberVO
* 编辑字段
* @return 编辑结果
@@ -57,7 +57,7 @@
/**
* 查询指定社区的所有党员
- *
+ *
* @param communityId
* 社区id
* @return 党员列表
@@ -66,7 +66,7 @@
/**
* 新增党委
- *
+ *
* @param partyCommitteeVO
* 新增信息
* @return 新增结果
@@ -75,7 +75,7 @@
/**
* 编辑党委
- *
+ *
* @param partyCommitteeVO
* 编辑信息
* @return 编辑结果
@@ -84,7 +84,7 @@
/**
* 删除党委
- *
+ *
* @param partyCommitteeVO
* 删除id
* @return 删除结果
@@ -93,7 +93,7 @@
/**
* 分页社区党委查询
- *
+ *
* @param partyCommitteeVO
* 查询参数
* @return 分页集合
@@ -102,7 +102,7 @@
/**
* 新建党建动态
- *
+ *
* @param partyCommitteeVO
* 动态内容
* @return 新增结果
@@ -111,7 +111,7 @@
/**
* 编辑动态
- *
+ *
* @param partyCommitteeVO
* 编辑内容
* @return 编辑结果
@@ -120,7 +120,7 @@
/**
* 动态详情
- *
+ *
* @param id
* 动态主键
* @return 详情
@@ -129,7 +129,7 @@
/**
* 分页查询党员动态
- *
+ *
* @param partyBuildingComPbDynVO
* 查询参数
* @return 分页数据
@@ -138,7 +138,7 @@
/**
* 删除动态
- *
+ *
* @param id
* 动态主键
* @return 删除结果
@@ -147,7 +147,7 @@
/**
* 增加阅读记录
- *
+ *
* @param comPbDynUserVO
* 阅读记录
* @return 增加结果
@@ -156,7 +156,7 @@
/**
* 删除党员
- *
+ *
* @param id
* 党员主键
* @return 删除结果
@@ -165,14 +165,14 @@
/**
* 定时任务刷新党建动态发布状态
- *
+ *
* @return 刷新数据数量
*/
R timedTaskPartyBuildingStatus();
/**
* 分页查询认证党员
- *
+ *
* @param pagePartyBuildingMemberVO
* 查询参数
* @return 分页数据
@@ -181,7 +181,7 @@
/**
* 审核党员认证信息
- *
+ *
* @param partyBuildingMemberVO
* 编辑字段
* @return 编辑结果
@@ -190,7 +190,7 @@
/**
* 导出党员信息
- *
+ *
* @param organizationVO
* 请求参数
* @return 党员信息列表
@@ -248,4 +248,6 @@
* @return
*/
R checkMember(String idCard);
+
+ R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
index 260d6fb..c0fa210 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -1,8 +1,11 @@
package com.panzhihua.service_dangjian.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbCheckUnitTypeEnum;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index a90e592..8dfa8dc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -1156,4 +1156,9 @@
List<ComPbMemberDO> list=comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,idCard));
return R.ok(CollectionUtils.isEmpty(list));
}
+
+ @Override
+ public R getPagePbMember(PartyBuildingMemberVO dto) {
+ return R.ok(comPbMemberDAO.getPbMemberByApplets(new Page(dto.getPageNum(),dto.getPageSize()),dto));
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
index 035afe6..543ce48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
@@ -18,57 +18,64 @@
<!--查询单个-->
<select id="queryById" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
select
- id, name, type, contacts, phone, create_at, create_by, update_at, update_by, community_id
- from com_pb_check_unit
- where id = #{id}
+ cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
+ , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`
+ ,(select count(id) from com_pb_member where audit_result = 1 and check_unit_id = cpcu.id) as count
+ from com_pb_check_unit as cpcu
+ left join com_act as ca on ca.community_id = cpcu.community_id
+ where cpcu.id = #{id}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
select
- id, name, type, contacts, phone, create_at, create_by, update_at, update_by, community_id
- from com_pb_check_unit
+ cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
+ , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`
+ from com_pb_check_unit as cpcu
+ left join com_act as ca on ca.community_id = cpcu.community_id
<where>
<if test="dto.type != null">
- and type = #{dto.type}
+ and cpcu.`type` = #{dto.type}
</if>
<if test="dto.communityId != null">
- and community_id = #{dto.communityId}
+ and cpcu.community_id = #{dto.communityId}
</if>
<if test="dto.keyWord != null and dto.keyWord != ''">
- and (`name` like concat(#{dto.keyWord},'%') or
- `contacts` like concat(#{dto.keyWord},'%') or phone like concat(#{dto.keyWord},'%'))
+ and (cpcu.`name` like concat(#{dto.keyWord},'%') or
+ cpcu.`contacts` like concat(#{dto.keyWord},'%') or cpcu.phone like concat(#{dto.keyWord},'%'))
</if>
</where>
- order by create_at desc
+ order by cpcu.create_at desc
</select>
<!--查询所有数据-->
<select id="queryAllByList" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
select
- id, name, type, contacts, phone, create_at, create_by, update_at, update_by
- from com_pb_check_unit
+ cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
+ , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`
+ from com_pb_check_unit as cpcu
+ left join com_act as ca on ca.community_id = cpcu.community_id
<where>
<if test="dto.id != null">
- and id = #{dto.id}
+ and cpcu.id = #{dto.id}
</if>
<if test="dto.name != null and dto.name != ''">
- and name = #{dto.name}
+ and cpcu.`name` = #{dto.name}
</if>
<if test="dto.type != null">
- and type = #{dto.type}
+ and cpcu.`type` = #{dto.type}
</if>
<if test="dto.contacts != null and dto.contacts != ''">
- and contacts = #{dto.contacts}
+ and cpcu.contacts = #{dto.contacts}
</if>
<if test="dto.phone != null and dto.phone != ''">
- and phone = #{dto.phone}
+ and cpcu.phone = #{dto.phone}
</if>
<if test="dto.communityId != null">
- and community_id = #{dto.communityId}
+ and cpcu.community_id = #{dto.communityId}
</if>
</where>
- order by create_at desc
+ order by cpcu.create_at desc
</select>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
index 228d8b7..41f6fa8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -682,5 +682,32 @@
</where>
order by cpm.create_at desc
</select>
+
+ <select id="getPbMemberByApplets" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
+ select
+ m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
+ m.community_id, u.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
+ m.specialty_name, m.position_two, m.org_Name,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
+ TIMESTAMPDIFF(
+ YEAR,
+ m.employment_time,
+ DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge
+ from com_pb_member as m
+ LEFT JOIN sys_user u ON m.id_card = u.id_card and u.type = 1
+ LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
+ LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3
+ GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id
+ where m.audit_result = 1
+ <if test="dto.checkUnitId != null">
+ and m.check_unit_id = #{dto.checkUnitId}
+ </if>
+ <if test="dto.specialtyCategory != null">
+ and m.specialty_category = #{dto.specialtyCategory}
+ </if>
+ <if test="dto.name != null">
+ and m.name like concat('%',#{dto.name},'%')
+ </if>
+ order by m.create_at desc
+ </select>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 6d16b6e..381637c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -170,7 +170,7 @@
/**
* 微心愿搜索社区团队人员列表
- *
+ *
* @param param
* 请求参数
* @param communityId
@@ -695,7 +695,7 @@
/**
* 修改用户为非党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -1041,7 +1041,7 @@
/**
* 修改app用户密码
- *
+ *
* @param userInfoAppDTO
* 请求参数
* @return 修改结果
@@ -1053,7 +1053,7 @@
/**
* 添加网格员
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 结果
@@ -1065,7 +1065,7 @@
/**
* 网格员管理
- *
+ *
* @param memberRelationDTO
* 请求参数
* @return 网格员列表
@@ -1077,7 +1077,7 @@
/**
* 修改网格员信息
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 修改结果
@@ -1089,7 +1089,7 @@
/**
* 重置网格员密码
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 重置结果
@@ -1101,7 +1101,7 @@
/**
* 批量删除网格员
- *
+ *
* @param Ids
* 网格员id集合
* @return 删除结果
@@ -1123,7 +1123,7 @@
/**
* 查询社区的收益说明
- *
+ *
* @param communityId
* 社区id
* @return 收益说明
@@ -1145,7 +1145,7 @@
/**
* 根据用户id查询用户openid
- *
+ *
* @param userId
* 用户id
* @return openid
@@ -1157,7 +1157,7 @@
/**
* 查询社区后台工作人员列表
- *
+ *
* @param communityId
* 社区id
* @return 社区后台工作人员列表
@@ -1341,4 +1341,9 @@
return userService.deleteUserCashByPhone(phone);
}
+ @PostMapping("/update/user/party/status")
+ public R updateUserPartyStatus(@RequestParam("userId") Long userId) {
+ return userService.updateUserPartyStatus(userId);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index b34b47f..2c2e927 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -28,7 +28,7 @@
public interface UserService {
/**
* 小程序微信用户信息更新
- *
+ *
* @param openid
* 小程序唯一ID
* @param sessionKey
@@ -41,7 +41,7 @@
/**
* 维护小程序用户基本信息 头像 昵称 性别
- *
+ *
* @param userId
* 数据库用户ID
* @param nickName
@@ -56,7 +56,7 @@
/**
* 维护微信用户手机号
- *
+ *
* @param userId
* 数据库ID
* @param purePhoneNumber
@@ -67,7 +67,7 @@
/**
* 认证中心获取平台用户信息
- *
+ *
* @return 用户基本信息、角色
* @param name
* 登录账户
@@ -78,7 +78,7 @@
/**
* 三端获取登录用户信息
- *
+ *
* @param userId
* 用户ID
* @return 用户基本信息、角色
@@ -87,7 +87,7 @@
/**
* 修改用户登录密码
- *
+ *
* @param changePasswordVO
* 新密码
* @return 修改结果
@@ -96,7 +96,7 @@
/**
* 某社区后台人员查询
- *
+ *
* @param param
* 名字
* @param communityId
@@ -107,7 +107,7 @@
/**
* 微心愿搜索社区团队人员列表
- *
+ *
* @param param
* 请求参数
* @param communityId
@@ -118,7 +118,7 @@
/**
* 分页查询人脸识别
- *
+ *
* @param loginUserInfoVO
* 查询参数
* @return 分页集合
@@ -127,7 +127,7 @@
/**
* 编辑人脸采集数据通过、驳回、删除
- *
+ *
* @param loginUserInfoVO
* 操作信息
* @return 操作结果
@@ -136,7 +136,7 @@
/**
* 分页查询人口管理
- *
+ *
* @param userInfoVO
* 查询参数
* @return 分页数据
@@ -145,14 +145,14 @@
/**
* 查询所有人员标签
- *
+ *
* @return 标签集合
*/
R listTag();
/**
* 人员详情
- *
+ *
* @param userId
* 用户id
* @return 人员详情
@@ -161,7 +161,7 @@
/**
* 设置用户标签
- *
+ *
* @param loginUserInfoVO
* 标签信息
* @return 设置结果
@@ -170,7 +170,7 @@
/**
* 修改用户志愿者状态
- *
+ *
* @param phone
* 志愿者手机号
* @param type
@@ -180,7 +180,7 @@
/**
* 修改用户志愿者状态
- *
+ *
* @param userId
* 用户ID
* @param type
@@ -190,7 +190,7 @@
/**
* 用户绑定社区、小区
- *
+ *
* @param loginUserInfoVO
* 社区小区数据
* @return 绑定结果
@@ -199,7 +199,7 @@
/**
* 用户实名认证
- *
+ *
* @param loginUserInfoVO
* 认证数据
* @return 认证结果
@@ -208,7 +208,7 @@
/**
* 修改用户手机号
- *
+ *
* @param userPhoneVO
* 手机号信息
* @return 修改结果
@@ -217,7 +217,7 @@
/**
* 修改用户信息
- *
+ *
* @param loginUserInfoVO
* 修改内容
* @return 修改结果
@@ -226,7 +226,7 @@
/**
* 新增运营、社区后台账户
- *
+ *
* @param administratorsUserVO
* 账户信息
* @return 新增结果
@@ -244,7 +244,7 @@
/**
* 编辑运营、社区后台账户
- *
+ *
* @param administratorsUserVO
* 编辑账户内容
* @return 编辑结果
@@ -253,7 +253,7 @@
/**
* 删除后台用户
- *
+ *
* @param administratorsUserVO
* 用户主键
* @return 删除结果
@@ -262,7 +262,7 @@
/**
* 分页查询后台用户
- *
+ *
* @param administratorsUserVO
* 查询参数
* @return 后台用户
@@ -271,7 +271,7 @@
/**
* 保存操作日志
- *
+ *
* @param operlog
* 日志内容
* @return 保存结果
@@ -280,7 +280,7 @@
/**
* 分页展示操作日志
- *
+ *
* @param sysOperLogVO
* 分页参数
* @return 分页集合
@@ -289,14 +289,14 @@
/**
* 用户协议
- *
+ *
* @return 协议集合
*/
R listAgreement(Long communityId);
/**
* 编辑用户协议
- *
+ *
* @param sysUserAgreementVO
* 编辑内容
* @return 编辑结果
@@ -305,7 +305,7 @@
/**
* 用户标签
- *
+ *
* @param communityId
* 社区id
* @return 标签集合
@@ -314,7 +314,7 @@
/**
* 新增删除用户标签
- *
+ *
* @param systemmanagementConfigVO
* 操作内容
* @return 操作结果
@@ -323,7 +323,7 @@
/**
* 分页查询小程序用户
- *
+ *
* @param pageUserAppletsBackstageDTO
* 查询参数
* @return 分页集合
@@ -332,7 +332,7 @@
/**
* 编辑用户状态
- *
+ *
* @param pageUserAppletsBackstageDTO
* 启用或者禁用 1 启用 2 禁用
* @return 编辑结果
@@ -341,7 +341,7 @@
/**
* 调试接口--清除昵称、社区、小区
- *
+ *
* @param userId
* 登录用户id
* @return 清除结果
@@ -350,7 +350,7 @@
/**
* 用户协议和隐私政策
- *
+ *
* @param type
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
@@ -359,7 +359,7 @@
/**
* 意见反馈
- *
+ *
* @param sysUserFeedbackDTO
* 反馈内容
* @return 反馈结果
@@ -368,7 +368,7 @@
/**
* 分页通知列表
- *
+ *
* @param pageDTO
* 分页参数
* @return 分页结果
@@ -377,7 +377,7 @@
/**
* 通知已读
- *
+ *
* @param noticeReadDTO
* 通知已读
* @return 修改状态
@@ -386,7 +386,7 @@
/**
* 分页查询用户意见反馈
- *
+ *
* @param pageFeedBackDTO
* 分页查询参数
* @return 意见集合
@@ -395,7 +395,7 @@
/**
* 未读消息汇总
- *
+ *
* @param userId
* 登录用户信息
* @return 未读汇总
@@ -404,7 +404,7 @@
/**
* 反馈意见详情
- *
+ *
* @param id
* 反馈主键
* @return 反馈详情
@@ -413,14 +413,14 @@
/**
* 运营小程序后台数据看板
- *
+ *
* @return 展示数据
*/
R dataKanban(String areaCode);
/**
* 社区管理后台数据看板
- *
+ *
* @param communityId
* 社区id
* @return 看板用户数据
@@ -429,14 +429,14 @@
/**
* 定时任务维护用户持续登录时间
- *
+ *
* @return 维护结果
*/
R timedTaskContinuousLandingDays();
/**
* 新增用户通知
- *
+ *
* @param sysUserNoticeVO
* 通知内容
* @return 新增结果
@@ -445,7 +445,7 @@
/**
* 修改用户的党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -454,7 +454,7 @@
/**
* 修改用户为非党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -463,7 +463,7 @@
/**
* 获取各种协议
- *
+ *
* @param type
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
@@ -472,7 +472,7 @@
/**
* 维护用户最后登录时间
- *
+ *
* @param userId
* 用户主键
* @return 维护结果
@@ -481,7 +481,7 @@
/**
* 删除意见反馈
- *
+ *
* @param id
* 主键
* @return 删除结果
@@ -490,7 +490,7 @@
/**
* 校验小区是否存在
- *
+ *
* @param areaName
* 小区名字
* @return 校验结果
@@ -499,7 +499,7 @@
/**
* 社区人员详情包括导入人员
- *
+ *
* @param userId
* 人员id
* @return CommunityUserInfoVO
@@ -508,7 +508,7 @@
/**
* 用户搜索了就下载搜索的用户否则下载所有用户
- *
+ *
* @param exportUserDTO
* 用户搜索内容
* @return List<EexcelUserDTO> excel内容
@@ -517,7 +517,7 @@
/**
* 通过手机号码查询用户信息
- *
+ *
* @param phone
* @return
*/
@@ -525,14 +525,14 @@
/**
* 查询当前社区所有标签以及预设标签
- *
+ *
* @return 标签集合
*/
R listTags();
/**
* 通过账号查询用户信息
- *
+ *
* @param account
* @param type
* @return
@@ -542,7 +542,7 @@
/**
* 新增SysUser
- *
+ *
* @param storeVO
* 请求参数
* @return 新增结果
@@ -551,7 +551,7 @@
/**
* 修改SysUser用户信息
- *
+ *
* @param storeVO
* 请求参数
* @return 修改结果
@@ -560,7 +560,7 @@
/**
* 修改用户小程序首页活动提示
- *
+ *
* @param userEditTipsDTO
* 请求参数
* @return 修改结果
@@ -569,7 +569,7 @@
/**
* 家庭成员列表
- *
+ *
* @param userId
* 登录用户
* @return 成员集合
@@ -578,7 +578,7 @@
/**
* 新增家庭成员
- *
+ *
* @param comMngFamilyInfoVO
* 家庭成员基本信息
* @return 增加结果
@@ -587,7 +587,7 @@
/**
* 编辑家庭成员
- *
+ *
* @param comMngFamilyInfoVO
* 家庭成员信息
* @return 编辑结果
@@ -596,7 +596,7 @@
/**
* 当前登陆用户的电子档案
- *
+ *
* @param userId
* @return
*/
@@ -604,7 +604,7 @@
/**
* 编辑电子档案
- *
+ *
* @param userArchivesVO
* @return
*/
@@ -612,7 +612,7 @@
/**
* 修改app用户密码
- *
+ *
* @param userInfoAppDTO
* 请求参数
* @return 修改结果
@@ -621,7 +621,7 @@
/**
* 添加网格员
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 结果
@@ -630,7 +630,7 @@
/**
* 网格员管理
- *
+ *
* @param memberRelationDTO
* 请求参数
* @return 网格员列表
@@ -639,7 +639,7 @@
/**
* 网格员编辑
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 编辑结果
@@ -648,7 +648,7 @@
/**
* 网格员重置密码
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 重置结果
@@ -663,7 +663,7 @@
/**
* 查询社区的收益说明
- *
+ *
* @param communityId
* 社区id
* @return 收益说明
@@ -676,7 +676,7 @@
/**
* 根据用户id查询用户openid
- *
+ *
* @param userId
* 用户id
* @return openid
@@ -685,7 +685,7 @@
/**
* 查询社区后台工作人员列表
- *
+ *
* @param communityId
* 社区id
* @return 社区后台工作人员列表
@@ -826,4 +826,6 @@
* @param phone
*/
R deleteUserCashByPhone(String phone);
+
+ R updateUserPartyStatus(Long userId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 4ba20f5..899fa64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2310,7 +2310,7 @@
/**
* 修改app用户密码
- *
+ *
* @param userInfoAppDTO
* 请求参数
* @return 修改结果
@@ -2342,7 +2342,7 @@
/**
* 添加网格员
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 结果
@@ -2459,7 +2459,7 @@
/**
* 网格员管理
- *
+ *
* @param memberRelationDTO
* 请求参数
* @return 网格员列表
@@ -2496,7 +2496,7 @@
/**
* 修改网格员信息
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 修改结果
@@ -2592,7 +2592,7 @@
/**
* 重置网格员密码
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 重置结果
@@ -2610,7 +2610,7 @@
/**
* 批量删除网格员
- *
+ *
* @param Ids
* 网格员id集合
* @return 删除结果
@@ -2649,7 +2649,7 @@
/**
* 查询社区的收益说明
- *
+ *
* @param communityId
* 社区id
* @return 收益说明
@@ -2696,7 +2696,7 @@
/**
* 根据用户id查询用户openid
- *
+ *
* @param userId
* 用户id
* @return openid
@@ -2712,7 +2712,7 @@
/**
* 查询社区后台工作人员列表
- *
+ *
* @param communityId
* 社区id
* @return 社区后台工作人员列表
@@ -2846,7 +2846,7 @@
userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getUserIds());
return R.ok();
}
-
+
/**
* 根据openid维护社区团队里是否注册
* @param openid 用户微信唯一标识
@@ -3205,4 +3205,19 @@
}
return rs.toString();
}
+
+ @Override
+ public R updateUserPartyStatus(Long userId) {
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (sysUserDO != null) {
+ sysUserDO.setIsPartymember(1);
+ int updated = userDao.updateById(sysUserDO);
+ if (updated > 0) {
+ // 删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1