2023 11 22 保存更新

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -23,6 +23,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ContractRelationJlyz;
@@ -359,7 +360,20 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                                                    Integer classify, Integer sourceType,
                                                    String isFirst, String sourceUrl,
                                                    String pdfUrl, String firstFileName, List<JSONObject> linkDataList) {
-        BladeUser user = AuthUtil.getUser();
+        Long userId = 0L ;
+        String userNmae ="";
+
+        if(primaryKeyId.indexOf(":")>=0){
+           String prdata[] = primaryKeyId.split(":");
+            primaryKeyId = prdata[0];
+            userId = Long.parseLong(prdata[1]);
+            R<User> userR = userClient.userInfoById(userId);
+            userNmae = userR.getData().getName();
+        }else{
+            BladeUser user = AuthUtil.getUser();
+            userId = user.getUserId();
+            userNmae = user.getNickName();
+        }
 
         if (StringUtils.isNotEmpty(isFirst) && "true".equals(isFirst)) {
             return this.saveOrUpdateFirstInformationQueryData(primaryKeyId, tableId, businessId, fileName, classify, sourceType, sourceUrl, pdfUrl, firstFileName, linkDataList);
@@ -377,9 +391,9 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 }
 
                 //拼接填报人信息
-                String fileUser = user.getUserId() + "-" + user.getNickName();
+                String fileUser = userId + "-" + userNmae;
                 if (StringUtils.isNotEmpty(oldData.getFileUserIdAndName())) {
-                    if (!oldData.getFileUserIdAndName().contains(user.getUserId().toString())) {
+                    if (!oldData.getFileUserIdAndName().contains(userId.toString())) {
                         //不包含，拼接
                         oldData.setFileUserIdAndName(oldData.getFileUserIdAndName() + "," + fileUser);
                     }
@@ -388,7 +402,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 }
 
                 oldData.setUpdateTime(new Date());
-                oldData.setUpdateUser(user.getUserId());
+                oldData.setUpdateUser(userId);
 
                 List<String> linkIds = linkDataList.stream().map(json -> json.getString("id")).distinct().collect(Collectors.toList());
                 if (linkIds.size() > 0) {
@@ -419,17 +433,16 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 //流程状态，默认未上报
                 newData.setStatus(0);
                 //填报人ID及姓名
-                newData.setFileUserIdAndName(user.getUserId() + "-" + user.getNickName());
+                newData.setFileUserIdAndName(userId + "-" + userNmae);
                 //数据源类型
                 newData.setSourceType(sourceType);
-                newData.setCreateUser(user.getUserId());
+                newData.setCreateUser(userId);
                 newData.setCreateTime(new Date());
 
                 List<String> linkIds = linkDataList.stream().map(json -> json.getString("id")).distinct().collect(Collectors.toList());
                 if (linkIds.size() > 0) {
                     newData.setSjRecordIds(StringUtils.join(linkIds, ","));
                 }
-
                 //保存数据
                 this.baseMapper.insert(newData);
             }

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

@@ -64,6 +64,8 @@ import org.springblade.resource.feign.IOSSClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.resource.vo.NewBladeFile;
 import org.springblade.system.cache.ParamCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Transactional;
@@ -117,15 +119,12 @@ public class ExcelTabController extends BladeController {
     // 元素信息表-
     private final IWbsTreeContractService wbsTreeContractService;
 
-    private final WbsTreeContractServiceImpl wbsTreeContractServiceImpl;
-
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
 
     private final JdbcTemplate jdbcTemplate;
 
     private final ExcelTabMapper excelTabMapper;
 
-
     // 表单附件信息
     private final ITableFileService tableFileService;
 
@@ -148,6 +147,8 @@ public class ExcelTabController extends BladeController {
 
     private final IWbsParamService wbsParamService;
 
+    @Autowired
+    StringRedisTemplate RedisTemplate;
 
     /**
      * 详情
@@ -1819,7 +1820,7 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
     })
     public R getBussDataInfo(Long pkeyId) throws FileNotFoundException {
-        return excelTabService.getBussDataInfo(pkeyId, 0);
+        return R.data(excelTabService.getBussDataInfo(pkeyId, 0));
     }
 
 
@@ -2015,6 +2016,12 @@ public class ExcelTabController extends BladeController {
     })
     public R getPdfS(String nodeId, String classify, String contractId) throws FileNotFoundException {
         String file_path = FileUtils.getSysLocalFileUrl();
+        Boolean aBoolean = RedisTemplate.hasKey("pdf-" + nodeId+"-"+classify);
+        if(aBoolean){
+            Long expire = RedisTemplate.getExpire("pdf-" + nodeId + "-" + classify);
+            return R.fail("pdf正在生成,还有"+expire+"秒");
+        }
+
         //获取节点下的所有表单，和附件，如果表单全是隐藏的，并且没有附件，则提示暂无数据
         String sql = "select pdf_url,e_visa_pdf_url,pdf_trial_url,pdf_trial_url_position,status from u_information_query where classify='" + classify + "' and wbs_id='" + nodeId + "' and contract_id='" + contractId + "'";
         List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
@@ -2110,7 +2117,7 @@ public class ExcelTabController extends BladeController {
     }
 
 
-    @PostMapping("/save_buss_data2")
+    @PostMapping("/save_buss_data111")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
     public R saveBussData2(@Valid @RequestBody JSONObject dataInfo) throws Exception {
@@ -2139,9 +2146,7 @@ public class ExcelTabController extends BladeController {
                 JSONArray extra = new JSONArray();
                 for (Long pk : tableAllIds) {
                     if (!exclude.contains(pk)) {
-                        R bussDataInfo = this.excelTabService.getBussDataInfo(pk, 1,false);
-                        @SuppressWarnings("unchecked")
-                        Map<String, Object> jo = (Map<String, Object>) bussDataInfo.getData();
+                        Map<String, Object> jo = this.excelTabService.getBussDataInfo(pk, 1,false);
                         if (ObjectUtils.isNotEmpty(jo)) {
                             jo.put("pkeyId", pk);
                             extra.add(jo);
@@ -2179,6 +2184,7 @@ public class ExcelTabController extends BladeController {
         if (tableInfoList != null) {
             for (TableInfo tableInfo : tableInfoList) {
                 R bussPdfInfo = excelTabService.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
+
                 if (ObjectUtil.isEmpty(bussPdfInfo) || bussPdfInfo.getCode() != 200) {
                     //如果返回的单张pdfUrl为空，那么表示发生异常，返回异常信息
                     errorPKeyIds.add(tableInfo.getPkeyId());
@@ -3862,7 +3868,11 @@ public class ExcelTabController extends BladeController {
             dataArray.add(dataInfo);
         }
         this.excelTabService.formulaFillData2(dataArray, ExecuteType.INSPECTION);
-        return excelTabService.saveBussData(dataArray);
+        if(dataArray!=null && dataArray.size()>=1){
+            return excelTabService.saveBussData(dataArray);
+        }else{
+            return R.fail("公式报错,导致保存接口无入参数");
+        }
     }
 
 
@@ -3903,7 +3913,6 @@ public class ExcelTabController extends BladeController {
         } else {
             return R.data("请上传pdf");
         }
-
     }
 
 
@@ -3944,8 +3953,7 @@ public class ExcelTabController extends BladeController {
                 if (tableAll != null && tableAll.size() >= 1) {
                     for (AppWbsTreeContractVO tab : tableAll) {
                         try {
-                            R bussDataInfo = excelTabService.getBussDataInfo(tab.getPKeyId(), 0);
-                            Map<String, Object> jo = (Map<String, Object>) bussDataInfo.getData();
+                            Map<String, Object> jo = excelTabService.getBussDataInfo(tab.getPKeyId(), 0);
                             String s = new Gson().toJson(jo);
                             //字符串转jsonobject
                             JSONObject obj = JSON.parseObject(s);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExcelTabService.java

@@ -113,9 +113,9 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
     Map<String, String> getTablbCols(String pkeyid, String colkey) throws FileNotFoundException;
 
     // 获取用户端 单个表单接口数据
-    R getBussDataInfo(Long pkeyId, int type);
+    Map<String,Object> getBussDataInfo(Long pkeyId, int type);
     // 获取用户端 单个表单接口数据
-    R getBussDataInfo(Long pkeyId, int type,Boolean isFormLoading);
+    Map<String,Object> getBussDataInfo(Long pkeyId, int type,Boolean isFormLoading);
     // 单个pdf 生成
     R getBussPdfInfo(Long pkeyId) throws Exception;
 

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

@@ -87,6 +87,7 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
@@ -326,7 +327,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         }
                     }
                 }
-                dataMap2.put("p_key_id", tableInfo.getPkeyId());
+                dataInfo2.put("p_key_id", tableInfo.getPkeyId());
+                dataInfo2.put("classify",tableInfo.getClassify());
+                dataInfo2.put("contractId",tableInfo.getContractId());
+                dataInfo2.put("projectId",tableInfo.getProjectId());
                 tableInfo.setDataMap(dataMap2);
                 result.add(tableInfo);
             }
@@ -1237,33 +1241,36 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
     @Override
-    public R getBussDataInfo(Long pkeyId, int type) {
+    public Map<String,Object> getBussDataInfo(Long pkeyId, int type) {
         return this.getBussDataInfo(pkeyId,type,true);
     }
     @Override
-    public R getBussDataInfo(Long pkeyId, int type,Boolean isFormLoading) {
+    public Map<String,Object> getBussDataInfo(Long pkeyId, int type,Boolean isFormLoading) {
         Document document=null;
         Map<String, Object> reData = new HashMap<>();
 
         WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, pkeyId));
         if (wbsTreeContract == null) {
-            return R.data(reData);
+            return reData;
         }
 
         if (wbsTreeContract.getHtmlUrl() == null) {
-            return R.data(reData);
+            return reData;
         }
 
         //表单是否存储在
-        String tabName = wbsTreeContract.getInitTableName();
+    /*    String tabName = wbsTreeContract.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) {
-            return R.fail("无实体表对应");
+            return reData;
         }
 
-        String querySql = "select * from " + wbsTreeContract.getInitTableName() + " where p_key_id=" + pkeyId;
+        String querySql = "select * from " + wbsTreeContract.getInitTableName() + " where p_key_id=" + pkeyId;*/
+
+
+        String querySql = "select * from table_data_info where p_key_id=" + pkeyId;
         List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
 
         // 匹配关联
@@ -1396,6 +1403,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
 
         if (dataIn != null && dataIn.size() >= 1) {
+            for (Map<String, Object>  data : dataIn) {
+                reData.put(data.get("tab_key")+"",data.get("key_val"));
+            }
+        }
+
+        /*if (dataIn != null && dataIn.size() >= 1) {
             Map<String, Object> mysqlData = dataIn.get(0);
             for (String key : mysqlData.keySet()) {
                 String tabVal = mysqlData.get(key) + "";
@@ -1460,7 +1473,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                 }
             }
-        }
+        }*/
 
         // 获取默认值
         QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
@@ -1494,7 +1507,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if(!isFormLoading) {
             this.formulaService.paramFormula(wbsTreeContract, reData, document);
         }
-        return R.data(reData);
+        return reData;
     }
 
     @Override
@@ -1525,7 +1538,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             return R.fail("未获取到清表信息");
         }
 
-        Map<String, Object> DataInfo = (Map<String, Object>) getBussDataInfo(pkeyId, 0).getData();
+        Map<String, Object> DataInfo = getBussDataInfo(pkeyId, 0);
         //真实填报率
         Integer realFillRate = 0;
 
@@ -1631,6 +1644,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     realFillRate = v.intValue();
                 }
             }
+
             Elements trs = table.select("tr");
             if (ObjectUtil.isNotEmpty(DataInfo)) {
                 for (String val : DataInfo.keySet()) {
@@ -1886,6 +1900,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         // 获取有权限的节点信息
         List<AppWbsTreeContractVO> wbsTreeContractList = wbsTreeContractService.searchNodeAllTable(nodeId, classify, contractId, projectId,null);
         List<String> data = new ArrayList<>();
+        if(nodeId.indexOf(":")>=0){
+            nodeId = nodeId.split(":")[0];
+        }
         if (wbsTreeContractList != null && wbsTreeContractList.size() >= 1) {
             for (WbsTreeContract wbsInfo : wbsTreeContractList) {
                 // 隐藏的不生成pdf
@@ -2938,11 +2955,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         String contractId = tableInfo1.getString("contractId");
         String projectId = tableInfo1.getString("projectId");
         String classify = tableInfo1.getString("classify");
+        String UserId = AuthUtil.getUserId()+"";
+        RedisTemplate.opsForValue().set("pdf-" + nodeId+"-"+classify, "1", 300, TimeUnit.SECONDS);
         //构造阻塞器
         CountDownLatch cdl = new CountDownLatch(dataArray.size());
         // 构造多线程保存用户数据到表中 并生成excel
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject jsonObject = dataArray.getJSONObject(i);
+            jsonObject.put("UserId",UserId);
             Thread countUserThread = new Thread(() -> {
                 try {
                     SaveOneTabInfo(jsonObject);
@@ -2953,18 +2973,34 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             });
             countUserThread.start();
+
+            new Thread(() -> {
+                try {
+                    cdl.await();
+                    //合并pdf加载
+                    this.getBussPdfs(nodeId+":"+UserId, classify, contractId, projectId);
+                    //更新缓存
+                    informationQueryClient.delAsyncWbsTree(contractId);
+                    RedisTemplate.delete("pdf-" + nodeId+"-"+classify);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    cdl.countDown();//标记已经完成一个任务
+                }
+            }).start();
         }
-        //合并pdf加载
-        this.getBussPdfs(nodeId, classify, contractId, projectId);
-        //更新缓存
-        informationQueryClient.delAsyncWbsTree(contractId);
         return R.data("操作成功");
     }
 
     // 保存单表
     public void SaveOneTabInfo(JSONObject tableInfo) throws Exception {
         System.out.println("---------=" + new Date().toLocaleString());
-        String pKeyId = tableInfo.getString("pkeyId");
+        String pKeyId = tableInfo.getString("p_key_id");
+        String nodeId = tableInfo.getString("nodeId");
+        String classify = tableInfo.getString("classify");
+        String UserId = tableInfo.getString("UserId");
+        //真实填报率
+        Integer realFillRate = 0;
 
         tableInfo.fluentRemove("contractId")
                 .fluentRemove("pkeyId")
@@ -3018,6 +3054,31 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             String htmlString = IoUtil.readToString(inputStreamByUrl);
             Document doc = Jsoup.parse(htmlString);
             Element table = doc.select("table").first();
+
+            //计算填报率
+            List<String> keyList = table.getElementsByAttribute("v-model").stream()
+                    .map(l -> {
+                        String attr = l.attr("v-model");
+                        System.out.println(attr);
+                        String[] split = attr.split("\\.");
+                        return split[1];
+                    })
+                    .collect(Collectors.toList());
+            Long sigSize = table.getElementsByAttribute(":readonly").stream().count();
+            int keySize = keyList.size();
+            List<String> fills = tableInfo.keySet().stream().filter(e -> StringUtils.isNotEmpty(tableInfo.getString(e)) && e.contains("__") && e.contains("key")).collect(Collectors.toList());
+            if (fills.size() != 0 && keyList != null && keyList.size() != 0){
+                if (keySize == sigSize){
+                    realFillRate = 100;
+                }else if (keySize > sigSize) {
+                    keySize = keySize - sigSize.intValue();
+                    keyList.retainAll(fills);
+                    Double v = new Double(keyList.size()) / new Double(keySize) * 100;
+                    realFillRate = v.intValue();
+                }
+            }
+
+
             if (ObjectUtil.isNotEmpty(tableInfo)) {
                 for (String key : tableInfo.keySet()) {
                     if (key.contains("key") && key.contains("__")) {
@@ -3220,8 +3281,20 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             throw new RuntimeException("字段过长，新增失败");
         }
 
-        String file_path = FileUtils.getSysLocalFileUrl();
+        String fileName ="暂无文件提名1";
+        // 处理文件提名
+        try {
+            WbsTreeContract wbsTreeContractByP = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, nodeId));
+            //处理文件提名
+            fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP);
+        }catch (Exception exception){
+
+        }finally {
+            //huangjn 保存成功后调用生成资料查询列表数据
+            this.informationQueryClient.saveOrUpdateInformationQueryData(nodeId+":"+UserId, "首件使用字段", "业务ID(主要将来给首件使用)", fileName, Integer.parseInt(classify), 2, "false", "源文件（首件字段）", "pdf文件（首件字段）", "首件上传总结报告名称", new ArrayList<>());
+        }
 
+        String file_path = FileUtils.getSysLocalFileUrl();
         String pdfPath = file_path + "/pdf//" + pKeyId + ".pdf";
         String excelPath = file_path + "/pdf//" + pKeyId + ".xlsx";
 
@@ -3286,10 +3359,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("p_key_id", pKeyId + "");
         updateWrapper.set("pdf_url", fileUrl);
+        updateWrapper.set("real_fill_rate", realFillRate);
+        updateWrapper.set("is_tab_pdf", 2);
         wbsTreeContractService.update(updateWrapper);
         tabPdf2.delete();
         tabPdf.delete();
-        ResourceUtil.getFile(excelPath);
         //关闭流
         IoUtil.closeQuietly(outputStream);
         IoUtil.closeQuietly(exceInp);

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

@@ -1167,9 +1167,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         JSONArray dataArray = new JSONArray();
         for (NodeTable data : subTabList) {
             /*自动挂载附表情况下，装配TableInfo数据*/
-            R bussDataInfo = this.excelTabService.getBussDataInfo(data.getPKeyId(), 1,false);
-            @SuppressWarnings("unchecked")
-            Map<String, Object>  data1 = (Map<String, Object>) bussDataInfo.getData();
+            Map<String, Object>  data1 = excelTabService.getBussDataInfo(data.getPKeyId(), 1);
             data1.put("pkeyId",data.getPKeyId());
             dataArray.add(data1);
         }
@@ -2349,7 +2347,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             }
 
             Map<String,Formula> formulaIdMap = this.wpService.formulaKeyMap(total.stream().map(WbsParam::getK).collect(Collectors.toList()));
-             /*元素动态绑定  获取已配置节点公式   未查明的bug暂时关闭
+             //元素动态绑定  获取已配置节点公式   未查明的bug暂时关闭
             Map<Long,String> paramIdKeyMap=  total.stream().collect(Collectors.toMap(WbsParam::getId,WbsParam::getK));
             List<ElementFormulaMapping> mappingList =  this.elementFormulaMappingService.list(Wrappers.<ElementFormulaMapping>lambdaQuery().in(ElementFormulaMapping::getParamId,total.stream().map(WbsParam::getId).collect(Collectors.toList())));
             if(Func.isNotEmpty(mappingList)){
@@ -2365,11 +2363,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 });
             }
 
-            检查是否可以自动绑定参数公式
+           // 检查是否可以自动绑定参数公式
             List<FormData> notFormulaFds=fds.stream().filter(f->f.getFormulaId()==null).collect(Collectors.toList());
             if(notFormulaFds.size()>0){
                 notFormulaFds.forEach(e->{
-                    暂时用参数名称是否包含元素名称作为匹配规则
+                    //暂时用参数名称是否包含元素名称作为匹配规则
                     total.stream().filter(p->e.getEName().contains(p.getName().replaceAll("【[\\u4E00-\\u9FFF]+】|\\s+",""))).findAny().ifPresent(d->{
                         Formula tf= formulaIdMap.get(d.getK());
                         if(tf!=null&&e.getId()!=null) {
@@ -2384,7 +2382,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     });
                 });
             }
-            */
             fds.removeIf(f->f.getFormula()==null);
             if(fds.size()>0) {
                 /*执行结果放回数据集合*/