|
|
|
@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
@ -74,11 +75,15 @@ public class InvBusUserController {
|
|
|
|
|
public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) {
|
|
|
|
|
List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
|
|
|
|
|
PageInfo<InvBusUserEntity> pageInfo = new PageInfo<>(responses);
|
|
|
|
|
List<String> actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
|
|
|
|
|
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions);
|
|
|
|
|
PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(warehouseBussinessTypeEntities);
|
|
|
|
|
if (pageInfo.getTotal() == 0) {
|
|
|
|
|
pageSimpleResponse.setList(Collections.emptyList());
|
|
|
|
|
} else {
|
|
|
|
|
List<String> actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
|
|
|
|
|
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions);
|
|
|
|
|
pageSimpleResponse.setList(warehouseBussinessTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|