Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 cae6e79d748d47fc80a6087915db14d229b3af9a

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/common/common.iml

File was deleted

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

@@ -1,9 +1,20 @@
package com.panzhihua.common.model.vos.community;

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

@Data
@ApiModel("问卷回答记录内容")
public class ComActQuestnaireAnswerContentVO {
    @ApiModelProperty("用户ID")
    private Long userId;
    @ApiModelProperty("问卷题目ID")
    private Long subId;
    @ApiModelProperty("id")
    private Long id;
    @ApiModelProperty("问卷回答选项")
    private String choice;
    @ApiModelProperty("问卷回答内容")
    private String answerContent;
}

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

@@ -7,5 +7,13 @@
@Data
@ApiModel("问卷题目选项")
public class ComActQuestnaireSubSelectionVO {
    @ApiModelProperty("ID")
    private Long id;
    @ApiModelProperty("问题题目ID")
    private Long queSubId;
    @ApiModelProperty("选项排序")
    private int optin;
    @ApiModelProperty("选项内容")
    private String content;

}

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

@@ -14,7 +14,7 @@
@ApiModel("用户问卷回答信息")
public class UsersAnswerVO {
    @ApiModelProperty(value = "问卷信息")
    private ComActQuestnaireVO questnaireVO;
    private ComActQuestnaireVO questnaire;
    @ApiModelProperty(value = "用户调查问卷题目信息")
    private List<UsersSubAnswerVO> usersSubAnswerVOS;
    private List<UsersSubAnswerVO> usersSubAnswer;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -68,6 +68,8 @@
    private ComMngStructAreaDistrictService comMngStructAreaDistrictService;
    @Resource
    private ComActMessageService comActMessageService;
    @Resource
    private ComActQuestnaireService comActQuestnaireService;

    /**
     * 新增社区活动
@@ -1286,4 +1288,16 @@
    public R houseExport(@RequestParam("areaId") Long areaId) {
        return comMngStructHouseService.houseExport(areaId);
    }

    /**
     * 查看用户问卷调查详细
     * @param userId 用户ID
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @GetMapping("questnaire/usersanswer")
    public R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId) {
        return comActQuestnaireService.answerInfoQuestnaire(userId, questId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.service.impl;

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;
@@ -20,7 +22,14 @@
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.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
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;
@@ -150,10 +159,50 @@
    public R answerInfoQuestnaire(Long userId, Long questId) {

        ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
        if(comActQuestnaireDO==null){
            return  R.fail("问卷不存在!");
        }

        UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
        ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
        BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
        usersAnswerVO.setQuestnaire(comActQuestnaireVO);

        List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
        List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();

        list.forEach(comActQuestnaireSubDO ->{
            UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
            Long subId = comActQuestnaireSubDO.getId();
            List<ComActQuestnaireSubSelectionDO> comActQuestnaireSubSelectionDOs =
                    questnaireSubSelectionDAO.selectList(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda().eq(ComActQuestnaireSubSelectionDO::getQueSubId, subId));


            List<ComActQuestnaireSubSelectionVO> comActQuestnaireSubSelectionVOs = new ArrayList<>();
            comActQuestnaireSubSelectionDOs.forEach(comActQuestnaireSubSelectionDO -> {
                ComActQuestnaireSubSelectionVO comActQuestnaireSubSelectionVO = new ComActQuestnaireSubSelectionVO();
                BeanUtils.copyProperties(comActQuestnaireSubSelectionDO, comActQuestnaireSubSelectionVO);
                comActQuestnaireSubSelectionVOs.add(comActQuestnaireSubSelectionVO);
            });
            usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
            //用户回答
        List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
                questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId).eq(ComActQuestnaireAnswerContentDO::getSubId, questId));
                    questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
                            .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));

        return null;
            List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
            questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO->{
                ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
                BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
                questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
            });

            usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
            usersSubAnswerVOList.add(usersSubAnswerVO);
            }
        );
        usersAnswerVO.setUsersSubAnswer(usersSubAnswerVOList);

        return R.ok(usersAnswerVO);
    }
}