保存当前工作进度

src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java

@@ -1415,7 +1415,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 //                                if (Objects.isNull(entity.getInTaxRate())) {
 //                                    errors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：增值税率不能为空");
 //                                }
-                               // 销售合同产品明细校验
+                                // 销售合同产品明细校验
                                 if (StringUtils.isEmpty(entity1.getFno())) {
                                     errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：销售合同号不能为空！");
                                 }
@@ -1702,43 +1702,47 @@ public class SalesContractServiceImpl implements SalesContractService {
                         }
 
                         // 单个记录校验
+                        boolean hasRCenterErrors = false;
                         for (int i = 0; i < currentRCenterDtlList.size(); i++) {
                             RCenterDtlExcelDTO dto = currentRCenterDtlList.get(i);
 
-//                            if (StringUtils.isEmpty(dto.getPersonDeptNm())) {
-//                                errors.add("责任中心(Sheet4) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：部门名称不能为空！");
-//                            }
-                            // ... 保持原有的责任中心校验逻辑
                             if (StringUtils.isEmpty(dto.getFno())) {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：销售合同号不能为空!");
+                                hasRCenterErrors = true;
                             }
                             if (StringUtils.isEmpty(dto.getPersonDeptNm())) {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：部门名称不能为空！");
+                                hasRCenterErrors = true;
                             }
+
                             List<CustCtrl> personDeptNmList = custCtrlMapper.selectByPersonDeptNm(dto.getPersonDeptNm());
                             if (personDeptNmList == null || personDeptNmList.isEmpty()) {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：部门名称有误！");
+                                hasRCenterErrors = true;
                             }
 
                             if (personDeptNmList != null && !personDeptNmList.isEmpty() && personDeptNmList.get(0).getDeptCode().isEmpty()) {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：匹配到的部门编码为空");
+                                hasRCenterErrors = true;
                             }
 
                             if (personDeptNmList != null && !personDeptNmList.isEmpty() && !personDeptNmList.get(0).getDeptCode().isEmpty()) {
                                 dto.setPersonDeptId(personDeptNmList.get(0).getDeptCode());
                             }
 
-                            if (personDeptNmList != null && !personDeptNmList.isEmpty() && StringUtils.isEmpty(dto.getInstitutionNm())
-                                    && !personDeptNmList.get(0).getCpny().isEmpty()) {
-                                if (dto.getInstitutionNm().equals(personDeptNmList.get(0).getCpny())) {
+                            // 修复公司名称校验逻辑
+                            if (personDeptNmList != null && !personDeptNmList.isEmpty() && !StringUtils.isEmpty(dto.getInstitutionNm())) {
+                                if (!dto.getInstitutionNm().equals(personDeptNmList.get(0).getCpny())) {
                                     errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：公司名称与匹配到的公司名称不一致！");
+                                    hasRCenterErrors = true;
                                 }
                             }
 
-                            if (personDeptNmList != null && !personDeptNmList.isEmpty() && StringUtils.isEmpty(dto.getInstitutionId())
-                                    && !personDeptNmList.get(0).getFno().isEmpty()) {
-                                if (dto.getInstitutionId().equals(personDeptNmList.get(0).getFno())) {
+                            // 修复公司代码校验逻辑
+                            if (personDeptNmList != null && !personDeptNmList.isEmpty() && !StringUtils.isEmpty(dto.getInstitutionId())) {
+                                if (!dto.getInstitutionId().equals(personDeptNmList.get(0).getFno())) {
                                     errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：公司代码与匹配到的公司代码不一致！");
+                                    hasRCenterErrors = true;
                                 }
                             }
 
@@ -1746,10 +1750,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 List<SysUser> createByList = sysUserMapper.selectByCreateBy(dto.getCreateBy());
                                 if (createByList == null || createByList.isEmpty()) {
                                     errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：制单人代码有误！");
+                                    hasRCenterErrors = true;
                                 }
 
                                 if (createByList != null && !createByList.isEmpty() && createByList.get(0).getId().isEmpty()) {
                                     errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：制单人代码查到的制单人部门编码为空！");
+                                    hasRCenterErrors = true;
                                 }
 
                                 if (createByList != null && !createByList.isEmpty() && !createByList.get(0).getId().isEmpty()) {
@@ -1758,6 +1764,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
                                 if (createByList != null && !createByList.isEmpty() && createByList.get(0).getDeptName().isEmpty()) {
                                     errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：制单人代码查到的制单人部门名称为空！");
+                                    hasRCenterErrors = true;
                                 }
                                 if (createByList != null && !createByList.isEmpty() && !createByList.get(0).getDeptName().isEmpty()) {
                                     dto.setDeptName(createByList.get(0).getDeptName());
@@ -1766,18 +1773,19 @@ public class SalesContractServiceImpl implements SalesContractService {
                                     dto.setCreateByName(createByList.get(0).getUserDesc());
                                 }
                             }
+                        }
 
-                            // 如果没有错误则插入所有记录
-                            if (errors.stream().noneMatch(error -> error.contains("责任中心(Sheet4) 合同号 " + currentSono))) {
-                                for (RCenterDtlExcelDTO rCenterDtlExcelDTO : currentRCenterDtlList) {
-                                    RCenterDtlEntity entity3 = new RCenterDtlEntity();
-                                    BeanUtils.copyProperties(rCenterDtlExcelDTO, entity3);
-                                    entity3.setRid(mainId);
-                                    rCenterDtlMapper.insert(entity3);
-                                }
+                        // 如果没有错误则插入所有记录 - 移到循环外部
+                        if (!hasRCenterErrors && errors.stream().noneMatch(error -> error.contains("责任中心(Sheet4) 合同号 " + currentSono))) {
+                            for (RCenterDtlExcelDTO rCenterDtlExcelDTO : currentRCenterDtlList) {
+                                RCenterDtlEntity entity3 = new RCenterDtlEntity();
+                                BeanUtils.copyProperties(rCenterDtlExcelDTO, entity3);
+                                entity3.setRid(mainId);
+                                rCenterDtlMapper.insert(entity3);
                             }
                         }
 
+
                         // ================= 处理费用明细 =================
                         List<FeeDtlExcelDTO> currentFeeDtlList = feeDtlList.stream()
                                 .filter(dto -> currentSono.equals(dto.getFno()))
@@ -1892,7 +1900,8 @@ public class SalesContractServiceImpl implements SalesContractService {
                 }
             }
 
-        } catch (Exception e) {
+        } catch (
+                Exception e) {
             errors.add("系统异常：" + e.getMessage());
         }