From 3ffa739e77cdafdc4be1aa153acb3423071cd102 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 11:26:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index cf6c039..0a9306b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -39,9 +39,10 @@
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Integer isPartymember = loginUserInfo.getIsPartymember();
         Integer isVolunteer = loginUserInfo.getIsVolunteer();
-        pageQuestnaireDTO.setForParty(1 == isPartymember);
-        pageQuestnaireDTO.setForVolunteer(1 == isVolunteer);
+        pageQuestnaireDTO.setForParty(1 == isPartymember.intValue());
+        pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
         pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+        pageQuestnaireDTO.setState(0);
         return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
     }
 
@@ -81,7 +82,7 @@
     }
 
     @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
-    @GetMapping("/stat/details")
+    @PostMapping("/stat/details")
     public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
         //问卷调查
         return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);

--
Gitblit v1.7.1