From 33f4541719f5bf8f98616e3bcfcae1c416c69551 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 30 十一月 2023 13:29:32 +0800
Subject: [PATCH] 调拨出入库导出
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index a3b1464..de10f94 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -124,6 +124,8 @@
String sql = "SELECT\n"
+ "\tfp.BUSINESS_FORM_CODE,\n"
+ "\tfp.AGENCY_NAME tenantName,\n"
+ + "\tfp.INCOME_TIME createTime,\n"
+ + "\tfp.INCOME_NAME operatorName,\n"
+ "\tGOODS_NAME goodsName,\n"
+ "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
+ "\tcounts num,\n"
@@ -159,12 +161,13 @@
Optional<TemplateExcelExport> first = list.stream().findFirst();
TemplateExcelExport templateExcelExport = first.get();
String businessFormCode = templateExcelExport.getBusinessFormCode();
+ Long createTime = templateExcelExport.getCreateTime();
+ String operatorName = templateExcelExport.getOperatorName();
- String dateForHuman = DateUtils.getDateForHuman(System.currentTimeMillis());
Map<String, Object> map = new HashMap<>();
map.put("code", businessFormCode);
- map.put("date", dateForHuman);
- map.put("name", userName);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("name", operatorName);
map.put("sum", sum);
map.put("totalAmount", totalAmount);
map.put("data", list);
--
Gitblit v1.9.1