From 1abee89cd55e34fc51102d23f984e3d56ed01647 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 30 四月 2021 15:35:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 4 deletions(-)
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 4b12417..911f008 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.api;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
@@ -7,6 +8,7 @@
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
@@ -36,7 +38,7 @@
private ComPbServiceTeamService comPbServiceTeamService;
/**
- * 平台所有的党组织
+ * 社区所有启用的党组织列表
* @return 党组织集合
*/
@PostMapping("listpartyorganization")
@@ -44,6 +46,59 @@
List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganization(communityId);
return R.ok(partyOrganizationVOS);
}
+ /**
+ * 社区所有党组织列表
+ * @return 党组织集合
+ */
+ @PostMapping("listpartyorganizationAll")
+ public R listPartyOrganizationAll(@RequestParam("communityId") Long communityId){
+ List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganizationAll(communityId);
+ return R.ok(partyOrganizationVOS);
+ }
+
+ /**
+ * 新增党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 新增结果
+ */
+ @PostMapping("addpartyorganization")
+ public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO){
+ return partyOrganizationService.addPartyOrganization(partyOrganizationVO);
+
+ }
+ /**
+ * 编辑党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("updatepartyorganization")
+ public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO){
+ return partyOrganizationService.updatePartyOrganization(partyOrganizationVO);
+
+ }
+
+ /**
+ * 启用，禁用党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("resetpartyorganization")
+ public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO){
+ return partyOrganizationService.resetPartyOrganization(partyOrganizationVO);
+
+ }
+
+ /**
+ * 删除党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("deletepartyorganization")
+ public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO){
+ return partyOrganizationService.deletePartyOrganization(partyOrganizationVO);
+
+ }
+
/**
* 新增党员
* @param partyBuildingMemberVO 党员基本信息
@@ -122,8 +177,7 @@
*/
@PostMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
- return comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO);
-
+ return comPbMemberService.updatePartyBuildingMembers(partyBuildingMemberVO);
}
/**
@@ -220,7 +274,7 @@
* @return 详情
*/
@PostMapping("infodynamic")
- public R infoYnamic(@RequestParam("id") Integer id){
+ public R infoYnamic(@RequestParam("id") Long id){
return comPbMemberService.infoYnamic(id);
}
@@ -454,4 +508,25 @@
return comBpActivityService.addActivityApplets(comPbActivityDTO);
}
+ /**
+ * 查询用户认证信息
+ * @param id 用户id
+ * @return 查询结果
+ */
+ @GetMapping("usercertification")
+ R userCertification(@RequestParam("id")Long id){
+ ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
+ return R.ok(comPbMemberDO);
+ }
+
+
+ /**
+ * 查询用户认证信息
+ * @param pagePartyBuildingMemberVO 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pageusercertification")
+ R pageUserCertification(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO){
+ return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
+ }
}
--
Gitblit v1.7.1