Merge branch 'feature/1006126' into 'master'

feat : [1006126] 修改下载的多个选项回答只有一个

See merge request rays/pcloud-book!1470

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/BmBizImpl.java

@@ -59,6 +59,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 
 /**
  * @描述：报名
@@ -535,16 +539,17 @@ public class BmBizImpl implements BmBiz {
             for (int m = 0; m < optionList.size(); m++) {
                 AdvertisingBmOption appOption = optionList.get(m);
                 Long optionId = appOption.getId();
-                String optionValue = "";
+                List<String> optionValues = new ArrayList<>();
                 for (BmRegisterItemDTO dto : registerDto.getRegisterItemDTOS()) {
                     if (optionId.equals(dto.getOptionId())) {
-                        optionValue = dto.getOptionValue();
-                        optionValue = StringUtil.isEmpty(optionValue) ? "" : optionValue;
+                        if(StrUtil.isNotBlank(dto.getOptionValue())){
+                            optionValues.add(dto.getOptionValue());
+                        }
                     }
                 }
                 SXSSFCell cellm = srow.createCell(m + 3);
                 cellm.setCellStyle(dataStyle);
-                cellm.setCellValue(optionValue);
+                cellm.setCellValue(CollUtil.isEmpty(optionValues) ? "" : optionValues.stream().collect(Collectors.joining(",")));
             }
         }
     }

pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingBmRegisterItemMapper.xml

@@ -45,8 +45,6 @@
     LEFT JOIN advertising_bm_option b ON a.option_id = b.ID
     WHERE
     a.register_id = #{id}
-    GROUP BY
-    a.option_id
     ORDER BY
     b.seq ASC,
     b.id ASC