浏览代码

同步-同步合同段
1、关闭后管修改排序后自动更新合同段的数据
2、同步调整errorMsg太长数据库无法保存,直接打印不存入数据库

LHB 2 周之前
父节点
当前提交
18f061ca85

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

@@ -776,10 +776,6 @@ public class WbsSynchronousServiceImpl {
                                             editContractNode.setIsLinkTable(2);
                                         }
                                     }
-                                    //排序
-                                    if (collect.contains(7)) {
-                                        editContractNode.setSort(templateNode.getSort());
-                                    }
 
                                     //手动选中的表单 进行筛选
                                     if (collect.contains(2) || collect.contains(3) || collect.contains(4) || collect.contains(5) || collect.contains(6) || collect.contains(7)) {
@@ -897,10 +893,10 @@ public class WbsSynchronousServiceImpl {
                     .eq(WbsTreeSynchronousRecord::getId, wbsTreeSynchronousRecord.getId()));
         }
 
-
+        System.err.println(errorMsg);
         synchronousRecordMapper.update(null, Wrappers.<WbsTreeSynchronousRecord>lambdaUpdate()
                 .set(WbsTreeSynchronousRecord::getStatus, 2)
-                .set(WbsTreeSynchronousRecord::getErrorMsg, errorMsg.toString())
+                .set(WbsTreeSynchronousRecord::getErrorMsg, null)
                 .set(WbsTreeSynchronousRecord::getUpdateTime, DateTime.now())
                 .eq(WbsTreeSynchronousRecord::getId, wbsTreeSynchronousRecord.getId()));
     }
@@ -936,7 +932,7 @@ public class WbsSynchronousServiceImpl {
                 }
                 //如果现在还找不到当前节点的父节点就表示数据有问题
                 if (addPrivateParentNodes.isEmpty()) {
-                    throw new ServiceException(addPrivateNode.getNodeName()  + "( " + addPrivateNode.getPKeyId() + ")-找不到父节点");
+                    throw new ServiceException(addPrivateNode.getNodeName() + "( " + addPrivateNode.getPKeyId() + ")-找不到父节点");
                 }
                 //当前新增节点的父节点
                 WbsTreePrivate parent = addPrivateParentNodes.get(0);

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

@@ -434,13 +434,13 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 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);
+//                //合同段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++;
         }