2-15

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

@@ -2050,13 +2050,15 @@ public class ExecutorMeter extends FormulaExecutor {
                    imps.setItemName(payment.getName());
                    imps.setFormNumber(payment.getNumber());
                    imps.setCompleted(StringUtils.handleNull(payment.getCompleted()));
+                   imps.setMeterNumber("");
                    dataList.add(imps);
                    InterimMeterPaySummary part = new InterimMeterPaySummary();
-                   part.setItemName(meterApply.getPartName());
-                   part.setFormNumber(meterApply.getMeterNumber());
+                   part.setItemName(meterApply.getEngineerDivide());
+                   part.setMeterNumber(meterApply.getMeterNumber());
+                   part.setCompleted(imps.getCompleted());
                    dataList.add(part);
                }
-               int add= capacity-v.size()%capacity-1;
+               int add= capacity-v.size()*2%capacity-1;
                if(add>0){
                    dataList.addAll(Collections.nCopies(add,new InterimMeterPaySummary()));
                }

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

@@ -503,7 +503,7 @@ public class TableElementConverter implements ITableElementConverter {
                    }
                    reportResults.add(rt);
                    List<FormData> fds =group.get(report.getInitTableName());
-                   if(fds.size()>0){
+                   if(fds!=null&&fds.size()>0){
                        /*数据分两种，一种是每页都包含的公共部分，另一种是动态内容每页独立*/
                        Map<Boolean,List<FormData>> groupList= fds.stream().collect(Collectors.partitioningBy(FormData::isRepeat));
                        List<FormData> common = groupList.get(true);

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

@@ -2910,11 +2910,12 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             coordinateMap.put(initTableName, FormulaUtils.getElementExcelCoords(document));
             eSignMaps.put(initTableName,FormulaUtils.getESignMap(document));
         });
+        executionTime.info("坐标信息获取");
         /*额外单元格坐标配置*/
         settingCoordsExtend(coordinateMap);
         List<FormData> processFds = this.createFormDataByTableName(tableList.stream().map(NodeTable::getInitTableName).collect(Collectors.joining("','")));
         listForMeter(processFds,contractInfo.getPId(),parent.get("id"));
-
+        executionTime.info("元素信息");
         /*转换器上下文声明*/
         TableElementConverter tec = new TableElementConverter(processFds,coordinateMap,tableList);
         tec.setNewIOSSClient(this.newIOSSClient);

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3610,6 +3610,7 @@ public class TaskController extends BladeController {
                         throw new RuntimeException(e);
                     }
                 });
+                executionTime.info("合并数据");
                 CompletableFuture.runAsync(() -> {
                     /*原始数据备用*/
                     jdbcTemplate.execute("delete from s_report_raw where report_id="+report.getId());
@@ -3758,8 +3759,10 @@ public class TaskController extends BladeController {
                     sb.append("生成异常");
                     return R.fail(sb.toString());
                 }
+                executionTime.info("生成PDF");
                 /*合并所有表*/
                 fileUrl = report.getReportPdf(file_path, reportResults);
+                executionTime.info("合并PDF");
                 // 添加电签任务列表
                 if (taskType != 10) {
                     addSignTaskBatch(report);