Merge branch 'test_bak' into 'master'

罗元桥

2021-09-17 77bb47a4fb49876f36e6503915e27aeb5b8f2ed1

Merge branch 'test_bak' into 'master'

Test bak

See merge request root/zhihuishequ!182

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

@@ -478,7 +478,8 @@
         * 查询题目
         */
        List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(
            new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
            new QueryWrapper<ComActQuestnaireSubDO>().lambda()
                    .eq(ComActQuestnaireSubDO::getQueId, questId).orderByAsc(ComActQuestnaireSubDO::getCreateAt));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(ComActQuestnaireSubDO.type.describe)){

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

@@ -51,7 +51,8 @@
        QuestnaireAnswersDTO result = new QuestnaireAnswersDTO();

        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda().eq(ComActReserveSubDO::getReserveId, reserveId));
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
                .eq(ComActReserveSubDO::getReserveId, reserveId).orderByAsc(ComActReserveSubDO::getCreateAt));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(5)){

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireAnswerContentDOMapper.xml

@@ -42,7 +42,7 @@
        WHERE
            caq.id = #{questId}
        ORDER BY
            caqac.id ASC
            caqac.answer_id asc,caqac.id ASC
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml

@@ -34,7 +34,7 @@
            LEFT JOIN com_act_reserve_record carr ON carr.id = ac.reserve_record_id
        WHERE
            qn.id = #{reserveId}
            order by ac.id asc
            order by ac.reserve_record_id asc,ac.id asc
    </select>

    <select id="pageRegisterDetailedListAdmin" parameterType="com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO"