From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 2fb8c00..db59fdf 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,25 +259,58 @@
@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){
+ 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 userId = this.getUserId();
+ partyBuildingMemberVO.setUserId(userId);
+ R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ if (R.isOk(r)) {
+ 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();
+ }
+
+ @ApiOperation(value = "查询当前用户党员信息")
+ @GetMapping("/getPartyMember")
+ public R getPartyMember(@RequestParam("type")Integer type){
+ return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
+ }
+ @ApiOperation(value = "查询报道单位详情")
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailById(@RequestParam("phone") String phone) {
+ return partyBuildingService.detailByPhone(phone);
+ }
+ @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return partyBuildingService.memberDetail(id);
+ }
}
--
Gitblit v1.7.1