From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 188 +++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 94 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 8ed15bb..44e3fb7 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
@@ -47,88 +47,88 @@
@Resource
private PartyBuildingService partyBuildingService;
- /**
- * 社区所有启用的党组织列表
- *
- * @return 党组织集合
- */
- @PostMapping("listpartyorganization")
- public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
- List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
- return R.ok(partyOrganizationVOS);
- }
-
- /**
- * 分页查询社区所有党组织列表
- *
- * @return 党组织集合
- */
- @PostMapping("listpartyorganizationAll")
- public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
- return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
- }
-
- /**
- * 查询所有党组织列表
- * @param partyOrganizationVO 请求参数
- * @return 党组织列表
- */
- @PostMapping("getPbOrgAllList")
- public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
- return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
- }
-
- /**
- * 新增党支部
- *
- * @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);
-
- }
+// /**
+// * 社区所有启用的党组织列表
+// *
+// * @return 党组织集合
+// */
+// @PostMapping("listpartyorganization")
+// public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
+// List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
+// return R.ok(partyOrganizationVOS);
+// }
+//
+// /**
+// * 分页查询社区所有党组织列表
+// *
+// * @return 党组织集合
+// */
+// @PostMapping("listpartyorganizationAll")
+// public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
+// return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
+// }
+//
+// /**
+// * 查询所有党组织列表
+// * @param partyOrganizationVO 请求参数
+// * @return 党组织列表
+// */
+// @PostMapping("getPbOrgAllList")
+// public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
+// return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
+// }
+//
+// /**
+// * 新增党支部
+// *
+// * @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);
+//
+// }
/**
* 新增党员
@@ -465,7 +465,7 @@
* @return 删除结果
*/
@PostMapping("deletepartybuildingmember")
- public R deleteDynUser(@RequestParam("id") Integer id) {
+ public R deleteDynUser(@RequestParam("id") Long id) {
return comPbMemberService.deleteDynUser(id);
}
@@ -658,17 +658,17 @@
return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
}
- /**
- * 社区所有启用的党组织列表
- *
- * @return 党组织集合
- */
- @PostMapping("listpartyorganizationByApp")
- public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
- List<PartyOrganizationVO> partyOrganizationVOS =
- partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
- return R.ok(partyOrganizationVOS);
- }
+// /**
+// * 社区所有启用的党组织列表
+// *
+// * @return 党组织集合
+// */
+// @PostMapping("listpartyorganizationByApp")
+// public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
+// List<PartyOrganizationVO> partyOrganizationVOS =
+// partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
+// return R.ok(partyOrganizationVOS);
+// }
/**
* 根据党员认证id删除
--
Gitblit v1.7.1