From f1b5b3336fc2d3e021a9c98220f89f212093d498 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 14:00:19 +0800
Subject: [PATCH] 合同导出

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 9e0ecac..eb9cd72 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -238,8 +238,10 @@
             templateParam.put("endTime", DateUtils.localDateTimeToStringYear(contract.getEndTime()));
             templateParam.put("monthRent", "¥¥"+contract.getMonthRent()+"元");
             templateParam.put("monthRentString", "人民币"+NumberToChineseUtils.numberToChinese(contract.getMonthRent().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()));
-            templateParam.put("totalYear", "¥¥"+contract.getTotalYear()+"元");
-            templateParam.put("totalYearString", "人民币"+NumberToChineseUtils.numberToChinese(contract.getTotalYear().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()));
+            String totalYear = Objects.nonNull(contract.getTotalYear())?contract.getTotalYear().toString():"";
+            templateParam.put("totalYear", "¥¥"+totalYear+"元");
+            String totalYearString = StringUtils.isNotEmpty(totalYear)?NumberToChineseUtils.numberToChinese(contract.getTotalYear().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()):"";
+            templateParam.put("totalYearString", "人民币"+totalYearString);
             templateParam.put("payType", contract.getPayType().equals("1")?"月":contract.getPayType().equals("2")?"季":"年");
             templateParam.put("firstRent", "¥"+(contract.getPayType().equals("1")?contract.getMonthRent():contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12"))).setScale(2,BigDecimal.ROUND_DOWN)+"元");
             templateParam.put("firstRentString", "人民币"+NumberToChineseUtils.numberToChinese((contract.getPayType().equals("1")?contract.getMonthRent():contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12")).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue()));
@@ -250,7 +252,7 @@
             templateParam.put("partyOnePhone", contract.getPartyOnePhone());
             templateParam.put("partyTwoPerson", contract.getPartyTwoPerson());
             templateParam.put("partyTwoPhone", contract.getPartyTwoPhone());
-            String url = wordUtil.generatePdf("/templates", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
+            String url = wordUtil.generatePdf("/template", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
             res.add(url);
         }
 
@@ -274,12 +276,13 @@
             contractExport.setContractName(contract.getContractName());
             contractExport.setPartyOneName(contract.getPartyOneName());
             contractExport.setPartyTwoName(contract.getPartyTwoName());
-            contractExport.setCreate_time(contract.getCreateTime());
-            contractExport.setStartTime(contract.getStartTime());
-            contractExport.setEndTime(contract.getEndTime());
+            contractExport.setCreateTime(DateUtils.localDateTimeToStringYear(contract.getCreateTime()));
+            contractExport.setStartTime(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
+            contractExport.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
             contractExport.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType()));
             contractExport.setDeposit(contract.getDeposit()+"");
             contractExport.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,contract.getStatus()));
+            contractExports.add(contractExport);
         }
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports);
         HttpServletResponse response = WebUtils.response();
@@ -296,7 +299,6 @@
             workbook.write(outputStream);
         } catch (IOException e) {
             e.printStackTrace();
-            System.err.println("合同列表信息导出失败");
         } finally {
             try {
                 outputStream.close();

--
Gitblit v1.7.1