浏览代码

回显空发票异常处理,并且限制回显的空发票再次上传

huangguoce 2 周之前
父节点
当前提交
fa5831302a

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

@@ -1156,16 +1156,24 @@ public class CwReimbursementInfoService {
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
         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("");
+        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.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);