From 422ec97246a4baed6ca2b5be41f1074025ef4e18 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 10:16:36 +0800
Subject: [PATCH] Default Changelist

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 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 c675e3e..cb9ee4f 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
@@ -2,21 +2,19 @@
 
 import java.util.Date;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.panzhihua.common.enums.QuestnaireState;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.questnaire.AddQuestnaireVO;
 import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
 import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
 import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO;
 import com.panzhihua.service_community.dao.ComActQuestnaireSubSelectionDAO;
-import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO;
+import com.panzhihua.service_community.model.dos.ComActQuestnaireDO;
+import com.panzhihua.service_community.model.dos.ComActQuestnaireSubDO;
+import com.panzhihua.service_community.model.dos.ComActQuestnaireSubSelectionDO;
 import com.panzhihua.service_community.service.ComActQuestnaireService;
 import org.springframework.stereotype.Service;
 
@@ -76,21 +74,9 @@
     }
 
     @Override
-    public R ListQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
-        Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
-        LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        if (pageQuestnaireDTO.getTitle() != null) {
-            lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle());
-        }
-        if (pageQuestnaireDTO.getTitle() != null) {
-            lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState());
-        }
-        if (pageQuestnaireDTO.getEndTime() != null && pageQuestnaireDTO.getStartTime() != null) {
-            lambdaQueryWrapper.ge(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getStartTime());
-            lambdaQueryWrapper.lt(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getEndTime());
-        }
-        IPage<ComActQuestnaireDO> doPager = questnaireDAO.selectPage(userPage, lambdaQueryWrapper.orderByDesc(ComActQuestnaireDO::getCreateAt));
-        return R.ok(doPager);
+    public R ListQuestnaire() {
+        //questnaireDAO.
+        return null;
     }
 
     @Override
@@ -109,7 +95,13 @@
     }
 
     @Override
-    public R answerInfoQuestnaire() {
+    public R answerInfoQuestnaire(Long userId, Long questId) {
+
+        ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
+
+        List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
+                questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId).eq(ComActQuestnaireAnswerContentDO::getSubId, questId));
+
         return null;
     }
 }

--
Gitblit v1.7.1