预开票

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -345,9 +345,11 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         if (ObjectUtil.isNotEmpty(cwFinanceInvoiceDTO)){
             for (CwFinanceInvoiceBaseDTO cwFinanceInvoiceBaseDTO : cwFinanceInvoiceDTO.getFinanceInvoiceBaseDTOList()) {
                 CwProjectRecordsDTO projectRecordsDTO = cwProjectRecordsMapper.queryById(cwFinanceInvoiceBaseDTO.getProgramId());
-                if (StringUtils.isNotBlank(projectRecordsDTO.getIsPreInvoice()) && "1".equals(projectRecordsDTO.getIsPreInvoice())){
-                    cwFinanceInvoiceBaseDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
-                    cwFinanceInvoiceDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
+                if (ObjectUtil.isNotEmpty(projectRecordsDTO)){
+                    if (StringUtils.isNotBlank(projectRecordsDTO.getIsPreInvoice()) && "1".equals(projectRecordsDTO.getIsPreInvoice())){
+                        cwFinanceInvoiceBaseDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
+                        cwFinanceInvoiceDTO.setIsPreInvoice(projectRecordsDTO.getIsPreInvoice());
+                    }
                 }
                 List<CwProjectReportData> reportData = cwProjectReportMapper.getByProjectId(cwFinanceInvoiceBaseDTO.getProgramId());
                 if (CollectionUtils.isNotEmpty(reportData)){
@@ -827,7 +829,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         queryWrapper.eq("fib.del_flag",'0');
         queryWrapper.eq("fi.del_flag",'0');
         queryWrapper.eq("fi.status",cwFinanceInvoiceDTO.getStatus());
-        queryWrapper.eq("fib.program_id",cwFinanceInvoiceDTO.getProgramId());
+        queryWrapper.eq("fib.program_id",cwFinanceInvoiceDTO.getProgramId()).or().eq("fib.program_id",cwFinanceInvoiceDTO.getId());
         if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
             queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName());
         }