feats

src/main/java/com/yunzhi/training/controller/TaAnswerController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.BaseController;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,34 +41,40 @@ public class TaAnswerController extends BaseController {
     public ITaAnswerService iTaAnswerService;
 
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taAnswer",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAnswerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaAnswer> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaAnswer> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaAnswer> result = iTaAnswerService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taAnswer",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taAnswerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaAnswer> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaAnswer> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaAnswer> result = iTaAnswerService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
 
     /**
      * 保存对象
      * @param taAnswer 实体对象
      * @return
      */
-    @RequestMapping(value="/taAnswer",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/answer",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taAnswerAdd(@ApiParam("保存内容") @RequestBody TaAnswer taAnswer) throws Exception{
 
+        if (StringUtils.isEmpty(taAnswer.getQuestionId())) {
+            return ResponseBean.error("请设置所属问题", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taAnswer.setAnswerId(null);
+
         if (iTaAnswerService.save(taAnswer)){
             return ResponseBean.success(taAnswer);
         }else {
@@ -79,10 +86,10 @@ public class TaAnswerController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taAnswer/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/answer/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taAnswerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaAnswerService.removeById(id)){
+    public ResponseBean taAnswerDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaAnswerService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +102,15 @@ public class TaAnswerController extends BaseController {
      * @param taAnswer 实体对象
      * @return
      */
-    @RequestMapping(value="/taAnswer/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/answer/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taAnswerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taAnswerUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaAnswer taAnswer) throws Exception{
+        if (StringUtils.isEmpty(taAnswer.getQuestionId())) {
+            return ResponseBean.error("请设置所属问题", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taAnswer.setAnswerId(id);
 
         if (iTaAnswerService.updateById(taAnswer)){
             return ResponseBean.success(iTaAnswerService.getById(id));
@@ -107,13 +119,13 @@ public class TaAnswerController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taAnswer/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAnswerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaAnswerService.getById(id));
-    }
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taAnswer/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taAnswerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaAnswerService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/training/controller/TaQuestionController.java

@@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
+import com.yunzhi.training.entity.TaAnswer;
+import com.yunzhi.training.service.ITaAnswerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +24,8 @@ import com.yunzhi.training.service.ITaQuestionService;
 import com.yunzhi.training.entity.TaQuestion;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 问卷问题 前端控制器
@@ -39,6 +45,9 @@ public class TaQuestionController extends BaseController {
     @Autowired
     public ITaQuestionService iTaQuestionService;
 
+    @Autowired
+    public ITaAnswerService iTaAnswerService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +55,28 @@ public class TaQuestionController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taQuestion",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/question",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taQuestionList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taQuestionList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("问卷ID") @RequestParam(value ="queId", required = false) String queId,
+                                       @ApiParam("内容") @RequestParam(value ="content", required = false) String content) throws Exception{
 
-		    IPage<TaQuestion> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaQuestion> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        if (!"admin".equals(client) && !"wx".equals(client)) {
+            return ResponseBean.error("不支持的请求", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        IPage<TaQuestion> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaQuestion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(queId), "que_id", queId);
+        queryWrapper.like(!StringUtils.isEmpty(content), "content", "%"+content+"%");
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("sort_no");
 
-            IPage<TaQuestion> result = iTaQuestionService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaQuestion> result = iTaQuestionService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,9 +84,14 @@ public class TaQuestionController extends BaseController {
      * @param taQuestion 实体对象
      * @return
      */
-    @RequestMapping(value="/taQuestion",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/question",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taQuestionAdd(@ApiParam("保存内容") @RequestBody TaQuestion taQuestion) throws Exception{
+        if (StringUtils.isEmpty(taQuestion.getQueId())) {
+            return ResponseBean.error("请设置归属问卷", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taQuestion.setQuestionId(null);
 
         if (iTaQuestionService.save(taQuestion)){
             return ResponseBean.success(taQuestion);
@@ -79,10 +104,10 @@ public class TaQuestionController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taQuestion/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/question/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taQuestionDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaQuestionService.removeById(id)){
+    public ResponseBean taQuestionDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaQuestionService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +120,15 @@ public class TaQuestionController extends BaseController {
      * @param taQuestion 实体对象
      * @return
      */
-    @RequestMapping(value="/taQuestion/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/question/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taQuestionUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taQuestionUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaQuestion taQuestion) throws Exception{
+        if (StringUtils.isEmpty(taQuestion.getQueId())) {
+            return ResponseBean.error("请设置归属问卷", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taQuestion.setQuestionId(id);
 
         if (iTaQuestionService.updateById(taQuestion)){
             return ResponseBean.success(iTaQuestionService.getById(id));
@@ -111,9 +141,15 @@ public class TaQuestionController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taQuestion/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/question/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taQuestionGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaQuestionService.getById(id));
+    public ResponseBean taQuestionGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                      @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaQuestion taQuestion = iTaQuestionService.getExistBy("question_id", id, "wx".equals(client), true);
+
+        List<TaAnswer> answerList = iTaAnswerService.getListByQuestion(taQuestion, "wx".equals(client));
+        taQuestion.setAnswerList(answerList);
+
+        return ResponseBean.success(taQuestion);
     }
 }

src/main/java/com/yunzhi/training/controller/TaQuestionnaireController.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +48,20 @@ public class TaQuestionnaireController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taQuestionnaire",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/questionnaire",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taQuestionnaireList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<TaQuestionnaire> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaQuestionnaire> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaQuestionnaire> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaQuestionnaire> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaQuestionnaire> result = iTaQuestionnaireService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaQuestionnaire> result = iTaQuestionnaireService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +69,11 @@ public class TaQuestionnaireController extends BaseController {
      * @param taQuestionnaire 实体对象
      * @return
      */
-    @RequestMapping(value="/taQuestionnaire",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/questionnaire",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taQuestionnaireAdd(@ApiParam("保存内容") @RequestBody TaQuestionnaire taQuestionnaire) throws Exception{
 
+        taQuestionnaire.setQueId(null);
         if (iTaQuestionnaireService.save(taQuestionnaire)){
             return ResponseBean.success(taQuestionnaire);
         }else {
@@ -79,10 +85,10 @@ public class TaQuestionnaireController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taQuestionnaire/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/questionnaire/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taQuestionnaireDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaQuestionnaireService.removeById(id)){
+    public ResponseBean taQuestionnaireDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaQuestionnaireService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,11 +101,12 @@ public class TaQuestionnaireController extends BaseController {
      * @param taQuestionnaire 实体对象
      * @return
      */
-    @RequestMapping(value="/taQuestionnaire/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/questionnaire/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taQuestionnaireUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taQuestionnaireUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaQuestionnaire taQuestionnaire) throws Exception{
 
+        taQuestionnaire.setQueId(id);
         if (iTaQuestionnaireService.updateById(taQuestionnaire)){
             return ResponseBean.success(iTaQuestionnaireService.getById(id));
         }else {
@@ -111,9 +118,10 @@ public class TaQuestionnaireController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taQuestionnaire/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/questionnaire/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taQuestionnaireGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaQuestionnaireService.getById(id));
+    public ResponseBean taQuestionnaireGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                           @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaQuestionnaireService.getExistBy("que_id", id, "wx".equals(client), true));
     }
 }

src/main/java/com/yunzhi/training/entity/TaAnswer.java

@@ -27,7 +27,7 @@ public class TaAnswer implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "答案ID")
-    @TableId(value = "answer_id", type = IdType.INPUT)
+    @TableId(value = "answer_id", type = IdType.UUID)
     private String answerId;
 
     @ApiModelProperty(value = "选项")

src/main/java/com/yunzhi/training/entity/TaQuestion.java

@@ -2,8 +2,12 @@ package com.yunzhi.training.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +31,7 @@ public class TaQuestion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "问题ID")
-    @TableId(value = "question_id", type = IdType.INPUT)
+    @TableId(value = "question_id", type = IdType.UUID)
     private String questionId;
 
     @ApiModelProperty(value = "问题内容")
@@ -45,5 +49,7 @@ public class TaQuestion implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "答案列表")
+    private List<TaAnswer> answerList;
 }

src/main/java/com/yunzhi/training/entity/TaQuestionnaire.java

@@ -27,7 +27,7 @@ public class TaQuestionnaire implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "调查ID")
-    @TableId(value = "que_id", type = IdType.INPUT)
+    @TableId(value = "que_id", type = IdType.UUID)
     private String queId;
 
     @ApiModelProperty(value = "调查名称")

src/main/java/com/yunzhi/training/service/ITaAnswerService.java

@@ -1,7 +1,9 @@
 package com.yunzhi.training.service;
 
 import com.yunzhi.training.entity.TaAnswer;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.training.entity.TaQuestion;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-02-21
  */
-public interface ITaAnswerService extends IService<TaAnswer> {
+public interface ITaAnswerService extends IBaseService<TaAnswer> {
 
+    List<TaAnswer> getListByQuestion(TaQuestion taQuestion, boolean normal);
 }

src/main/java/com/yunzhi/training/service/ITaQuestionService.java

@@ -1,7 +1,6 @@
 package com.yunzhi.training.service;
 
 import com.yunzhi.training.entity.TaQuestion;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-02-21
  */
-public interface ITaQuestionService extends IService<TaQuestion> {
+public interface ITaQuestionService extends IBaseService<TaQuestion> {
 
 }

src/main/java/com/yunzhi/training/service/ITaQuestionnaireService.java

@@ -1,7 +1,6 @@
 package com.yunzhi.training.service;
 
 import com.yunzhi.training.entity.TaQuestionnaire;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-02-21
  */
-public interface ITaQuestionnaireService extends IService<TaQuestionnaire> {
+public interface ITaQuestionnaireService extends IBaseService<TaQuestionnaire> {
 
 }

src/main/java/com/yunzhi/training/service/impl/TaAnswerServiceImpl.java

@@ -1,11 +1,15 @@
 package com.yunzhi.training.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.entity.TaAnswer;
+import com.yunzhi.training.entity.TaQuestion;
 import com.yunzhi.training.mapper.TaAnswerMapper;
 import com.yunzhi.training.service.ITaAnswerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 问题答案 服务实现类
@@ -15,6 +19,16 @@ import org.springframework.stereotype.Service;
  * @since 2022-02-21
  */
 @Service
-public class TaAnswerServiceImpl extends ServiceImpl<TaAnswerMapper, TaAnswer> implements ITaAnswerService {
+public class TaAnswerServiceImpl extends BaseServiceImpl<TaAnswerMapper, TaAnswer> implements ITaAnswerService {
+
+    @Override
+    public List<TaAnswer> getListByQuestion(TaQuestion taQuestion, boolean normal) {
+        QueryWrapper<TaAnswer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("question_id", taQuestion.getQuestionId());
+        queryWrapper.eq(normal, "state", Constants.STATUS_NORMAL);
+        queryWrapper.gt(!normal, "state", Constants.STATUS_DELETED);
+        queryWrapper.orderByAsc("opt_code");
 
+        return null;
+    }
 }

src/main/java/com/yunzhi/training/service/impl/TaQuestionServiceImpl.java

@@ -3,7 +3,6 @@ package com.yunzhi.training.service.impl;
 import com.yunzhi.training.entity.TaQuestion;
 import com.yunzhi.training.mapper.TaQuestionMapper;
 import com.yunzhi.training.service.ITaQuestionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-02-21
  */
 @Service
-public class TaQuestionServiceImpl extends ServiceImpl<TaQuestionMapper, TaQuestion> implements ITaQuestionService {
+public class TaQuestionServiceImpl extends BaseServiceImpl<TaQuestionMapper, TaQuestion> implements ITaQuestionService {
 
 }

src/main/java/com/yunzhi/training/service/impl/TaQuestionnaireServiceImpl.java

@@ -3,7 +3,6 @@ package com.yunzhi.training.service.impl;
 import com.yunzhi.training.entity.TaQuestionnaire;
 import com.yunzhi.training.mapper.TaQuestionnaireMapper;
 import com.yunzhi.training.service.ITaQuestionnaireService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-02-21
  */
 @Service
-public class TaQuestionnaireServiceImpl extends ServiceImpl<TaQuestionnaireMapper, TaQuestionnaire> implements ITaQuestionnaireService {
+public class TaQuestionnaireServiceImpl extends BaseServiceImpl<TaQuestionnaireMapper, TaQuestionnaire> implements ITaQuestionnaireService {
 
 }

src/main/java/com/yunzhi/training/vo/QuestionVO.java

@@ -1,17 +0,0 @@
-package com.yunzhi.training.vo;
-
-import com.yunzhi.training.entity.TaAnswer;
-import com.yunzhi.training.entity.TaQuestion;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(description = "题目")
-public class QuestionVO extends TaQuestion {
-
-    @ApiModelProperty(value = "选项列表")
-    private List<TaAnswer> answerList;
-}