项目与合同段表单排序问题

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

@@ -199,7 +199,7 @@ public class WbsTreePrivateController extends BladeController {
 
 
     /**
-     * wbs树节点下表单手动排序
+     * wbs私有树表单手动排序
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "wbs私有树表单手动排序", notes = "WbsTreeDTO2集合,pKeyId=表单pKeyId")

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

@@ -160,11 +160,30 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     @Override
     public boolean wbsTreePrivateTableSort(List<WbsTreePrivateDTO2> wbsTreeDTO) {
         int number = 1;
-        for (WbsTreePrivateDTO2 wbsTree : wbsTreeDTO) {
-            wbsTree.setSort(number);
-            baseMapper.updateSortById2(wbsTree.getPKeyId(), wbsTree.getSort());
+        for (WbsTreePrivateDTO2 wbsTreePrivate : wbsTreeDTO) {
+            //私有wbs树排序
+            wbsTreePrivate.setSort(number);
+            baseMapper.updateSortById2(wbsTreePrivate.getPKeyId(), wbsTreePrivate.getSort());
+
+            //获取projectId、id、wbsId
+            WbsTreePrivate objPrivate = baseMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getPKeyId, wbsTreePrivate.getPKeyId()));
+            if (objPrivate != null) {
+                String projectId = objPrivate.getProjectId();
+                String wbsId = objPrivate.getWbsId();
+                Long id = objPrivate.getId();
+
+                //合同段wbs树同步排序
+                LambdaUpdateWrapper<WbsTreeContract> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(WbsTreeContract::getWbsId, wbsId);
+                updateWrapper.eq(WbsTreeContract::getProjectId, projectId);
+                updateWrapper.eq(WbsTreeContract::getId, id);
+                updateWrapper.set(WbsTreeContract::getSort, number);
+                wbsTreeContractMapper.update(null, updateWrapper);
+            }
+
             number++;
         }
+
         return true;
     }
 
@@ -226,5 +245,4 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     }
 
 
-
 }