From 5152d8c282f56853eff61071db43e20a8defa4b8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 13 十一月 2025 13:43:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/common/CalculateDateUtils.java | 2 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/common/CalculateDateUtils.java b/ruoyi-project/src/main/java/com/ruoyi/project/common/CalculateDateUtils.java
index 9514519..118a677 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/common/CalculateDateUtils.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/common/CalculateDateUtils.java
@@ -30,6 +30,7 @@
// 灏忎簬 1 涓湀锛屾寜澶╄绠�
ageUnit = "澶�";
age = (int) totalDays;
+ if (age != null) age = age + 1;
ageMap.put("age", age != null ? age.toString() : null);
ageMap.put("ageUnit", ageUnit);
ageMap.put("age2", null);
@@ -40,6 +41,7 @@
age = (int) totalMonths;
ageUnit2 = "澶�";
age2 = days;
+ if (age2 != null) age2 = age2 + 1;
ageMap.put("age", age != null ? age.toString() : null);
ageMap.put("ageUnit", ageUnit);
ageMap.put("age2", age2 != null ? age2.toString() : null);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index f66c3ec..0434b71 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -690,6 +690,10 @@
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> annexfilesList = new ArrayList<>();
for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailSharedList) {
+ //闄勪欢澶勭悊
+ String annexfiles = serviceFunddetailShared.getAnnexfiles();
+ String invoicefiles = serviceFunddetailShared.getInvoicefiles();
+
Map<String, Object> map = new HashMap<>();
map.put("搴忓彿1", serviceFunddetailShared.getOrderno());
map.put("璐圭敤椤圭洰", serviceFunddetailShared.getItemname());
@@ -700,12 +704,18 @@
map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxedamount());
map.put("浣滃簾鏈�缁堥噾棰�", null);
Long fpuuid = COUNTER.incrementAndGet();
- map.put("鍙戠エ闄勪欢", fpuuid);
+ map.put("鍙戠エ闄勪欢", "");
+ if (StringUtils.isNotEmpty(invoicefiles)) {
+ map.put("鍙戠エ闄勪欢", fpuuid);
+ }
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
map.put("绋庨", serviceFunddetailShared.getTaxamount());
long qtuuid = COUNTER.incrementAndGet();
- map.put("鍏朵粬闄勪欢", qtuuid);
+ map.put("鍏朵粬闄勪欢", "");
+ if (StringUtils.isNotEmpty(annexfiles)) {
+ map.put("鍏朵粬闄勪欢", qtuuid);
+ }
map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode());
map.put("棰勭畻椤圭洰", null);
map.put("璐锋柟绉戠洰", null);
@@ -715,9 +725,6 @@
map.put("璐圭敤璇存槑", null);
list.add(map);
- //闄勪欢澶勭悊
- String annexfiles = serviceFunddetailShared.getAnnexfiles();
- String invoicefiles = serviceFunddetailShared.getInvoicefiles();
int i = 0;
if (StringUtils.isNotEmpty(annexfiles)) {
--
Gitblit v1.9.3