From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 ab4409e..cfdfff3 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
@@ -1,25 +1,22 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageCommunityQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
-import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
-import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
-import com.panzhihua.common.model.vos.community.questnaire.*;
-
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
import com.panzhihua.common.service.community.CommunityService;
+
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: 社区通/调查问卷接口
@@ -38,8 +35,8 @@
@PostMapping("/pageUser")
public R pageUser(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
- return R.fail(401,"请先登录");
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
}
pageQuestnaireDTO.setCommunityId(loginUserInfo.getCommunityId());
pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
@@ -50,8 +47,8 @@
@GetMapping("/detail")
public R viewQuestnaire(@RequestParam("questId") Long questId) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
- return R.fail(401,"请先登录");
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
}
return communityService.viewDetail(loginUserInfo.getUserId(), questId);
}
@@ -60,13 +57,13 @@
@PostMapping("/stat/answer")
public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
usersAnswerQuestnaireVO.setUserId(loginUserInfo.getUserId());
- //填写调查问卷发放积分
- communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(usersAnswerQuestnaireVO.getQuestId()
- ,AddComActIntegralUserDTO.integralType.cydcwj,loginUserInfo.getCommunityId(),loginUserInfo.getUserId()));
+ // 填写调查问卷发放积分
+ communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(usersAnswerQuestnaireVO.getQuestId(),
+ AddComActIntegralUserDTO.integralType.cydcwj, loginUserInfo.getCommunityId(), loginUserInfo.getUserId()));
return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
}
@@ -81,10 +78,10 @@
@GetMapping("/add/noNotice")
public R addNoNotice(@RequestParam("questId") Long questId) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
- return communityService.addNoNotice(questId,loginUserInfo.getUserId());
+ return communityService.addNoNotice(questId, loginUserInfo.getUserId());
}
}
--
Gitblit v1.7.1