huanghongfa
2021-08-21 2e64c232ab6b51b2cecf1ee96e1e9b709234f326
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -706,8 +706,16 @@
     * @return  问卷调查统计汇总表头统计数据
     */
    @Override
    public R statisticsSummaryHeader(Long questId){
        QuestnaireStatisticsSummaryHeaderAdminVO summaryHeaderAdminVO = this.questnaireDAO.statisticsSummaryHeader(questId);
    public R statisticsSummaryHeader(Long questId,Long communityId){
        QuestnaireStatisticsSummaryHeaderAdminVO summaryHeaderAdminVO = this.questnaireDAO.statisticsSummaryHeader(questId,communityId);
        if(summaryHeaderAdminVO != null){
            if(!summaryHeaderAdminVO.getUserCount().equals(0)){
                BigDecimal nub1 = BigDecimal.valueOf(summaryHeaderAdminVO.getAllCount());
                BigDecimal nub2 = BigDecimal.valueOf(summaryHeaderAdminVO.getUserCount());
                BigDecimal result = nub1.divide(nub2,2,RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
                summaryHeaderAdminVO.setTag(result);
            }
        }
        return R.ok(summaryHeaderAdminVO);
    }
@@ -721,7 +729,7 @@
        //查询所有开始时间已经超过当前时间的待发布状态调查问卷
        List<ComActQuestnaireDO> questnaireDOList = questnaireDAO.selectList(new QueryWrapper<ComActQuestnaireDO>().lambda()
                .eq(ComActQuestnaireDO::getState,ComActQuestnaireDO.state.dfb).eq(ComActQuestnaireDO::getIsHide,0)
                .ge(ComActQuestnaireDO::getStartTime,nowDate));
                .le(ComActQuestnaireDO::getStartTime,nowDate));
        questnaireDOList.forEach(questnaire -> {
            questnaire.setState(ComActQuestnaireDO.state.dyz);
            questnaire.setPublishTime(nowDate);
@@ -731,7 +739,7 @@
        //查询所有结束时间已经超过当前时间的调研中状态调查问卷
        List<ComActQuestnaireDO> questnaireList = questnaireDAO.selectList(new QueryWrapper<ComActQuestnaireDO>().lambda()
                .eq(ComActQuestnaireDO::getState,ComActQuestnaireDO.state.dyz).eq(ComActQuestnaireDO::getIsHide,0)
                .ge(ComActQuestnaireDO::getEndTime,nowDate));
                .le(ComActQuestnaireDO::getEndTime,nowDate));
        questnaireList.forEach(questnaire -> {
            questnaire.setState(ComActQuestnaireDO.state.yjs);
            questnaireDAO.updateById(questnaire);