Commit f7d69dbd by 郑勇

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

parent 2a5abfd9
...@@ -59,6 +59,10 @@ import java.util.List; ...@@ -59,6 +59,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; 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 { ...@@ -535,16 +539,17 @@ public class BmBizImpl implements BmBiz {
for (int m = 0; m < optionList.size(); m++) { for (int m = 0; m < optionList.size(); m++) {
AdvertisingBmOption appOption = optionList.get(m); AdvertisingBmOption appOption = optionList.get(m);
Long optionId = appOption.getId(); Long optionId = appOption.getId();
String optionValue = ""; List<String> optionValues = new ArrayList<>();
for (BmRegisterItemDTO dto : registerDto.getRegisterItemDTOS()) { for (BmRegisterItemDTO dto : registerDto.getRegisterItemDTOS()) {
if (optionId.equals(dto.getOptionId())) { if (optionId.equals(dto.getOptionId())) {
optionValue = dto.getOptionValue(); if(StrUtil.isNotBlank(dto.getOptionValue())){
optionValue = StringUtil.isEmpty(optionValue) ? "" : optionValue; optionValues.add(dto.getOptionValue());
}
} }
} }
SXSSFCell cellm = srow.createCell(m + 3); SXSSFCell cellm = srow.createCell(m + 3);
cellm.setCellStyle(dataStyle); cellm.setCellStyle(dataStyle);
cellm.setCellValue(optionValue); cellm.setCellValue(CollUtil.isEmpty(optionValues) ? "" : optionValues.stream().collect(Collectors.joining(",")));
} }
} }
} }
......
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
LEFT JOIN advertising_bm_option b ON a.option_id = b.ID LEFT JOIN advertising_bm_option b ON a.option_id = b.ID
WHERE WHERE
a.register_id = #{id} a.register_id = #{id}
GROUP BY
a.option_id
ORDER BY ORDER BY
b.seq ASC, b.seq ASC,
b.id ASC b.id ASC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment