|
|
@@ -424,17 +424,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
if (kindInfo != null) {
|
|
|
for (int i = 0; i < kindInfo.size(); i++) {
|
|
|
String kindCode = kindInfo.getJSONObject(i).getString("kindCode");
|
|
|
- String amount = kindInfo.getJSONObject(i).getString("amount");
|
|
|
+
|
|
|
if (kindCode != null) {
|
|
|
switch (kindCode) {
|
|
|
case "B":
|
|
|
- insOrdersExcel.setThird(amount);
|
|
|
+ insOrdersExcel.setThird(kindInfo.getJSONObject(i).getString("amount"));
|
|
|
break;
|
|
|
case "D4":
|
|
|
- insOrdersExcel.setSit(amount);
|
|
|
+ insOrdersExcel.setSit(kindInfo.getJSONObject(i).getString("unitAmount"));
|
|
|
break;
|
|
|
case "D3":
|
|
|
- insOrdersExcel.setDriver(amount);
|
|
|
+ insOrdersExcel.setDriver(kindInfo.getJSONObject(i).getString("amount"));
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -443,21 +443,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
}
|
|
|
String s = EasyExcelUtils.downExcel(uploadFilePath, InsOrdersExcel.class, insOrdersExcels);
|
|
|
return HttpResult.ok("", s);
|
|
|
-
|
|
|
-
|
|
|
-// Date now = new Date();
|
|
|
-// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
|
|
-// String fileName = "orders";
|
|
|
-// // 导出
|
|
|
-// ExportParams exportParams = new ExportParams("订单信息表"+simpleDateFormat.format(now), null, ExcelType.HSSF);
|
|
|
-// // 设置
|
|
|
-// exportParams.setStyle(ExcelStyleUtil.class);
|
|
|
-//
|
|
|
-// try {
|
|
|
-// ExcelUtils2.exportExcel(insOrdersExcels, InsOrdersExcel.class, fileName, exportParams, request, response);
|
|
|
-// } catch (IOException e) {
|
|
|
-// log.error(String.valueOf(e));
|
|
|
-// }
|
|
|
}
|
|
|
|
|
|
|