Merge branch 'refs/heads/feature-lihb-20250716' into test-merge

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContractExtend.java

@@ -17,6 +17,10 @@ public class WbsTreeContractExtend {
      */
     @TableId
     private Long pKeyId;
+    /**
+     * 合同id
+     */
+    private Long contractId;
 
     /**
      *  类型（1-施工，2-监理）

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1511,7 +1511,7 @@ public class ExcelTabController extends BladeController {
         wbsTreeContractExtendService.update(Wrappers.<WbsTreeContractExtend>update().lambda()
                 .set(WbsTreeContractExtend::getIsSync, 0)
                 .eq(WbsTreeContractExtend::getType, classify)
-                .eq(WbsTreeContractExtend::getPKeyId, pKeyIds));
+                .in(WbsTreeContractExtend::getPKeyId, pKeyIds));
 
         executionTime.info("----数据合并前----");
         List<String> errorPKeyIds = new ArrayList<>();

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

@@ -864,6 +864,7 @@ public class WbsSynchronousServiceImpl {
             addData.forEach(f -> {
                 WbsTreeContractExtend wbsTreeContractExtend = new WbsTreeContractExtend();
                 wbsTreeContractExtend.setPKeyId(f.getPKeyId());
+                wbsTreeContractExtend.setPKeyId(Long.valueOf(f.getContractId()));
                 wbsTreeContractExtend.setIsSync(1);
                 wbsTreeContractExtend.setSyncTime(DateTime.now());
                 wbsTreeContractExtend.setAncestors(f.getAncestorsPId());
@@ -886,6 +887,7 @@ public class WbsSynchronousServiceImpl {
             editData.forEach(f -> {
                 WbsTreeContractExtend wbsTreeContractExtend = new WbsTreeContractExtend();
                 wbsTreeContractExtend.setPKeyId(f.getPKeyId());
+                wbsTreeContractExtend.setPKeyId(Long.valueOf(f.getContractId()));
                 wbsTreeContractExtend.setIsSync(1);
                 wbsTreeContractExtend.setSyncTime(DateTime.now());
                 wbsTreeContractExtend.setAncestors(f.getAncestorsPId());