From 8d5fb4ee9d27fd6a61b210eaee74af265f76aa7c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 四月 2022 14:55:18 +0800
Subject: [PATCH] [修改]修改配置
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
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 835bdb2..2e49d68 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
@@ -4,6 +4,10 @@
import javax.annotation.Resource;
+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.service.partybuilding.ComPbCheckUnitFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -44,6 +48,8 @@
private UserService userService;
@Resource
private CheckService checkService;
+ @Resource
+ private ComPbCheckUnitFeign pbCheckUnitFeign;
public static void main(String[] args) {
Date date = new Date();
@@ -244,4 +250,42 @@
// }
return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
}
+
+ @OperLog(operModul = "党员管理", operType = 2)
+ @ApiOperation(value = "编辑党员")
+ @PutMapping("updatepartybuildingmember")
+ public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ if(partyBuildingMemberVO.getIsPb()!=null){
+ Long id = partyBuildingMemberVO.getId();
+ if(partyBuildingMemberVO.getIsPb()==1){
+ if (null == id || 0 == id) {
+ return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ }
+ return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
+ }
+ return partyBuildingService.deleteprepartybuildingmember(id);
+ }
+ return R.fail();
+ }
+
+ @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/comPbCheckUnit/list")
+ public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ if(comPbCheckUnit.getCommunityId() == null){
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ }
+ return pbCheckUnitFeign.queryByList(comPbCheckUnit);
+ }
+ @OperLog(operModul = "党员管理", operType = 1)
+ @ApiOperation(value = "新增党员")
+ @PostMapping("addpartybuildingmember")
+ public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ Long communityId = this.getCommunityId();
+ partyBuildingMemberVO.setCommunityId(communityId);
+ R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ if (R.isOk(r)) {
+ R r1 = userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard());
+ }
+ return r;
+ }
}
--
Gitblit v1.7.1