Merge branch 'dev' of http://219.151.185.227:3000/zhuwei/bladex

# Conflicts:
#	blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java
#	doc/lib/eVisaLib/logback.cfca-4.2.1.0.jar

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -599,7 +599,7 @@ public class InformationWriteQueryController extends BladeController {
     }
 
     /**
-     * 单个废除 撤回
+     * 单个废除
      */
     @PostMapping("/abolishOne")
     @ApiOperationSupport(order = 24)
@@ -611,13 +611,13 @@ public class InformationWriteQueryController extends BladeController {
         primaryKeyId = primaryKeyId + "*";
         if (businessData != null) {
             //使用批量废除接口
-            return this.batchAbolish(businessData.getId().toString(), primaryKeyId, projectId, contractId, "撤回成功");
+            return this.batchAbolish(businessData.getId().toString(), primaryKeyId, projectId, contractId);
         } else {
             //试验
             InformationQuery businessDataTrial = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 2));
             if (businessDataTrial != null) {
                 //使用批量废除接口
-                return this.batchAbolish(businessDataTrial.getId().toString(), primaryKeyId, projectId, contractId, "撤回成功");
+                return this.batchAbolish(businessDataTrial.getId().toString(), primaryKeyId, projectId, contractId);
             }
         }
         return R.data(300, false, "废除失败,未找到业务数据");
@@ -636,7 +636,7 @@ public class InformationWriteQueryController extends BladeController {
                 .eq(InformationQuery::getId, id));
         if (businessData != null) {
             //使用批量废除接口
-            return this.batchAbolish(businessData.getId().toString(), primaryKeyId, projectId, contractId, "撤回成功");
+            return this.batchAbolish(businessData.getId().toString(), primaryKeyId, projectId, contractId);
         }
         return R.data(300, false, "废除失败,未找到业务数据");
     }
@@ -1137,7 +1137,7 @@ public R<String> batchDownloadFileToZip(String ids, HttpServletResponse response
 @ApiOperationSupport(order = 18)
 @ApiOperation(value = "批量废除", notes = "质检的ids，试验的记录ids")
 //    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
-public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @RequestParam String projectId, @RequestParam String contractId, @RequestParam(required = false, defaultValue = "") String context) {
+public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @RequestParam String projectId, @RequestParam String contractId) {
     Set<String> aopParamsSet = new HashSet<>();
     aopParamsSet.add(SecureUtil.getUserId() + "," + projectId + "," + contractId);
 
@@ -1153,7 +1153,6 @@ public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @Re
         if (dataList.size() > 0) {
             List<Long> dataIds = dataList.stream().map(InformationQuery::getId).collect(Collectors.toList());
             taskList = this.taskClient.queryTaskListByFormDataId(StringUtils.join(dataIds, ","));
-            context = "撤回成功";
         }
     }
 
@@ -1201,8 +1200,7 @@ public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @Re
                     /*修改任务副表u_task_parallel全部废除*/
                     List<Long> collect = linkList.stream().map(TaskParallel::getId).collect(Collectors.toList());
                     if (collect.size() > 0) {
-                        context = "撤回成功".equals(context) ? context : "废除成功";
-                        jdbcTemplate.execute("UPDATE u_task_parallel SET status = 3,e_visa_content = '" + context + "' WHERE id in(" + StringUtils.join(collect, ",") + ")");
+                        jdbcTemplate.execute("UPDATE u_task_parallel SET status = 3,e_visa_content = '废除成功' WHERE id in(" + StringUtils.join(collect, ",") + ")");
                     }
 
                     for (InformationQuery query : queries) {
@@ -1293,14 +1291,9 @@ public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @Re
                     json.put("operationObjName", title);
                     json.put("projectId", projectId);
                     json.put("contractId", contractId);
-                    if ("废除成功".equals(context)) {
-                        //保存操作记录
-                        this.operationLogClient.saveUserOperationLog(6, "资料填报", "工序资料", json);
-                    } else {
-                        //保存操作记录
-                        this.operationLogClient.saveUserOperationLog(62, "资料填报", "工序资料", json);
-                    }
 
+                    //保存操作记录
+                    this.operationLogClient.saveUserOperationLog(6, "资料填报", "工序资料", json);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -1697,7 +1690,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 if (vo.getNeedCopyPrimaryKeyId().equals(nodeOld.getPKeyId().toString())) {
                     //新节点父级id 为 选中节点的父级id
                     newData.setParentId(parent.getId() != null ? parent.getId() : null);
-                    //20250414-lhb-新增
+                    //TODO 20250414-lhb-新增
                     newData.setPId(parent.getPKeyId() != null ? parent.getPKeyId() : null);
                     //新节点设置
                     newData.setNodeName(vo.getNeedCopyNodeName());
@@ -1705,7 +1698,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 } else {
                     //如果不是  判断旧节点的父级id是否在旧节点集合中 如果在 则设置新节点的父级id为旧节点的父级id的映射id  否则就是随机id
                     newData.setParentId(oldToNewIdMap.containsKey(nodeOld.getParentId()) ? oldToNewIdMap.get(nodeOld.getParentId()) : SnowFlakeUtil.getId());
-                    //20250414-lhb-新增
+                    //TODO 20250414-lhb-新增
                     newData.setPId(oldPKeyIdToNewPKeyIdMap.containsKey(nodeOld.getPId()) ? oldPKeyIdToNewPKeyIdMap.get(nodeOld.getPId()) : SnowFlakeUtil.getId());
                 }
                 newData.setCreateTime(new Date());
@@ -2378,7 +2371,7 @@ private void addCopyTabData(WbsTreeContract needCopyNode, WbsTreeContract toCopy
                         Long tabId = SnowFlakeUtil.getId();
                         objTab.setId(tabId);
                         objTab.setParentId(toCopyNode.getId());
-                        //20250414-lhb-新增
+                        //TODO 20250414-lhb-新增
                         objTab.setPId(toCopyNode.getPKeyId());
                         objTab.setPKeyId(SnowFlakeUtil.getId());
                         //初始化是否显示表格，默认显示（2023年7月19日10:48:55需求更改：跟随原状态，原表单隐藏的，那么复制过来就是隐藏的）
@@ -2454,7 +2447,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
                 if (isSameNode == 0) {
                     //跨节点复制，更改父级id
                     obj.setParentId(toCopyNode.getId());
-                    //20250414-lhb-新增 添加父级节点id
+                    //TODO 20250414-lhb-新增 添加父级节点id
                     obj.setPId(toCopyNode.getPKeyId());
                 }
 
@@ -2490,7 +2483,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
                 obj.setId(SnowFlakeUtil.getId());
                 obj.setParentId(id);
 
-                //20250414-lhb-新增 添加父级节点id
+                //TODO 20250414-lhb-新增 添加父级节点id
                 obj.setPId(pId);
 
                 obj.setPKeyId(SnowFlakeUtil.getId());
@@ -2601,7 +2594,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
                 obj.setId(id);
                 obj.setParentId(newParentId);
 
-                //20250414-lhb-新增 根据旧节点父级id 通过映射关系 查询对应的新节点id
+                //TODO 20250414-lhb-新增 根据旧节点父级id 通过映射关系 查询对应的新节点id
                 obj.setPId(newPId);
 
                 obj.setCreateTime(new Date());
@@ -2628,7 +2621,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
                             objTab.setId(tabId);
                             objTab.setParentId(id);
 
-                            //20240514-lhb-新增 设置父级id
+                            //TODO 20240514-lhb-新增 设置父级id
                             objTab.setPId(pKeyId);
 
                             objTab.setPKeyId(SnowFlakeUtil.getId());
@@ -2678,12 +2671,12 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
         if (isSameNode == 1) {
             //同节点
             needCopyNode.setParentId(needCopyNode.getParentId());
-            //20250414-lhb-新增
+            //TODO 20250414-lhb-新增
             needCopyNode.setPId(needCopyNode.getPId() != null ? needCopyNode.getPId() : null);
         } else {
             //跨节点
             needCopyNode.setParentId(toCopyNode.getId());
-            //20250414-lhb-新增
+            //TODO 20250414-lhb-新增
             needCopyNode.setPId(toCopyNode.getPKeyId());
         }
         addNodeList.add(0, needCopyNode);

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

@@ -857,6 +857,8 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                     WbsTreeContract wbsTreeContract=new WbsTreeContract();
                     wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());
                     wbsTreeContract.setId(wbsTreePrivate.getId());
+                    //TODO
+                    wbsTreeContract.setTreePId(wbsTreePrivate.getTreePId());
                     wbsTreeContract.setTableOwner(wbsTreePrivate.getTableOwner());
                     wbsTreeContract.setWbsId(wbsTreePrivate.getWbsId()+"");
                     wbsTreeContract.setWbsType(Integer.valueOf(wbsTreePrivate.getWbsType()));
@@ -864,7 +866,11 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                     wbsTreeContract.setContractId(contractInfo.getId()+"");
                     wbsTreeContract.setTenantId(wbsTreePrivate.getTenantId());
                     wbsTreeContract.setParentId(0L);
+                    //TODO
+                    wbsTreeContract.setPId(0L);
                     wbsTreeContract.setAncestors("0");
+                    //TODO
+                    wbsTreeContract.setAncestorsPId("0");
                     wbsTreeContract.setNodeType(wbsTreePrivate.getNodeType());
                     wbsTreeContract.setNodeName(wbsTreePrivate.getNodeName());
                     wbsTreeContract.setFullName(wbsTreePrivate.getFullName());

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

@@ -1611,9 +1611,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
                                 dataPrivate.setFullName(dataPrivate.getNodeName());
                                 dataPrivate.setInitTableId(tree.getInitTableId().toString());
+                                //TODO
                                 dataPrivate.setTreePId(tree.getId());
                                 dataPrivate.setIsAddConceal(0);
                                 dataPrivate.setParentId(wbsTreePrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setAncestorsPId(wbsTreePrivate.getAncestorsPId() + "," + dataPrivate.getPId());
+
                                 insertDataPrivateList.add(dataPrivate);//新增
                             }
                         }
@@ -1677,6 +1683,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
                                 dataPrivate.setInitTableId(tree.getInitTableId());
                                 dataPrivate.setIsAddConceal(0);
+
+                                //TODO
+                                dataPrivate.setTreePId(dataPrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setWbsType(wbsTreePrivate.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
+
                                 insertDataPrivateList.add(dataPrivate);
                             }
                         }
@@ -1744,6 +1759,16 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setFullName(dataPrivate.getNodeName());
                                 dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId().toString() : null);
                                 dataPrivate.setIsAddConceal(0);
+
+                                //TODO
+                                dataPrivate.setTreePId(dataPrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setWbsType(wbsTreePrivate.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
+
+
                                 insertDataPrivateList.add(dataPrivate);//新增
                             }
                         }
@@ -1808,6 +1833,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
                                 dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId() : null);
                                 dataPrivate.setIsAddConceal(0);
+
+                                //TODO
+                                dataPrivate.setTreePId(dataPrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setWbsType(wbsTreePrivate.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
+
                                 insertDataPrivateList.add(dataPrivate);
                             }
                         }
@@ -1874,6 +1908,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setFullName(dataPrivate.getNodeName());
                                 dataPrivate.setInitTableId(tree.getInitTableId().toString());
                                 dataPrivate.setIsAddConceal(0);
+
+                                //TODO
+                                dataPrivate.setTreePId(dataPrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setWbsType(wbsTreePrivate.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
+
                                 insertDataPrivateList.add(dataPrivate);//新增
                             }
                         }
@@ -1938,6 +1981,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
                                 dataPrivate.setInitTableId(tree.getInitTableId());
                                 dataPrivate.setIsAddConceal(0);
+
+                                //TODO
+                                dataPrivate.setTreePId(dataPrivate.getId());
+                                //TODO
+                                dataPrivate.setPId(wbsTreePrivate.getPKeyId());
+                                //TODO
+                                dataPrivate.setWbsType(wbsTreePrivate.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
+
                                 insertDataPrivateList.add(dataPrivate);
                             }
                         }
@@ -1998,6 +2050,12 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             wbsTreeContract.setIsTypePrivatePid(treePrivate.getPKeyId()); //记录原始表的pKeyId
                             wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());
                             wbsTreeContract.setParentId(addwbsTreeC.getId());
+                            //TODO
+                            wbsTreeContract.setTreePId(wbsTreeContract.getId());
+                            //TODO
+                            wbsTreeContract.setPId(addwbsTreeC.getPKeyId());
+                            //TODO
+                            wbsTreeContract.setAncestorsPId(addwbsTreeC.getAncestorsPId() + "," + wbsTreeContract.getPId());
                             wbsTreeContract.setContractId(addwbsTreeC.getContractId());
                             insertDataContractList.add(wbsTreeContract);
                         }
@@ -2361,6 +2419,14 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     pri.setTenantId(aPrivate.getTenantId());
                     pri.setParentId(aPrivate.getId());
                     pri.setAncestors(aPrivate.getAncestors() + "," + aPrivate.getId());
+
+                    //TODO
+                    pri.setTreePId(form.getId());
+                    //TODO
+                    pri.setPId(form.getPKeyId());
+                    //TODO
+                    pri.setAncestorsPId(aPrivate.getAncestorsPId() + "," + aPrivate.getPId());
+
                     pri.setNodeType(1);
                     pri.setNodeName(form.getNodeName());
                     pri.setFullName(form.getFullName());
@@ -2406,6 +2472,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     con.setTenantId(pri.getTenantId());
                     con.setParentId(contract.getId());
                     con.setAncestors(contract.getAncestors() + "," + contract.getId());
+
+                    //TODO
+                    con.setTreePId(pri.getId());
+                    //TODO
+                    con.setPId(contract.getPKeyId());
+                    //TODO
+                    con.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPId());
+
+
                     con.setNodeType(pri.getNodeType());
                     con.setNodeName(pri.getNodeName());
                     con.setFullName(pri.getFullName());
@@ -2504,6 +2579,14 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.getByPKeyId(id);
             wbsTreePrivate.setParentId(wbsTreeContract.getId());
             wbsTreePrivate.setAncestors(wbsTreeContract.getAncestors() + "," + wbsTreeContract.getId());
+
+            //TODO
+            wbsTreePrivate.setTreePId(wbsTreePrivate.getId());
+            //TODO
+            wbsTreePrivate.setPId(wbsTreeContract.getPKeyId());
+            //TODO
+            wbsTreePrivate.setAncestorsPId(wbsTreeContract.getAncestorsPId() + "," + wbsTreeContract.getPId());
+
             wbsTreePrivate.setWbsId(wbsTreeContract.getWbsId());
             wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
             wbsTreePrivate.setType(2);