Ver Fonte

bug 时间问题

hongchuangyanfa há 2 anos atrás
pai
commit
13a3a2c775

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

@@ -117,7 +117,6 @@ public class ExcelTabController extends BladeController {
     // pdf转换
     private final CommonFileClient commonFileClient;
 
-    private final FileUtilsClient fileUtilsClient;
 
     private final IWbsParamService wbsParamService;
 
@@ -350,12 +349,12 @@ public class ExcelTabController extends BladeController {
 
 
     /**
-     * 清表编辑 - 下拉框 树节点
+     * 后管 -- 清表保存
      */
     @PostMapping("/sava-dataInfo")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "编辑-保存", notes = "编辑-保存")
-    public R<List<WbsTreeVO>> savaDataInfo(@Valid @RequestBody WbsExclTabParmVO wbsExclTabParmVO, BladeUser bladeUser) {
+    public R<List<WbsTreeVO>> savaDataInfo(@Valid @RequestBody WbsExclTabParmVO wbsExclTabParmVO, BladeUser bladeUser) throws IOException {
         // 保存节点信息
         ExcelTab excelTab = new ExcelTab();
         if(wbsExclTabParmVO.getId()!=null){// 修改
@@ -378,15 +377,27 @@ public class ExcelTabController extends BladeController {
         List<ExcelTabWbsTypeVO> linkDataInfo = wbsExclTabParmVO.getLinkDataInfo();
 
         if(linkDataInfo!=null && linkDataInfo.size()>=1){
+            // 判断是否上传excle
+            if((excelTab.getFileUrl()!=null || excelTab.getFileUrl()!="") && excelTab.getFileType()!=3){
+                return R.fail("请上传清表!");
+            }
             for (ExcelTabWbsTypeVO info : linkDataInfo){
                 String[] pk_id = info.getLinkIds().split(",");
                 for(String pkInfo : pk_id){
+
                     UpdateWrapper<WbsTreePrivate> updateWrapper = new UpdateWrapper<>();
                     String [] pk_type = pkInfo.trim().split("_");
                     updateWrapper.in("p_key_id",Long.parseLong(pk_type[0]));
+
+                    if(pk_type[1].equals("2")){
+                        this.saveLinkeTab(excelTab.getId() ,Long.parseLong(pk_type[0]));
+                    }
+
                     updateWrapper.set("is_link_table",Integer.parseInt(pk_type[1]));
                     updateWrapper.set("excel_id",excelTab.getId());
+
                     wbsTreePrivateService.update(updateWrapper);
+
                 }
             }
         }
@@ -416,12 +427,13 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "exceTabId", value = "清表id", required = true),
             @ApiImplicitParam(name = "tabId", value = "表Id", required = true)
     })
-    public R<List<ExceTabTreVO>> saveLinkeTab(Long exceTabId, Long tabId, BladeUser bladeUser) throws IOException {
+    public R<List<ExceTabTreVO>> saveLinkeTab(Long exceTabId, Long tabId) throws IOException {
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
         // 查询私有项目信息
         WbsTreePrivate wbsTree = new WbsTreePrivate();
         wbsTree.setPKeyId(tabId);
         WbsTreePrivate aPrivate = wbsTreePrivateService.getOne(Condition.getQueryWrapper(wbsTree));
+        aPrivate.setExcelId(exceTabId);
 
         UpdateWrapper<WbsTreePrivate> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("p_key_id",tabId);
@@ -512,7 +524,7 @@ public class ExcelTabController extends BladeController {
 
 
     /**
-     * 清表生成html
+     * 质检 获取html接口
      */
     @GetMapping("/get-excel-html_buss")
     @ApiOperationSupport(order = 16)
@@ -535,6 +547,7 @@ public class ExcelTabController extends BladeController {
 
         String htmlString =  IoUtil.readToString(fileInputStream);
         htmlString = htmlString.replaceAll("placeholder","placeholderxx");
+     //   htmlString = htmlString.replaceAll("@focu","@focu212");
         // 解析 style
         Document doc = Jsoup.parse(htmlString);
         Element table = doc.select("table").first();
@@ -1275,6 +1288,10 @@ public class ExcelTabController extends BladeController {
         // 获取清表信息
         ExcelTab excelTab = excelTabService.getById(wbsTreeContract.getExcelId());
 
+        if(excelTab==null){
+            return R.fail("失败");
+        }
+
         Map<String, Object> DataInfo = (Map<String, Object>) getBussDataInfo(pkeyId).getData();
 
         // 获取excel流 和 html流
@@ -1373,7 +1390,7 @@ public class ExcelTabController extends BladeController {
         tableFileList.sort(Comparator.comparing(TableFile::getType));
 
 
-        List<String> dataListPdf = tableFileList.stream().filter(tableFile -> tableFile.getDomainPdfUrl()!=null).map(TableFile::getDomainPdfUrl).collect(Collectors.toList());
+        List<String> dataListPdf = tableFileList.stream().filter(tableFile -> tableFile.getDomainPdfUrl()!=null && (tableFile.getType()==1 || tableFile.getType()==2)).map(TableFile::getDomainPdfUrl).collect(Collectors.toList());
 
         String pdfPath2 = file_path+"/pdf//"+pkeyId+"_2.pdf";
 
@@ -1408,16 +1425,20 @@ public class ExcelTabController extends BladeController {
                 .eq(WbsTreeContract::getId,wbsTreeContract.getId())
                 .eq(WbsTreeContract::getContractId,wbsTreeContract.getContractId())
                 .eq(WbsTreeContract::getParentId,wbsTreeContract.getParentId()));
+        List<WbsTreeContract> wbsTreeContractList2 = wbsTreeContractList.stream().sorted(Comparator.comparing(WbsTreeContract::getCreateTime).reversed()).collect(Collectors.toList());
+
 
         long newPkId = SnowFlakeUtil.getId();
         Long  id = wbsTreeContract.getId();
         wbsTreeContract.setPKeyId(newPkId);
         wbsTreeContract.setCreateTime(new Date());
-        String deptName  = wbsTreeContract.getDeptName();
+        String deptName  = wbsTreeContractList2.get(0).getDeptName();
+
         if(deptName.indexOf("__")>=0){
-            deptName = deptName.split("__")[0]+"__"+wbsTreeContractList.size();
+            String oldName[] = deptName.split("__");
+            deptName = oldName[0]+"__"+ (Integer.parseInt(oldName[1])+1);
         }else{
-            deptName = deptName +"__"+wbsTreeContractList.size();
+            deptName = deptName +"__"+1;
         }
         wbsTreeContract.setDeptName(deptName);
         wbsTreeContract.setIsCopeTab(2);
@@ -1520,7 +1541,7 @@ public class ExcelTabController extends BladeController {
         tableFileList.sort(Comparator.comparing(TableFile::getType));
 
         //
-        List<String> dataListPdf = tableFileList.stream().filter(tableFile1 -> tableFile1.getDomainPdfUrl()!=null).map(TableFile::getDomainPdfUrl).collect(Collectors.toList());
+        List<String> dataListPdf = tableFileList.stream().filter(tableFile1 -> tableFile1.getDomainPdfUrl()!=null && (tableFile1.getType()==1 || tableFile1.getType()==2)).map(TableFile::getDomainPdfUrl).collect(Collectors.toList());
 
         String pdfPath2 = file_path+"/pdf//"+pkeyId+"_2.pdf";
         File tabpdf2 = ResourceUtil.getFile(pdfPath2);
@@ -1572,23 +1593,30 @@ public class ExcelTabController extends BladeController {
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
         // 获取有权限的节点信息
         List<WbsTreeContract> wbsTreeContractList = wbsTreeContractService.searchNodeAllTable(nodeId, classify, contractId, projectId);
-        List<String> data = wbsTreeContractList.stream().filter(wbsTreeContract ->  wbsTreeContract.getPdfUrl()!=null && wbsTreeContract.getIsBussShow()!=2).map(WbsTreeContract::getPdfUrl).collect(Collectors.toList());
+        List<String> data = new ArrayList<>();
+
+        if(wbsTreeContractList!=null && wbsTreeContractList.size()>=1){
+            for(WbsTreeContract wbsInfo:wbsTreeContractList){
+                // 隐藏的不生成pdf
+                if(wbsInfo.getIsBussShow()!=2){ //
+                    if(wbsInfo.getPdfUrl()==null ||wbsInfo.getPdfUrl().equals("")){
+                        data.add(wbsInfo.getPdfUrl());
+                    }else{
+                        R bussPdfInfo = this.getBussPdfInfo(wbsInfo.getPKeyId());
+                        if (bussPdfInfo.getCode()==200){
+                            data.add(bussPdfInfo.getData()+"");
+                        }
+                    }
+                }
+            }
+        }
 
         String listPdf = file_path+"pdf/"+nodeId+".pdf";
         File tabpdf2 = ResourceUtil.getFile(listPdf);
         if(tabpdf2.exists()){
             tabpdf2.delete();
         }
-        // 添加从来没有预览过的pdf
-        for (WbsTreeContract wbsTreeContract:wbsTreeContractList){
-            if((wbsTreeContract.getPdfUrl()==null ||wbsTreeContract.getPdfUrl().equals("")) && wbsTreeContract.getIsBussShow()!=2){
-                 R bussPdfInfo = this.getBussPdfInfo(wbsTreeContract.getPKeyId());
-
-                data.add(bussPdfInfo.getData()+"");
-            }
-        }
         FileUtils.mergePdfPublicMethods(data,listPdf);
-
         BladeFile bladeFile = this.newIOSSClient.uploadFile(nodeId+".pdf", listPdf);
 
         // 合并pdf集合
@@ -1626,7 +1654,6 @@ public class ExcelTabController extends BladeController {
             fontProvider.addFont(fontProgram);
             properties.setFontProvider(fontProvider);
         } catch (IOException e) {
-            //  log.error("creat base font erro" , e );
             System.out.println("creat base font erro");
         }
         return properties;

+ 18 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -41,6 +41,7 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.vo.TextdictDataInfoVO;
 import org.springblade.manager.vo.TextdictInfo_vo;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -55,7 +56,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
 
 /**
  * 参数信息表 控制器
@@ -71,6 +72,9 @@ public class TextdictInfoController extends BladeController {
 
 	private final ITextdictInfoService textdictInfoService;
 	private final WbsTreePrivateMapper wbsTreePrivateMapper;
+
+	private final JdbcTemplate jdbcTemplate;
+
 	/**
 	 * 详情
 	 */
@@ -230,8 +234,6 @@ public class TextdictInfoController extends BladeController {
 			element.empty().append("<el-date-picker  v-model="+vmode+" type='datetimerange' placeholder="+placeholder+"  start-placeholder='开始日期'  end-placeholder='结束日期' format='YYYY年MM月DD日' trIndex="+trindex+" keyname="+keyname+" weighing="+weighing+" tdIndex="+tdindex+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+">");
 			element.children().get(0).attr("@focus","getInformation("+oncklickText+")");
 			element.children().get(0).attr("@change","datePickerChange($event,'"+keyname+"')");
-			element.children().get(0).attr("@calendar-change","datePickerCalendarChange($event,'"+keyname+"')");
-
 		}else if(textdictInfo.getTextId().equals("img")){
 			element.empty().append("<el-upload placeholder="+placeholder+" v-model="+vmode+" keyname="+keyname+" weighing="+weighing+"  class='hc-upload-table-form' action='/api/blade-resource/oss/endpoint/put-file' trIndex="+trindex+" tdIndex="+tdindex+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"  @exceed='formUploadExceed' accept='image/png,image/jpg,image/jpeg' :headers='getTokenHeader' :show-file-list='false' > <img v-if='"+vmode+"' :src="+vmode+" class='hc-table-form-img' /> <div class='hc-table-form-icon' v-else> 点此选择文件并上传 </div> </el-upload>");
 			element.children().get(0).attr("@success","formUploadSuccess($event,'"+keyname+"')");
@@ -241,6 +243,19 @@ public class TextdictInfoController extends BladeController {
 			File writefile = new File(wbsTreePrivate.getHtmlUrl());
 		FileUtil.writeToFile(writefile, doc.html(), Boolean.parseBoolean("UTF-8"));
 		Thread.sleep(300);
+
+		// 清空相关的保存数据
+		String tabName = wbsTreePrivate.getInitTableName();
+		String isExitSql = " select * from information_schema.TABLES where TABLE_NAME='"+tabName+"'";
+		List<Map<String, Object>> tablist = jdbcTemplate.queryForList(isExitSql);
+		if(tablist!=null && tablist.size()>0){
+			String clarSql = "update  "+tabName+" set "+keyname.split("__")[0]+"=null where p_key_id in(SELECT p_key_id FROM m_wbs_tree_contract WHERE id ='"+wbsTreePrivate.getId()+"' and project_id='"+wbsTreePrivate.getProjectId()+"' )";
+			jdbcTemplate.execute(clarSql);
+		}
+
+
+
+
 		return R.success("操作成功");
 	}
 

+ 47 - 48
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -16,17 +16,15 @@
  */
 package org.springblade.manager.service.impl;
 
-import cn.hutool.core.date.StopWatch;
-import cn.hutool.log.StaticLog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.mixsmart.utils.ListUtils;
-import com.mixsmart.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.business.feign.InformationQueryClient;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.oss.model.BladeFile;
@@ -35,15 +33,12 @@ import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.bean.TableInfo;
-import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.ExcelTab;
 import org.springblade.manager.entity.Formula;
 import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.entity.WbsTreeContract;
-import org.springblade.manager.formula.ITableElementConverter;
 import org.springblade.manager.formula.KeyMapper;
-import org.springblade.manager.formula.impl.TableElementConverter;
 import org.springblade.manager.service.IFormulaService;
 import org.springblade.manager.service.IWbsParamService;
 import org.springblade.manager.service.IWbsTreeContractService;
@@ -60,7 +55,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -77,6 +71,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 	private final InformationQueryClient informationQueryClient;
 	// 元素信息表-
 	private final IWbsTreeContractService wbsTreeContractService;
+	private final IWbsTreeService wbsTreeService;
 	private final IFormulaService formulaService;
 	private final JdbcTemplate jdbcTemplate;
 
@@ -214,20 +209,36 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
 	@Override
 	public void formulaFillData(List<TableInfo> tableInfoList) {
-		StopWatch stopWatch = new StopWatch();
-		stopWatch.start("公式处理");
-		String ids =tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.joining(","));
-		List<Map<String,Object>> list=this.jdbcTemplate.queryForList("SELECT   a.p_key_id as nodeId,b.id as fieldId,b.e_key as field,c.init_table_name as tableName  from m_wbs_tree_contract a LEFT JOIN m_wbs_form_element b on a.id=b.f_id left JOIN m_wbs_tree c on a.id=c.id where a.p_key_id in ("+ids+")");
-		List<KeyMapper> keyMappers = JSON.parseArray(JSONArray.toJSONString(list), KeyMapper.class);
-		List<Formula> formulas =this.formulaService.list(Wrappers.<Formula>lambdaQuery().in(Formula::getElementId,keyMappers.stream().map(KeyMapper::getFieldId).distinct().collect(Collectors.toList())));
-		TableElementConverter tec= new TableElementConverter(tableInfoList,keyMappers,formulas);
-		if(tec.isPresent()){
-			tec.before();
-			this.formulaService.execute(tec);
-			tec.after();
+		List<FormData> fds = new ArrayList<>();
+		List<WbsTreeContract>  wbsTreeContractList = wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().in(WbsTreeContract::getPKeyId,tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.toList())));
+		if(Func.isNotEmpty(wbsTreeContractList)){
+			List<WbsTree> wbsTrees = this.wbsTreeService.list(Wrappers.<WbsTree>lambdaQuery().in(WbsTree::getId,wbsTreeContractList.stream().map(WbsTreeContract::getId).distinct().collect(Collectors.toList())));
+			Map<Long,List<WbsTree>>  treeMap = wbsTrees.stream().collect(Collectors.groupingBy(WbsTree::getId));
+			LinkedHashMap<Long,Long> map = new LinkedHashMap<>(wbsTreeContractList.size()*2);
+			String ids =tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.joining(","));
+			List<Map<String,Object>> list=this.jdbcTemplate.queryForList("SELECT   a.p_key_id as nodeId,b.id as fieldId,b.e_key as field,c.init_table_name as tableName  from m_wbs_tree_contract a LEFT JOIN m_wbs_form_element b on a.id=b.f_id left JOIN m_wbs_tree c on a.id=c.id where a.p_key_id in ("+ids+")");
+			List<KeyMapper> keyMappers = JSON.parseArray(JSONArray.toJSONString(list), KeyMapper.class);
+			if(Func.isNotEmpty(keyMappers)){
+				/*当前节点所有已经配置的公式*/
+				List<Formula> formulas =this.formulaService.list(Wrappers.<Formula>lambdaQuery().in(Formula::getElementId,keyMappers.stream().map(KeyMapper::getFieldId).distinct().collect(Collectors.toList())));
+				Map<Long,Formula> formulaMap = new HashMap<>();
+				if(Func.isNotEmpty(formulas)){
+					formulas.forEach(e->{
+						formulaMap.put(e.getElementId(),e);
+					});
+				}
+				LinkedHashMap<String,List<KeyMapper>> dataMap =keyMappers.stream().collect(Collectors.groupingBy(e->e.getTableName()+e.getField(), LinkedHashMap<String,List<KeyMapper>>::new,Collectors.toList()));
+				for(Map.Entry<String,List<KeyMapper>> entry:dataMap.entrySet()){
+					String code=	entry.getKey();
+					List<KeyMapper> keyMapperList =entry.getValue();
+					KeyMapper km = keyMapperList.get(0);
+					fds.add(new FormData(code,new ArrayList<>(),formulaMap.get(km.getFieldId())));
+				}
+			}
+			System.out.println();
 		}
-		stopWatch.stop();
-		StaticLog.info("{}",stopWatch);
+		//stopWatch.stop();
+		//StaticLog.info("{}",stopWatch);
 	}
 
 
@@ -246,43 +257,30 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				String tabName = wbsTreeContract.getInitTableName();
 
 				// 判读修改还是 添加
-			//	String querySql = "select * from "+tabName+" where p_key_id="+tableInfo.getPkeyId() ;
-			//	List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
 				String delSql = "delete from "+tabName+" where p_key_id="+tableInfo.getPkeyId();
 				jdbcTemplate.execute(delSql);
 
 				String sqlInfo="";
-                 LinkedHashMap<String,String> dataMap2 = tableInfo.getDataMap();
-			//	if(dataIn.isEmpty()){ //插入
-					sqlInfo = "INSERT INTO "+tabName+" ( ";
-					String keyStr = "id,";
-					String valStr = SnowFlakeUtil.getId() + ",";
-					for (String keys : dataMap2.keySet()){
-						keyStr += keys+",";
-						valStr += "'"+dataMap2.get(keys)+"',";
-					}
-					keyStr=keyStr.substring(0,keyStr.lastIndexOf(","));
-					valStr=valStr.substring(0,valStr.lastIndexOf(","));
-					sqlInfo = sqlInfo + keyStr+") VALUES (" +valStr +")";
-
+				LinkedHashMap<String,String> dataMap2 = tableInfo.getDataMap();
+				sqlInfo = "INSERT INTO "+tabName+" ( ";
+				String keyStr = "id,";
+				String valStr = SnowFlakeUtil.getId() + ",";
+				for (String keys : dataMap2.keySet()){
+					keyStr += keys+",";
+					valStr += "'"+dataMap2.get(keys)+"',";
+				}
+				keyStr=keyStr.substring(0,keyStr.lastIndexOf(","));
+				valStr=valStr.substring(0,valStr.lastIndexOf(","));
+				sqlInfo = sqlInfo + keyStr+") VALUES (" +valStr +")";
 
-					WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+				WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
 							.eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId,tableInfo.getContractId()));
-
 					//处理文件提名
-					String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP.getPKeyId(), Long.parseLong(wbsTreeContractByP.getContractId()));
+				String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP.getPKeyId(), Long.parseLong(wbsTreeContractByP.getContractId()));
 					fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
 
 					//huangjn 保存成功后调用生成资料查询列表数据
-					this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId()+"", fileName, Integer.parseInt(tableInfo.getClassify()), 2);
-				/*}else{ //更新
-					sqlInfo = "update  "+tabName+" set ";
-					for (String keys : dataMap2.keySet()){
-						sqlInfo += keys+"='"+dataMap2.get(keys)+"',";
-					}
-					sqlInfo=sqlInfo.substring(0,sqlInfo.lastIndexOf(","));
-					sqlInfo = sqlInfo + " where p_key_id="+tableInfo.getPkeyId();
-				}*/
+				this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId()+"", fileName, Integer.parseInt(tableInfo.getClassify()), 2);
 
 				UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
 				updateWrapper.in("p_key_id",tableInfo.getPkeyId());
@@ -290,7 +288,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				wbsTreeContractService.update(updateWrapper);
 
 				jdbcTemplate.execute(sqlInfo);
-				// this.getBussPdfInfo(Long.parseLong(pkeyId));
+				// pdf 预览添加
+			   //this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
 			}
 		}
 	}