|
|
|
@ -730,7 +730,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
public void exportExcel(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
|
|
|
|
|
logger.debug("excel The method======= exportExcel() start.......................");
|
|
|
|
|
JSONObject transFlow = listPartnerTransFlow(query, partner);
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
|
|
|
|
|
if (!transFlow.getJSONArray("data").isEmpty()) {
|
|
|
|
|
try {
|
|
|
|
|
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
|
|
|
|
@ -815,7 +815,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
public void exportExcelNew(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
|
|
|
|
|
logger.debug("excel The method======= exportExcelNew() start.......................");
|
|
|
|
|
JSONObject transFlow = listPartnerTransFlow(query, partner);
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
|
|
|
|
|
if (!transFlow.getJSONArray("data").isEmpty()) {
|
|
|
|
|
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
|
|
|
|
|
try (HSSFWorkbook workbook = new HSSFWorkbook()) {
|
|
|
|
@ -1689,7 +1689,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
String[] clientIds = query.getClient_ids();
|
|
|
|
|
List<String> clientIdList = new ArrayList<>();
|
|
|
|
|
clientIdList.add("ALL");
|
|
|
|
|
if (clientIds.length >= 2) {
|
|
|
|
|
if (clientIds!=null && clientIds.length >= 2) {
|
|
|
|
|
clientIdList.addAll(Arrays.asList(clientIds));
|
|
|
|
|
}
|
|
|
|
|
HSSFSheet sheet = null;
|
|
|
|
|