Commit c65c7d10 by 墨竹

活码列表修改

parent e9f765c5
...@@ -38,8 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -38,8 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.ArrayList;
import java.util.stream.Collectors; import java.util.List;
import java.util.Map;
/** /**
* 活码(TabHaobanHmQrcode)表控制层 * 活码(TabHaobanHmQrcode)表控制层
...@@ -210,11 +211,11 @@ public class HmQrcodeController { ...@@ -210,11 +211,11 @@ public class HmQrcodeController {
if (hmGroupDTO != null) { if (hmGroupDTO != null) {
hmQrcodeListDTO.setHmGroupName(hmGroupDTO.getGroupName()); hmQrcodeListDTO.setHmGroupName(hmGroupDTO.getGroupName());
} }
if (CollectionUtils.isNotEmpty(storeDTOList)) { //if (CollectionUtils.isNotEmpty(storeDTOList)) {
//门店id去重 // //门店id去重
storeDTOList = storeDTOList.stream() // storeDTOList = storeDTOList.stream()
.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HmStoreDTO::getStoreId))), ArrayList::new)); // .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HmStoreDTO::getStoreId))), ArrayList::new));
} //}
hmQrcodeListDTO.setClerkList(clerkDTOList); hmQrcodeListDTO.setClerkList(clerkDTOList);
hmQrcodeListDTO.setStoreList(storeDTOList); hmQrcodeListDTO.setStoreList(storeDTOList);
} }
......
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