From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期五, 01 十二月 2023 09:38:56 +0800 Subject: [PATCH] feat: 部门退回/报废公用接口 --- 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