springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1638,7 +1638,7 @@ R getPopulationLists(@RequestBody List<Long> Ids); /** * 新增社区问卷 * 创建调查问卷 * * @param questnaireVO * @return @@ -1653,7 +1653,7 @@ * @return */ @PostMapping("/questnaire/pagequestnaire") R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO); R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId); /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -66,7 +66,7 @@ * @return 编辑结果 */ @PostMapping("/partybuildIng/resetpartyorganization") R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO); R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO); /** * 删除党支部 @@ -74,7 +74,7 @@ * @return 删除结果 */ @PostMapping("/partybuildIng/deletepartyorganization") R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO); R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO); /** * 批量新增党员 @@ -370,7 +370,7 @@ * @return 查询结果 */ @GetMapping("/partybuildIng/usercertification") R userCertification(@RequestParam Long id); R userCertification(@RequestParam("id") Long id); /** * 查询待认证党员信息 @@ -378,5 +378,5 @@ * @return 查询结果 */ @GetMapping("/partybuildIng/pageusercertification") R pagePrePartybuildingmember(PagePartyBuildingMemberVO pagePartyBuildingMemberVO); R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java
@@ -2,12 +2,20 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComCvtBusinessVO; import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo; import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @description: 社区通/调查问卷接口 @@ -20,22 +28,34 @@ @RequestMapping("/questnaire") public class CommunityQuestnaireApi extends BaseController { @Resource private CommunityService communityService; @ApiOperation(value = "分页查询调查问卷", response = ComCvtBusinessVO.class) @PostMapping("/page") public R page(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) { return null; public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId()); } @ApiOperation(value = "创建调查问卷", response = ComCvtBusinessVO.class) @PostMapping("/add") public R add(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) { return null; public R add(@RequestBody QuestnaireVO questnaireVO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId()); } @ApiOperation(value = "继续调研/停止调研", response = ComCvtBusinessVO.class) @GetMapping("/toggle") public R toggle(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) { return null; public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) { return communityService.editQuestnaireDO(editComActQuestnaireVo); } @ApiOperation(value = "删除问卷(隐藏)", response = ComCvtBusinessVO.class) @GetMapping("/delete") public R delete(@RequestParam("questId") Long questId) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); return communityService.editQuestnaireDO(questId, loginUserInfo.getUserId()); } @ApiOperation(value = "查看详细", response = ComCvtBusinessVO.class) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1261,12 +1261,12 @@ public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) { return comActMessageService.deleteMessage(comActMessageVO); } @PostMapping("resetmessagepublic") public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) { return comActMessageService.resetMessagePublic(resetComActMessageVO); } /** * 留言详情 * @@ -1326,8 +1326,8 @@ * @return */ @PostMapping("questnaire/pagequestnaire") public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) { return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO); public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) { return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
@@ -20,7 +20,7 @@ /** * 社区问卷列表 */ R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO); R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId); /** * 编辑问卷——问卷、题目、选项 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -1,7 +1,6 @@ package com.panzhihua.service_community.service.impl; import java.util.Comparator; import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -90,10 +89,10 @@ } @Override public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) { public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId) { Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize()); LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(ComActQuestnaireDO::getCommunityId, 0); lambdaQueryWrapper.eq(ComActQuestnaireDO::getCommunityId, communityId); //过滤隐藏字段 lambdaQueryWrapper.eq(ComActQuestnaireDO::getIsHide, 0); if (pageQuestnaireDTO.getTitle() != null) {
