2023 08 14 bug修改

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

@@ -613,8 +613,7 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
     })
     public R getExcelHtmlByBuss(Long pkeyId) throws Exception {
-        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
-        String sys_file_net_url = ParamCache.getValue(CommonConstant.SYS_FILE_NET_URL);
+
         WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, pkeyId));
         if (wbsTreeContract == null) {
@@ -3147,4 +3146,27 @@ public class ExcelTabController extends BladeController {
         return R.data("成功");
     }
 
+    @GetMapping("/rm-tabdata-info")
+    @ApiOperationSupport(order = 38)
+    @ApiOperation(value = "清楚表单数据信息", notes = "清楚表单数据信息")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
+    })
+    public R rmTabDataInfo(Long pkeyId) {
+        WbsTreeContract wbsInfo = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+                .eq(WbsTreeContract::getPKeyId, pkeyId));
+
+        if(wbsInfo!=null){
+            String tabName = wbsInfo.getInitTableName();
+            if(StringUtils.isNotEmpty(tabName)){
+                String delSql = "delete from "+tabName+" where p_key_id = " + pkeyId;
+                jdbcTemplate.execute(delSql);
+            }else{
+                return   R.fail("获取InitTableName失败!");
+            }
+        }else{
+            return   R.fail("获取数据失败!");
+        }
+        return R.data("成功!");
+    }
 }

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

@@ -1393,9 +1393,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (String val : DataInfo.keySet()) {
                     Elements datas = doc.getElementsByAttributeValue("keyname", val);
                     Element data = null;
-                    if(val.equals("key_12__25_0")){
-                        System.out.println("1231");
-                    }
                     if (datas.size() >= 1) {
                         data = datas.get(0);
                     }
@@ -1513,9 +1510,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                 }
             }
-            if(pkeyId == 1688448159421825025L){
-                System.out.println("12321");
-            }
             // 组装电签设置
             QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("type", 2, 6);
@@ -1580,11 +1574,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
         //设置转换后的PDF页面高宽适应工作表的内容大小
         workbook2.getConverterSetting().setSheetFitToPage(true);
-        workbook2.getConverterSetting().setSheetFitToWidth(true);
         workbook2.saveToFile(pdfPath, FileFormat.PDF);
-      //  FileUtils.setExcelScaleToPdf(excelPath, pdfPath);
 
-/*        BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
+        BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
 
         //附件
         TableFile tableFile1 = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId + "").eq(TableFile::getType, 1)).stream().findAny().orElse(null);
@@ -1630,8 +1622,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if (exceInp != null) {
             IoUtil.closeQuietly(exceInp);
         }
-         return R.data(bladeFile2.getLink());*/
-        return R.data("");
+        return R.data(bladeFile2.getLink());
+
     }
 
     @Override