From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 0aac825..98a23a4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -1,6 +1,7 @@
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;
@@ -104,6 +105,9 @@
if (pageQuestnaireDTO.getTitle() != null) {
lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState());
}
+ if (pageQuestnaireDTO.getParterType() != null) {
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getParterType, pageQuestnaireDTO.getParterType());
+ }
if (pageQuestnaireDTO.getEndTime() != null && pageQuestnaireDTO.getStartTime() != null) {
lambdaQueryWrapper.ge(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getStartTime());
lambdaQueryWrapper.lt(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getEndTime());
@@ -178,7 +182,20 @@
@Override
public R statQuestnaire(Long questId){
- return null;
+ ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
+
+ QuestnaireAnswerStatVO usersAnswerStatVO = new QuestnaireAnswerStatVO();
+ //问卷信息
+ ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
+ BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
+ usersAnswerStatVO.setQuestnaire(comActQuestnaireVO);
+
+ UsersSubAnswerStatVO usersSubAnswerStatVO = new UsersSubAnswerStatVO();
+
+
+ //questnaireAnswerContentDAO.selectQuestnaireStat(questId);
+
+ return R.ok(usersAnswerStatVO);
}
@Override
--
Gitblit v1.7.1