Merge branch 'master' into test

CeDo

2021-06-08 a39945f76232c423d9610f60c98cd3ec53e98cbd

Merge branch 'master' into test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -47,7 +47,7 @@
            "ORDER BY\n" +
            "distance ASC" +
            "<if test='lng != null and lng.trim() != &quot;&quot;'>" +
            " limit 10 " +
            " limit 100 " +
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -183,7 +183,7 @@
            "SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            " com_act_easy_photo p \n" +
            "  com_act_easy_photo p \n" +
            "WHERE\n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"

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

@@ -3,6 +3,7 @@
import java.util.*;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,8 +16,10 @@
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.*;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActQuestnaireService;
@@ -52,6 +55,8 @@
    ComActQuestnaireSubSelectionServiceImpl subSelectionService;
    @Resource
    ComActQuestnaireAnswerContentServiceImpl answerContentService;
    @Resource
    UserService userService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -370,6 +375,15 @@
        if (questnaireDO == null) {
            return R.fail(500, "调查问卷不存在！");
        }
        R r = userService.getUserInfoByUserId(userId+"");
        if(!R.isOk(r)){
            return R.fail("用户信息错误");
        }
        LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginUserInfoVO.class);
        Long userCommunityId = loginUserInfoVO.getCommunityId();
        if(questnaireDO.getCommunityId()!=null && questnaireDO.getCommunityId().longValue()!=userCommunityId.longValue()){
            return R.fail(500, "您目前所属社区无法填写当前社区的调查问卷，请切换社区后重试");
        }
        LambdaQueryWrapper<ComActQuestnaireSubDO> subQuery = new LambdaQueryWrapper<ComActQuestnaireSubDO>();
        subQuery.eq(ComActQuestnaireSubDO::getQueId,answerQuestnaireVO.getQuestId());
        List<ComActQuestnaireSubDO> subDOS = questnaireSubDAO.selectList(subQuery);