数电发票报销调整-开票日期调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -45,6 +45,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -896,8 +898,19 @@ public class ReimbursementInfoService {
         ReimAmountAndFileDto ccpmReimAmountAndFileDto = new ReimAmountAndFileDto();
         BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
-        String[] split = invoiceReimbursement.getInvoiceDate().split(" ");
-        ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDate
+        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+        if (ObjectUtil.isNotEmpty(invoiceDate)){
+            String year = String.valueOf(invoiceDate.getYear());
+            String month = String.valueOf(invoiceDate.getMonthValue());
+            String day = String.valueOf(invoiceDate.getDayOfMonth());
+            // 设置到 ccpmReimAmountAndFileDto 中
+            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+        }else {
+            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        }
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -31,6 +31,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -858,8 +860,18 @@ public class CcpmReimbursementInfoService {
         CcpmReimAmountAndFileDto ccpmReimAmountAndFileDto = new CcpmReimAmountAndFileDto();
         BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
-        String[] split = invoiceReimbursement.getInvoiceDate().split(" ");
-        ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDate
+        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+        if (ObjectUtil.isNotEmpty(invoiceDate)){
+            String year = String.valueOf(invoiceDate.getYear());
+            String month = String.valueOf(invoiceDate.getMonthValue());
+            String day = String.valueOf(invoiceDate.getDayOfMonth());
+            // 设置到 ccpmReimAmountAndFileDto 中
+            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+        }else {
+            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        }
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -34,6 +34,8 @@ import javax.annotation.Resource;
 import com.baomidou.mybatisplus.*;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -908,8 +910,18 @@ public class ZsReimbursementInfoService {
         ZsReimAmountAndFileDto ccpmReimAmountAndFileDto = new ZsReimAmountAndFileDto();
         BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
-        String[] split = invoiceReimbursement.getInvoiceDate().split(" ");
-        ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDate
+        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+        if (ObjectUtil.isNotEmpty(invoiceDate)){
+            String year = String.valueOf(invoiceDate.getYear());
+            String month = String.valueOf(invoiceDate.getMonthValue());
+            String day = String.valueOf(invoiceDate.getDayOfMonth());
+            // 设置到 ccpmReimAmountAndFileDto 中
+            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+        }else {
+            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        }
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -31,6 +31,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 //import com.jeeplus.finance.contractRegistration.service.ContractInfoService;
@@ -860,8 +862,18 @@ public class ConsultancyReimbursementInfoService {
         ConsultancyReimAmountAndFileDto ccpmReimAmountAndFileDto = new ConsultancyReimAmountAndFileDto();
         BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
-        String[] split = invoiceReimbursement.getInvoiceDate().split(" ");
-        ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDate
+        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+        if (ObjectUtil.isNotEmpty(invoiceDate)){
+            String year = String.valueOf(invoiceDate.getYear());
+            String month = String.valueOf(invoiceDate.getMonthValue());
+            String day = String.valueOf(invoiceDate.getDayOfMonth());
+            // 设置到 ccpmReimAmountAndFileDto 中
+            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+        }else {
+            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        }
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -40,6 +40,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1148,8 +1150,18 @@ public class CwReimbursementInfoService {
         CwReimAmountAndFileDto ccpmReimAmountAndFileDto = new CwReimAmountAndFileDto();
         BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
-        String[] split = invoiceReimbursement.getInvoiceDate().split(" ");
-        ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 将字符串转换为 LocalDate
+        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+        if (ObjectUtil.isNotEmpty(invoiceDate)){
+            String year = String.valueOf(invoiceDate.getYear());
+            String month = String.valueOf(invoiceDate.getMonthValue());
+            String day = String.valueOf(invoiceDate.getDayOfMonth());
+            // 设置到 ccpmReimAmountAndFileDto 中
+            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+        }else {
+            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        }
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);