客户端资料填报-表单上的合同段和编号字段

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -922,7 +922,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (Element element : htdtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 8) {
-                        reData.put(element.attr("keyName"), contractInfo.getContractName());
+                        reData.put(element.attr("keyName"), contractInfo.getContractNumber());
                     }
                 }
             }
@@ -936,12 +936,16 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                 }
             }
+            //获取父节点划分编号
+            WbsTreeContract node = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+                    .eq(WbsTreeContract::getId, wbsTreeContract.getParentId())
+                    .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId()));
             // 编号
             if (bhtitle.size() >= 1 && contractInfo.getIsReferenceNumber() == 1) {
                 for (Element element : bhtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 10) {
-                        reData.put(element.attr("keyName"), contractInfo.getContractNumber());
+                        reData.put(element.attr("keyName"), node.getPartitionCode()==null?"":node.getPartitionCode());
                     }
                 }
             }