修复续页bug

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/dynamictb/DynamicTbController.java

@@ -40,6 +40,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.start.tz.framework.common.pojo.PageParam;
 import cn.start.tz.framework.common.pojo.PageResult;
@@ -139,6 +140,9 @@ public class DynamicTbController {
 //    @PreAuthorize("@ss.hasPermission('pressure2:dynamic-tb:query')")
     public CommonResult<PageResult<DynamicTbRespVO>> getDynamicTbPage(@Valid DynamicTbPageReqVO pageReqVO) {
         PageResult<DynamicTbDO> pageResult = dynamicTbService.getDynamicTbPage(pageReqVO);
+        pageResult.getList().forEach(dynamicTbDO -> {
+            dynamicTbDO.setCopyConfig(null);
+        });
         return success(BeanUtils.toBean(pageResult, DynamicTbRespVO.class));
     }
 
@@ -188,6 +192,9 @@ public class DynamicTbController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DynamicTbDO> list = dynamicTbService.getDynamicTbPage(pageReqVO).getList();
+        list.forEach(dynamicTbDO -> {
+            dynamicTbDO.setCopyConfig(null);
+        });
         // 导出 Excel
         ExcelUtils.write(response, "承压动态报表表单.xls", "数据", DynamicTbRespVO.class,
                         BeanUtils.toBean(list, DynamicTbRespVO.class));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/dynamictb/vo/DynamicTbRespVO.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.controller.admin.dynamictb.vo;
 
 import cn.start.tz.module.infra.api.file.dto.FileRepsDTO;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -77,5 +78,5 @@ public class DynamicTbRespVO {
 
 
     @Schema(description = "复制续页配置")
-    private String copyConfig;
+    private JSONObject copyConfig;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictb/DynamicTbServiceImpl.java

@@ -14,11 +14,13 @@ import cn.start.tz.module.bpm.enums.task.BpmTaskStatusEnum;
 import cn.start.tz.module.infra.api.file.FileApi;
 import cn.start.tz.module.infra.api.file.dto.FileRepsDTO;
 import cn.start.tz.module.pressure.enums.BpmTaskBussinessTypeEnum;
+import cn.start.tz.module.pressure2.controller.admin.boilerconnecttbservice.vo.BoilerConnectTbServiceSaveReqVO;
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.bpmtaskinfo.BpmTaskInfoDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbfile.DynamicTbFileDO;
 import cn.start.tz.module.pressure2.dal.mysql.bpmtaskinfo.BpmTaskInfoMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictbfile.DynamicTbFileMapper;
+import cn.start.tz.module.pressure2.service.boilerconnecttbservice.BoilerConnectTbServiceService;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -177,7 +179,10 @@ public class DynamicTbServiceImpl extends ServiceImpl<DynamicTbMapper, DynamicTb
     @Override
     public DynamicTbRespVO getDynamicTb(String id) {
         DynamicTbDO dynamicTbDO = dynamicTbMapper.selectById(id);
+        String copyConfig = dynamicTbDO.getCopyConfig();
+        dynamicTbDO.setCopyConfig(null);
         DynamicTbRespVO bean = BeanUtils.toBean(dynamicTbDO, DynamicTbRespVO.class);
+        bean.setCopyConfig(JSONObject.parseObject(copyConfig));
         // 报告原件
         List<DynamicTbFileDO> dynamicTbFileDOS = dynamicTbFileMapper.selectList(DynamicTbFileDO::getId, id);
         bean.setFilePaths(dynamicTbFileDOS.stream().map(dynamicTbFileDO -> {