From 23e9f7463069b31b5455c0d85deec5245bd18359 Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期三, 20 一月 2021 14:57:53 +0800 Subject: [PATCH] 活动 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 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 d9a3a57..a39812f 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 @@ -44,6 +44,7 @@ return R.fail("类型不能为空"); } partyBuildingComPbDynVO.setCommunityId(communityId); + partyBuildingComPbDynVO.setStatus(2); return partyBuildingService.pageYnamic(partyBuildingComPbDynVO); } @@ -52,29 +53,45 @@ public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) { Long communityId = this.getCommunityId(); partyBuildingActivityVO.setCommunityId(communityId); + Integer status = partyBuildingActivityVO.getStatus(); + if (null!=status&&status.intValue()==4) { + partyBuildingActivityVO.setIsAppliets(1); + } return partyBuildingService.pageActivity(partyBuildingActivityVO); } @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class ) @GetMapping("infodynamic") public R infoYnamic(@RequestParam("id") Long id) { - return partyBuildingService.infoYnamic(id); + R r = partyBuildingService.infoYnamic(id); + if (R.isOk(r)) { + if (ObjectUtils.isEmpty(id)||0==id) { + return R.fail("主键id不能为空"); + } + Long userId = this.getUserId(); + ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO(); + comPbDynUserVO.setCreateAt(new Date()); + comPbDynUserVO.setDynId(id); + comPbDynUserVO.setUserId(userId); + partyBuildingService.addDynUser(comPbDynUserVO); + } + return r; } - @ApiOperation(value = "增加阅读记录") - @PostMapping("adddynuser") - public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) { - Long id = partyBuildingComPbDynVO.getId(); - if (ObjectUtils.isEmpty(id)||0==id) { - return R.fail("主键id不能为空"); - } - Long userId = this.getUserId(); - ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO(); - comPbDynUserVO.setCreateAt(new Date()); - comPbDynUserVO.setDynId(id); - comPbDynUserVO.setUserId(userId); - return partyBuildingService.addDynUser(comPbDynUserVO); - } +// @ApiOperation(value = "增加阅读记录") +// @PostMapping("adddynuser") +// public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) { +// Long id = partyBuildingComPbDynVO.getId(); +// if (ObjectUtils.isEmpty(id)||0==id) { +// return R.fail("主键id不能为空"); +// } +// Long userId = this.getUserId(); +// ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO(); +// comPbDynUserVO.setCreateAt(new Date()); +// comPbDynUserVO.setDynId(id); +// comPbDynUserVO.setUserId(userId); +// return partyBuildingService.addDynUser(comPbDynUserVO); +// } @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class ) @PostMapping("pagepartycommittee") -- Gitblit v1.7.1