BUG

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreePrivateClient.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.feign;
 
+import org.springblade.manager.entity.TextdictInfo;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
 import org.springblade.manager.vo.WbsTreePrivateVO;
@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -60,4 +62,7 @@ public interface WbsTreePrivateClient {
     @PostMapping(API_PREFIX + "/saveObj")
     void saveObj(@RequestBody WbsTreePrivate wbsTreePrivate);
 
+    @PostMapping(API_PREFIX + "/saveTextDictList")
+    void saveTextDictList(@RequestBody ArrayList<TextdictInfo> obj);
+
 }

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

@@ -1340,15 +1340,12 @@ public class InformationWriteQueryController extends BladeController {
         if (("1").equals(vo.getCopyType())) {
             //首先查询需要复制的节点及其下级所有子节点的信息
             WbsTreeContract needCopyNode = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(vo.getNeedCopyPrimaryKeyId());
-            // 获取当前节点的所有子节点
-            /*String vocational = SnowFlakeUtil.getId() + "";*/
 
             //新增施工台账
             List<WbsTreeContract> saveList = new ArrayList<>();
             List<ConstructionLedger> saveLedger = new ArrayList<>();
 
             //获取子级节点、表信息
-            //List<WbsTreeContract> nodeChildAll = informationQueryService.getNodeChildAllByNodeId(needCopyNode.getId() + "", needCopyNode.getContractId(), vo.getNeedCopyPrimaryKeyId());
             List<WbsTreeContract> needCopyChildNodes = this.getChildNodes(needCopyNode);
             if (ObjectUtil.isEmpty(needCopyChildNodes) || needCopyChildNodes.size() == 0) {
                 //最下层级节点复制
@@ -1372,6 +1369,7 @@ public class InformationWriteQueryController extends BladeController {
 
             if (StringUtils.isNotEmpty(vo.getNeedCopyPrimaryKeyId())) {
                 WbsTreeContract parent = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(vo.getParentPrimaryKeyId());
+
                 //重塑关键信息
                 Map<Long, Long> oldToNewIdMap = new HashMap<>();
                 //节点信息
@@ -1432,7 +1430,7 @@ public class InformationWriteQueryController extends BladeController {
                         this.createLedger(newData, saveLedger, nodeMap, null);
                     }
                     //表单所属方，只有勾选了对应的所属方权限才复制数据；勾选了复制数据才能复制，否则只是创建节点、表
-                    // 组织复制值Sql
+                    //组织复制值Sql
                     if (node.getType() == 2 && StringUtils.isNotEmpty(newData.getInitTableName()) && finalTabOwner1.contains(node.getTableOwner()) && vo.getIsCopyData() == 1) {
                         String tableName = newData.getInitTableName();
                         String col = nodeTabColsMap.get(tableName);
@@ -1769,7 +1767,7 @@ public class InformationWriteQueryController extends BladeController {
                         }
 
                     } else if (ObjectUtil.isNotEmpty(needTab.getIsCopeTab()) && (new Integer(2).equals(needTab.getIsCopeTab()) || new Integer(3).equals(needTab.getIsCopeTab()))) {
-                        //如果不存在，则获新增复制的表，toCopyNodeTab == null && getIsCopeTab != null && =2为复制表、=3为频率表
+                        //如果不存在，则新增复制的表，toCopyNodeTab == null && getIsCopeTab != null && =2为复制表、=3为频率表
                         WbsTreeContract objTab = BeanUtil.copyProperties(needTab, WbsTreeContract.class);
                         if (objTab != null) {
                             Long oldPKeyId = needTab.getPKeyId();
@@ -2649,6 +2647,7 @@ public class InformationWriteQueryController extends BladeController {
         //保存集合
         List<WbsTreeContract> saveList = new ArrayList<>();
         List<ConstructionLedger> saveLedger = new ArrayList<>();
+
         //原始表ids，电签位置信息使用
         List<Long> oldTabIds = selectedNodeList.stream().filter(f -> new Integer(2).equals(f.getType())).map(WbsTreeContract::getId).collect(Collectors.toList());
 
@@ -2766,7 +2765,6 @@ public class InformationWriteQueryController extends BladeController {
         return booleanR;
     }
 
-
     @Async
     public void updateTextDictInfos(List<WbsTreeContract> nowTabs, List<Long> oldTabIds, String projectId) {
         if (oldTabIds.size() > 0) {
@@ -2778,8 +2776,9 @@ public class InformationWriteQueryController extends BladeController {
                 if (nowTab != null) {
                     nowTab.setHtmlUrl(tab.getHtmlUrl());
                     nowTab.setExcelId(tab.getExcelId());
+                    nowTab.setIsTypePrivatePid(tab.getPKeyId());
                     nowTab.setInitTableName(tab.getInitTableName());
-                    String updateSql = "update m_wbs_tree_contract set html_url = '" + nowTab.getHtmlUrl() + "',excel_id = " + nowTab.getExcelId() + ",init_table_name = '" + nowTab.getInitTableName() + "' where p_key_id = " + nowTab.getPKeyId();
+                    String updateSql = "update m_wbs_tree_contract set html_url = '" + nowTab.getHtmlUrl() + "',excel_id = " + nowTab.getExcelId() + ",init_table_name = '" + nowTab.getInitTableName() + "',is_type_private_pid = " + nowTab.getIsTypePrivatePid() + " where p_key_id = " + nowTab.getPKeyId();
                     resultSQL.add(updateSql);
                 }
             }
@@ -2809,17 +2808,17 @@ public class InformationWriteQueryController extends BladeController {
 
         if (saveList.size() > 0) {
             StringBuilder str = new StringBuilder();
-            str.append("-"+saveList.get(0).getFullName());
+            str.append("-" + saveList.get(0).getFullName());
             //保存施工日志
-//            if (saveLedger.size() > 0) {
-//                this.constructionLedgerService.saveBatch(saveLedger, 1000);
-//                str.append("-[");
-//                for (ConstructionLedger ledger : saveLedger) {
-//                    str.append(ledger.getSite() + ",");
-//                }
-//                str.deleteCharAt(str.length() - 1);
-//                str.append("]");
-//            }
+            /*if (saveLedger.size() > 0) {
+                this.constructionLedgerService.saveBatch(saveLedger, 1000);
+                str.append("-[");
+                for (ConstructionLedger ledger : saveLedger) {
+                    str.append(ledger.getSite() + ",");
+                }
+                str.deleteCharAt(str.length() - 1);
+                str.append("]");
+            }*/
 
             try {
                 //获取当前节点的所有父节点

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreePrivateClientImpl.java

@@ -214,6 +214,11 @@ public class WbsTreePrivateClientImpl implements WbsTreePrivateClient {
         wbsTreePrivateService.save(wbsTreePrivate);
     }
 
+    @Override
+    public void saveTextDictList(ArrayList<TextdictInfo> obj) {
+        textDictInfoService.insertBatch(obj, 1000);
+    }
+
     private void foreachSetChildList(List<WbsTreeContractTreeVOS> vosResult, List<WbsTreePrivateVO> voList) {
         voList.forEach(wbsTreePrivateVO -> {
             WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();