孟苏慧

导出报表增加字段

......@@ -89,6 +89,10 @@ public class SettlementDTO {
public static class SettlementOrderDetail {
private String mealTime;
private String code;
/** 支付完成时间,格式 yyyy-MM-dd HH:mm:ss,无则空 */
private String payTime;
/** 下单人:院区端为操作员名称;住院小程序为客户姓名;阳光厅为客户手机号 */
private String orderer;
private String mealName;
private String roomNo;
private String customerName;
......
......@@ -2,12 +2,16 @@ package com.infoloop.tianting.service.client;
import com.infoloop.tianting.COperatorServiceProtoRpcGrpc;
import com.infoloop.tianting.GetCOperatorByIdRpcRequest;
import com.infoloop.tianting.GetCOperatorByIdsRpcRequest;
import com.infoloop.tianting.GetCOperatorByMobileOrEmailRpcRequest;
import com.infoloop.tianting.SingleCOperatorRpcResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class OperatorServiceRpcClient {
......@@ -26,5 +30,15 @@ public class OperatorServiceRpcClient {
return cOperatorServiceProtoRpcBlockingStub.getCOperatorById(request).getResponse();
}
public List<SingleCOperatorRpcResponse> getCOperatorsByIds(List<Integer> ids) {
if (ids == null || ids.isEmpty()) {
return Collections.emptyList();
}
return cOperatorServiceProtoRpcBlockingStub.getCOperatorByIds(GetCOperatorByIdsRpcRequest.newBuilder()
.addAllIds(ids)
.setIncludeDeleted(false)
.build())
.getResponsesList();
}
}
......