From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到，问题清单，需求清单，资源清单接口开发
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 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();
+ }
+
}
--
Gitblit v1.7.1