Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 5272282713de10ac4c1965d05f190f9c0a84ffdb

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireAnswerStatVO.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.vos.community.questnaire;

import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 用户答卷详细
 */
@Data
@ApiModel("用户问卷回答统计信息")
public class QuestnaireAnswerStatVO {
    @ApiModelProperty(value = "问卷信息")
    private ComActQuestnaireVO questnaire;
    @ApiModelProperty(value = "用户调查问卷题目统计信息")
    private List<UsersSubAnswerStatVO> usersSubAnswerStat;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsearSubAnswerSelectionStatVO.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.model.vos.community.questnaire;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("用户调查问卷题目-选择项统计信息")
public class UsearSubAnswerSelectionStatVO {
    @ApiModelProperty("选项")
    private String optionName;
    @ApiModelProperty("小计")
    private String total;
    @ApiModelProperty("比例")
    private String proportion;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerStatVO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.vos.community.questnaire;

import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 用户答卷详细
 */
@Data
@ApiModel("用户调查问卷题目统计信息")
public class UsersSubAnswerStatVO {
    @ApiModelProperty(value = "调查问卷题目")
    private ComActQuestnaireSubVO questSubVO;

    @ApiModelProperty(value = "用户回答统计")
    private List<UsearSubAnswerSelectionStatVO> usersAnswer;

    @ApiModelProperty(value = "本题答题人数")
    private Integer total;
}

 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;
@@ -12,8 +13,7 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.*;
import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO;
@@ -29,8 +29,6 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubSelectionVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersSubAnswerVO;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -178,7 +176,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