|
@@ -1156,16 +1156,24 @@ public class CwReimbursementInfoService {
|
|
BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
|
|
BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
// 将字符串转换为 LocalDate
|
|
// 将字符串转换为 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("");
|
|
|
|
|
|
+ String dateStr = invoiceReimbursement.getInvoiceDate();
|
|
|
|
+ LocalDate invoiceDate = null;
|
|
|
|
+ if (dateStr != null && !dateStr.trim().isEmpty()) {
|
|
|
|
+ invoiceDate = LocalDate.parse(dateStr, 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("");
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ ccpmReimAmountAndFileDto.setInvoiceDate(null);
|
|
}
|
|
}
|
|
|
|
+ //LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
|
|
|
|
+
|
|
ccpmReimAmountAndFileDto.setId(i.getId());
|
|
ccpmReimAmountAndFileDto.setId(i.getId());
|
|
ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
|
|
ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
|
|
invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);
|
|
invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);
|