报告导入模板调整，批量开票申请添加电话校验

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

@@ -1834,7 +1834,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 CwFinanceInvoiceDTO item = list.get(i);
                 String message = projectValidation(item.getId());
                 if (StringUtils.isNotBlank(message)) {
-                    result.add("第" + (i + 1) + "条，报告号为" + item.getReportNo() + "的开票申请数据存在以下问题：" + message);
+                    result.add("第" + (i + 1) + "条，项目名为" + item.getProgramName() + "的开票申请数据存在以下问题：" + message);
                     continue;
                 }
                 //发起报告号申请
@@ -1902,16 +1902,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         if (StringUtils.isBlank(cwFinanceInvoiceDTO.getBillingContent())) {
             errorMsg.append("开票内容不能为空；");
         }
-        if (StringUtils.isBlank(cwFinanceInvoiceBaseDTO.getAccount())) {
+        if (StringUtils.isBlank(cwFinanceInvoiceDTO.getAccount())) {
             errorMsg.append("开票金额不能为空；");
         }
-        //TODO：正在处理红字发票问题，没找到此字段
-        //TODO：正在处理红字发票问题，没找到此字段
-        //TODO：正在处理红字发票问题，没找到此字段
-        //TODO：正在处理红字发票问题，没找到此字段
-        //if (cwFinanceInvoiceDTO.getRedInvoiceFlag() == null) {
-        //    errorMsg.append("是否红字发票不能为空；");
-        //}
+        if (StringUtils.isBlank(cwFinanceInvoiceDTO.getTelPhone())) {
+            errorMsg.append("电话不能为空；");
+        }
         if (StringUtils.isBlank(cwFinanceInvoiceDTO.getIsMultiple())) {
             errorMsg.append("是否多张开票不能为空；");
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -5594,8 +5594,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                                     w.or(x -> {
                                         if (StringUtils.isNotBlank(name)) {
                                             x.eq(CwProjectRecords::getProjectName, name);
-                                        }
-                                        if (StringUtils.isNotBlank(number)) {
+                                        }else{
                                             x.eq(CwProjectRecords::getProjectNumber, number);
                                         }
                                     });
@@ -5682,11 +5681,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     if (projectRecord == null) {
                         String projectMasterId = item.getProjectMasterId();
                         String realHeader = item.getRealHeader();
+
                         if (
                                 !projectMasterId.equals(signatureAnnotator1)
                                         && !projectMasterId.equals(signatureAnnotator2)
-                                        && !realHeader.equals(signatureAnnotator1)
-                                        && !realHeader.equals(signatureAnnotator2)
+                                        && !Objects.equals(realHeader, signatureAnnotator1)
+                                        && !Objects.equals(realHeader, signatureAnnotator2)
                         ) {
                             result.add("第" + (actualIndex) + "条，报告名为" + item.getReportName() + "的数据存在以下问题：签字注师1和签字注师2至少有一个与项目的项目经理一致");
                             continue;
@@ -5697,9 +5697,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         cwProjectRecordsDTO.setReportType(item.getProjectType());
                         cwProjectRecordsDTOS.add(cwProjectRecordsDTO);
                         String projectResult = cwProjectRecordsService.importProjectRecords(cwProjectRecordsDTOS);
+
                         if (StringUtils.isNotBlank(projectResult)) {
                             result.add("第" + (actualIndex) + "条，报告名为" + item.getReportName() + "的数据存在以下问题：" + projectResult);
                             continue;
+                        }else{
+                            LambdaQueryWrapper<CwProjectRecords> projectWrapper = new LambdaQueryWrapper<>();
+                            projectWrapper.eq(CwProjectRecords::getProjectName, item.getProjectName());
+                            CwProjectRecords newProject = cwProjectRecordsService.getOne(wrapper);
+                            if(StringUtils.isNotBlank(newProject.getId())){
+                                item.setProjectId(newProject.getId());
+                            }
                         }
                     } else {
                         //项目信息存在