From a59b11c1d68c1d5311edeef0d764798ad4b5182c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 12 四月 2022 09:34:07 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 2b296b6..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
@@ -5,6 +5,9 @@
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.*;
@@ -45,6 +48,8 @@
private UserService userService;
@Resource
private CheckService checkService;
+ @Resource
+ private ComPbCheckUnitFeign pbCheckUnitFeign;
public static void main(String[] args) {
Date date = new Date();
@@ -250,10 +255,37 @@
@ApiOperation(value = "编辑党员")
@PutMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- Long id = partyBuildingMemberVO.getId();
- if (null == id || 0 == id) {
- return R.fail("党员id不能为空");
+ 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 partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
+ 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