From 89881b5b34a65afa4a93abd9377840751672be56 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 30 十一月 2023 15:10:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 4d8a13c..b022376 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -239,6 +239,8 @@
+ "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
+ "\tcounts num,\n"
+ "\ttotal_amount totalAmount,\n"
+ + "\tfo.DEAL_TIME createTime,\n"
+ + "\tfo.OPERATOR_NAME,\n"
+ "\tBEIZ remark\n"
+ "FROM\n"
+ "\tl_wh_procure_model pm\n"
@@ -268,12 +270,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