质检、试验bug

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialSelfInspectionRecordDTO.java

@@ -14,8 +14,8 @@ public class TrialSelfInspectionRecordDTO extends TrialSelfInspectionRecord {
     @ApiModelProperty("样品信息ids")
     private String sampleIds;
 
-    @ApiModelProperty(value = "表类型 1=记录表 2=报告单")
-    private Integer tableType;
+    @ApiModelProperty(value = "表类型 1=记录表 2=报告单 ，字符串拼接")
+    private String tableType;
 
     @ApiModelProperty(value = "引用设备仪器ids")
     private String deviceUseIds;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ExcelTabClient.java

@@ -24,7 +24,7 @@ public interface ExcelTabClient {
     String saveTabData(@RequestParam Integer isBatchSave,
                        @RequestBody JSONObject dataInfo,
                        @RequestParam Integer type,
-                       @RequestParam Integer tableType,
+                       @RequestParam String tableType,
                        @RequestParam Long id,
                        @RequestParam String tabIds) throws Exception;
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1402,7 +1402,7 @@ public class InformationWriteQueryController extends BladeController {
                             newData.setId(oldToNewIdMap.containsKey(node.getId()) ? oldToNewIdMap.get(node.getId()) : SnowFlakeUtil.getId());
 
                             //划分编号
-                            newData.setPartitionCode(StringUtils.isNotEmpty(node.getPartitionCode()) ? node.getPartitionCode() : null);
+                            newData.setPartitionCode(StringUtils.isNotEmpty(copyBatch.getPartitionCode()) ? copyBatch.getPartitionCode() : null);
                         }
                         //设置父节点ID
                         if (vo.getNeedCopyPrimaryKeyId().equals(node.getPKeyId().toString())) {

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

@@ -560,7 +560,7 @@ public class TaskController extends BladeController {
 	@ApiOperation(value = "完成/审批任务")
 	public R<Boolean> completeApprovalTask(@RequestBody TaskApprovalVO taskApprovalVO) throws FileNotFoundException {
 		//检查当前用户是否存在等待批次
-		System.out.println(AuthUtil.getUserId());
+		//System.out.println(AuthUtil.getUserId());
 		long batchCount = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));
 
 		if(batchCount > 0){

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -124,7 +124,7 @@ public class TrialDetectionController extends BladeController {
     @PostMapping("/self/submit")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "自检记录新增或修改", notes = "传入TrialSelfInspectionRecordDTO")
-    public R<Object> selfSubmit(@Valid @RequestBody TrialSelfInspectionRecordDTO dto) throws Exception {
+    public R<Object> selfSubmit(@Valid @RequestBody TrialSelfInspectionRecordDTO dto) {
         return R.data(iTrialSelfInspectionRecordService.selfSubmit(dto));
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSelfInspectionRecordMapper.xml

@@ -64,7 +64,7 @@
     </delete>
 
     <select id="selectAll" resultType="org.springblade.business.entity.TrialSelfInspectionRecord">
-        select * from u_trial_self_inspection_record where node_id = #{nodeId} and contract_id = #{contractId}
+        select record_no,report_no from u_trial_self_inspection_record where node_id = #{nodeId} and contract_id = #{contractId}
     </select>
 
     <select id="selectSelfSampleRecord" resultType="java.lang.String">

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSelfInspectionRecordService.java

@@ -15,7 +15,7 @@ public interface ITrialSelfInspectionRecordService extends BaseService<TrialSelf
 
     IPage<TrialSelfInspectionRecordVO> selfPage(IPage<TrialSelfInspectionRecord> page, TrialSelfInspectionRecordPageDTO dto);
 
-    String selfSubmit(TrialSelfInspectionRecordDTO dto) throws Exception;
+    String selfSubmit(TrialSelfInspectionRecordDTO dto) ;
 
     List<TrialSampleInfoVO> selfSampleList(String id);
 

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

@@ -204,11 +204,19 @@ public class TrialSelfInspectionRecordServiceImpl
     public boolean selfCopy(List<Long> ids) {
         List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectBatchIds(ids);
         for (TrialSelfInspectionRecord trialSelfInspectionRecord : trialSelfInspectionRecords) {
-            TrialSelfInspectionRecordDTO trialSelfInspectionRecordDTO = BeanUtil.copyProperties(trialSelfInspectionRecord, TrialSelfInspectionRecordDTO.class);
-            assert trialSelfInspectionRecordDTO != null;
-            trialSelfInspectionRecordDTO.setId(SnowFlakeUtil.getId()); //主键id
-            this.buildNumber(trialSelfInspectionRecordDTO); //重构编号
-            this.save(trialSelfInspectionRecordDTO); //复制新增
+            TrialSelfInspectionRecordDTO dto = BeanUtil.copyProperties(trialSelfInspectionRecord, TrialSelfInspectionRecordDTO.class);
+            assert dto != null;
+            dto.setId(SnowFlakeUtil.getId());
+            if (StringUtils.isNotEmpty(dto.getRecordNo())) {
+                dto.setTableType("1");
+            } else if (StringUtils.isNotEmpty(dto.getReportNo())) {
+                dto.setTableType("2");
+            } else if (StringUtils.isNotEmpty(dto.getReportNo()) && StringUtils.isNotEmpty(dto.getRecordNo())) {
+                dto.setTableType("1,2");
+            }
+            //重构编号
+            this.buildNumber(dto);
+            this.save(dto);
         }
         return true;
     }
@@ -642,8 +650,8 @@ public class TrialSelfInspectionRecordServiceImpl
     }
 
     @Override
-    public String selfSubmit(TrialSelfInspectionRecordDTO dto) throws Exception {
-        if (ObjectUtil.isEmpty(dto.getId())) {
+    public String selfSubmit(TrialSelfInspectionRecordDTO dto) {
+        if (ObjectUtil.isEmpty(dto.getId()) && StringUtils.isNotEmpty(dto.getTableType())) {
             //构建记录表编号、报告单编号
             this.buildNumber(dto);
 
@@ -667,9 +675,17 @@ public class TrialSelfInspectionRecordServiceImpl
             //获取当前最新的试验记录信息
             TrialSelfInspectionRecord obj = baseMapper.selectById(dto.getId());
 
+            //如果新增时不是两种类型表都填报过，那么有一项编号为Null，所以编辑时生成记录表编号或报告单编号
+            if (StringUtils.isEmpty(obj.getRecordNo()) && dto.getTableType().contains("1")) {
+                this.buildNumber(dto);
+                this.saveOrUpdate(dto);
+            } else if (StringUtils.isEmpty(obj.getReportNo()) && dto.getTableType().contains("2")) {
+                this.buildNumber(dto);
+                this.saveOrUpdate(dto);
+            }
+
             try {
-                //保存实体表数据、记录信息、生成pdf
-                assert obj != null;
+                //保存实体表数据、试验记录信息、生成pdf
                 String pdfURL = excelTabClient.saveTabData(dto.getIsBatchSave(), dto.getDataInfo(), dto.getType(), dto.getTableType(), dto.getId(), obj.getTableIds());
                 if (StringUtils.isNotEmpty(pdfURL)) {
                     //修改合并pdf
@@ -817,66 +833,158 @@ public class TrialSelfInspectionRecordServiceImpl
     private void buildNumber(TrialSelfInspectionRecordDTO dto) {
         StringSPUtils spUtils = new StringSPUtils();
         List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectAll(dto.getNodeId(), dto.getContractId());
-        //获取记录表最大编号
-        List<String> recordNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getRecordNo).collect(Collectors.toList());
-        String maxRecordNo;
-        if (recordNos.size() == 0 || ObjectUtil.isEmpty(recordNos)) {
-            maxRecordNo = "0001";
-        } else {
-            List<String> numberRecordNos = new ArrayList<>();
-            for (String recordNo : recordNos) {
-                String number = recordNo.split("-")[recordNo.split("-").length - 1];
-                numberRecordNos.add(number);
+
+        //两种类型同时生成
+        if (dto.getTableType().contains("1,2") || dto.getTableType().contains("2,1")) {
+            String maxRecordNo = "";
+            if (StringUtils.isEmpty(dto.getRecordNo())) {
+                //获取记录表最大编号
+                List<String> recordNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getRecordNo).collect(Collectors.toList());
+                if (recordNos.size() == 0 || ObjectUtil.isEmpty(recordNos)) {
+                    maxRecordNo = "0001";
+                } else {
+                    List<String> numberRecordNos = new ArrayList<>();
+                    for (String recordNo : recordNos) {
+                        String number = recordNo.split("-")[recordNo.split("-").length - 1];
+                        numberRecordNos.add(number);
+                    }
+                    int maxRecordNo1 = Integer.parseInt(Collections.max(numberRecordNos)) + 1;
+                    if (maxRecordNo1 < 9999 && maxRecordNo1 > 0) {
+                        maxRecordNo = spUtils.buildSerial(maxRecordNo1, 4);
+                    } else {
+                        throw new ServiceException("当前编号已达到最大值9999，操作失败");
+                    }
+                }
             }
-            int maxRecordNo1 = Integer.parseInt(Collections.max(numberRecordNos)) + 1;
-            if (maxRecordNo1 < 9999 && maxRecordNo1 > 0) {
-                maxRecordNo = spUtils.buildSerial(maxRecordNo1, 4);
+
+            String maxReportNo = "";
+            if (StringUtils.isEmpty(dto.getReportNo())) {
+                //获取报告单最大编号
+                List<String> reportNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getReportNo).collect(Collectors.toList());
+                if (reportNos.size() == 0 || ObjectUtil.isEmpty(reportNos)) {
+                    maxReportNo = "0001";
+                } else {
+                    List<String> numberReportNo = new ArrayList<>();
+                    for (String reportNo : reportNos) {
+                        String number = reportNo.split("-")[reportNo.split("-").length - 1];
+                        numberReportNo.add(number);
+                    }
+                    int maxReportNo1 = Integer.parseInt(Collections.max(numberReportNo)) + 1;
+                    if (maxReportNo1 < 9999 && maxReportNo1 > 0) {
+                        maxReportNo = spUtils.buildSerial(maxReportNo1, 4);
+                    } else {
+                        throw new ServiceException("当前编号已达到最大值9999，操作失败");
+                    }
+                }
+            }
+
+            List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateClient.queryByPKeyIds(Func.toStrList(String.valueOf(dto.getNodeId())));
+            WbsTreePrivate wbsTreePrivate = wbsTreePrivates.stream().findAny().orElse(null);
+            ContractInfo contract = contractClient.getContractById(dto.getContractId());
+            int year = LocalDateTimeUtil.now().getYear();
+            if (wbsTreePrivate == null) {
+                throw new ServiceException("未找到当前节点信息，操作失败！");
             } else {
-                throw new ServiceException("当前编号已达到最大值9999，操作失败");
+                //记录表
+                if (StringUtils.isNotEmpty(maxRecordNo)) {
+                    String str1 = "JL" +
+                            "-" + contract.getContractNumber() +
+                            "-" + year +
+                            "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
+                            "-" + maxRecordNo;
+                    dto.setRecordNo(str1);
+                }
+
+                //报告单
+                if (StringUtils.isNotEmpty(maxReportNo)) {
+                    String str2 = "BG" +
+                            "-" + contract.getContractNumber() +
+                            "-" + year +
+                            "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
+                            "-" + maxReportNo;
+                    dto.setReportNo(str2);
+                }
             }
         }
 
-        //获取报告单最大编号
-        List<String> reportNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getReportNo).collect(Collectors.toList());
-        String maxReportNo;
-        if (reportNos.size() == 0 || ObjectUtil.isEmpty(reportNos)) {
-            maxReportNo = "0001";
-        } else {
-            List<String> numberReportNo = new ArrayList<>();
-            for (String reportNo : reportNos) {
-                String number = reportNo.split("-")[reportNo.split("-").length - 1];
-                numberReportNo.add(number);
-            }
-            int maxReportNo1 = Integer.parseInt(Collections.max(numberReportNo)) + 1;
-            if (maxReportNo1 < 9999 && maxReportNo1 > 0) {
-                maxReportNo = spUtils.buildSerial(maxReportNo1, 4);
-            } else {
-                throw new ServiceException("当前编号已达到最大值9999，操作失败");
+        //记录表
+        if (("1").equals(dto.getTableType())) {
+            if (StringUtils.isEmpty(dto.getRecordNo())) {
+                //获取记录表最大编号
+                List<String> recordNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getRecordNo).collect(Collectors.toList());
+                String maxRecordNo;
+                if (recordNos.size() == 0 || ObjectUtil.isEmpty(recordNos)) {
+                    maxRecordNo = "0001";
+                } else {
+                    List<String> numberRecordNos = new ArrayList<>();
+                    for (String recordNo : recordNos) {
+                        String number = recordNo.split("-")[recordNo.split("-").length - 1];
+                        numberRecordNos.add(number);
+                    }
+                    int maxRecordNo1 = Integer.parseInt(Collections.max(numberRecordNos)) + 1;
+                    if (maxRecordNo1 < 9999 && maxRecordNo1 > 0) {
+                        maxRecordNo = spUtils.buildSerial(maxRecordNo1, 4);
+                    } else {
+                        throw new ServiceException("当前编号已达到最大值9999，操作失败");
+                    }
+                }
+
+                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateClient.queryByPKeyIds(Func.toStrList(String.valueOf(dto.getNodeId())));
+                WbsTreePrivate wbsTreePrivate = wbsTreePrivates.stream().findAny().orElse(null);
+                ContractInfo contract = contractClient.getContractById(dto.getContractId());
+                int year = LocalDateTimeUtil.now().getYear();
+                if (wbsTreePrivate == null) {
+                    throw new ServiceException("未找到当前节点信息，操作失败！");
+                } else {
+                    //记录表
+                    String str1 = "JL" +
+                            "-" + contract.getContractNumber() +
+                            "-" + year +
+                            "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
+                            "-" + maxRecordNo;
+                    dto.setRecordNo(str1);
+                }
             }
         }
 
-        List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateClient.queryByPKeyIds(Func.toStrList(String.valueOf(dto.getNodeId())));
-        WbsTreePrivate wbsTreePrivate = wbsTreePrivates.stream().findAny().orElse(null);
-        ContractInfo contract = contractClient.getContractById(dto.getContractId());
-        int year = LocalDateTimeUtil.now().getYear();
-        if (wbsTreePrivate == null) {
-            throw new ServiceException("未找到当前节点信息，操作失败！");
-        } else {
-            //记录表
-            String str1 = "JL" +
-                    "-" + contract.getContractNumber() +
-                    "-" + year +
-                    "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
-                    "-" + maxRecordNo;
-            dto.setRecordNo(str1);
-
-            //报告单
-            String str2 = "BG" +
-                    "-" + contract.getContractNumber() +
-                    "-" + year +
-                    "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
-                    "-" + maxReportNo;
-            dto.setReportNo(str2);
+        //报告单
+        if (("2").equals(dto.getTableType())) {
+            if (StringUtils.isEmpty(dto.getReportNo())) {
+                //获取报告单最大编号
+                List<String> reportNos = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getReportNo).collect(Collectors.toList());
+                String maxReportNo;
+                if (reportNos.size() == 0 || ObjectUtil.isEmpty(reportNos)) {
+                    maxReportNo = "0001";
+                } else {
+                    List<String> numberReportNo = new ArrayList<>();
+                    for (String reportNo : reportNos) {
+                        String number = reportNo.split("-")[reportNo.split("-").length - 1];
+                        numberReportNo.add(number);
+                    }
+                    int maxReportNo1 = Integer.parseInt(Collections.max(numberReportNo)) + 1;
+                    if (maxReportNo1 < 9999 && maxReportNo1 > 0) {
+                        maxReportNo = spUtils.buildSerial(maxReportNo1, 4);
+                    } else {
+                        throw new ServiceException("当前编号已达到最大值9999，操作失败");
+                    }
+                }
+
+                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateClient.queryByPKeyIds(Func.toStrList(String.valueOf(dto.getNodeId())));
+                WbsTreePrivate wbsTreePrivate = wbsTreePrivates.stream().findAny().orElse(null);
+                ContractInfo contract = contractClient.getContractById(dto.getContractId());
+                int year = LocalDateTimeUtil.now().getYear();
+                if (wbsTreePrivate == null) {
+                    throw new ServiceException("未找到当前节点信息，操作失败！");
+                } else {
+                    //报告单
+                    String str2 = "BG" +
+                            "-" + contract.getContractNumber() +
+                            "-" + year +
+                            "-" + spUtils.getStringSP(wbsTreePrivate.getNodeName().trim()) +
+                            "-" + maxReportNo;
+                    dto.setReportNo(str2);
+                }
+            }
         }
     }
 

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

@@ -117,7 +117,7 @@ public class TableFileController extends BladeController {
     @PostMapping("/remove-trial")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "逻辑删除", notes = "传入当前文件ids、tableType、合同段Id、当前自检记录id")
-    public R removeTrial(@RequestParam String ids, @RequestParam Integer tableType, @RequestParam String contractId, @RequestParam Long id) throws Exception {
+    public R removeTrial(@RequestParam String ids, @RequestParam String tableType, @RequestParam String contractId, @RequestParam Long id) throws Exception {
         //基本信息
         TableFile tableFile = tableFileService.getById(ids);
 
@@ -136,6 +136,7 @@ public class TableFileController extends BladeController {
                 .eq(WbsTreePrivate::getPKeyId, pkeyId));
 
         WbsTreePrivate wbsTreePrivate1 = wbsTreePrivateService.getBaseMapper().selectOne(Wrappers.<WbsTreePrivate>query().lambda()
+                .select(WbsTreePrivate::getPKeyId)
                 .eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
                 .eq(WbsTreePrivate::getId, wbsTreePrivate.getParentId())
         );
@@ -162,7 +163,7 @@ public class TableFileController extends BladeController {
         }
 
         //获取当前记录下的文本元素表的附件文件信息
-        List<TableFile> fileList = this.tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>lambdaQuery()
+        Long row = this.tableFileService.getBaseMapper().selectCount(Wrappers.<TableFile>lambdaQuery()
                 .eq(TableFile::getType, 2)
                 .eq(TableFile::getTabId, pkeyId)
                 .eq(TableFile::getTrialRecordId, id)
@@ -170,7 +171,7 @@ public class TableFileController extends BladeController {
 
         //修改按钮状态
         String updateSql;
-        if (fileList.size() == 0) {
+        if (row == 0) {
             //无附件
             updateSql = "update u_trial_self_data_record set is_tab_file_type = 1 where tab_id = " + pkeyId + " and record_id = " + id;
         } else {

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ExcelTabClientImpl.java

@@ -44,7 +44,7 @@ public class ExcelTabClientImpl implements ExcelTabClient {
     }
 
     @Override
-    public String saveTabData(Integer isBatchSave, JSONObject dataInfo, Integer type, Integer tableType, Long id, String tabIds) throws Exception {
+    public String saveTabData(Integer isBatchSave, JSONObject dataInfo, Integer type, String tableType, Long id, String tabIds) throws Exception {
         //通用参数
         JSONArray dataArray = dataInfo.getJSONArray("orderList");
         JSONObject table = dataArray.getJSONObject(0);
@@ -143,7 +143,7 @@ public class ExcelTabClientImpl implements ExcelTabClient {
     public String getBussPDFSTrial(String nodeId, String tableType, String classify, String contractId, String projectId, String id, String tabIds) throws Exception {
         //合并PDF加载
         return excelTabService.getBussPDFSTrial(nodeId,
-                Integer.parseInt(tableType), //tableType=表类型 1=记录表 2=报告单
+                tableType, //tableType=表类型 1=记录表 2=报告单
                 classify, //type=所属方 1=施工质检 2=监理抽检
                 contractId, //合同段id
                 projectId, //项目id

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

@@ -134,7 +134,7 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
     /**
      * 多PDF 合并 - 试验
      */
-    String getBussPDFSTrial(String nodeId, Integer tableType, String classify, String contractId, String projectId, Long id, String tabIds) throws Exception;
+    String getBussPDFSTrial(String nodeId, String tableType, String classify, String contractId, String projectId, Long id, String tabIds) throws Exception;
 
 
     /**

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

@@ -1547,7 +1547,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 Element table = doc.select("table").first();
                 Elements trs = table.select("tr");
                 Elements cols = table.select("col");
-
                 if (ObjectUtil.isNotEmpty(DataInfo)) {
                     for (String val : DataInfo.keySet()) {
                         if (val.contains("__")) {
@@ -1559,7 +1558,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                             if (data.html().contains("x1") && data.html().contains("y1")) {
                                 int x1 = 0;
                                 int y1 = 0;
-
                                 if (data.html().contains("el-tooltip")) {
                                     x1 = Integer.parseInt(data.children().get(0).children().get(0).attr("x1"));
                                     y1 = Integer.parseInt(data.children().get(0).children().get(0).attr("y1"));
@@ -1591,11 +1589,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                         myData = StringUtil.format("{}年{}月{}日", dataStr[0], dataStr[1], Integer.parseInt(dataStr[2]) + 1);
                                     }
                                 }
-                                //https:bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20220819/b53cb6700db369381e3b03d7737bcdec.jpg__16_1
                                 if (myData.contains("https") && myData.contains("aliyuncs")) {
-
                                     BufferedImage image = ImageIO.read(CommonUtil.getOSSInputStream(myData));
-
                                     int colspan = data.attr("COLSPAN").equals("") ? 0 : Integer.parseInt(data.attr("COLSPAN"));
                                     int rowspan = data.attr("ROWSPAN").equals("") ? 0 : Integer.parseInt(data.attr("ROWSPAN"));
                                     int picHeight = 0;
@@ -1635,23 +1630,17 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     ExcelPicture pic = sheet.getPictures().add(y1, x1, image);
                                     pic.setAutoSize(true);
                                     pic.setWidth(picWidth - 10);
-
-                                    //System.out.println(sheet.get(y1, x1).getRowHeight());
-                                    //System.out.println(sheet.get(y1, x1).getRows());
                                     pic.setHeight(picHeight);
                                     pic.setLeft(5);
                                 } else {
                                     CellRange cellRange = sheet.getCellRange(y1, x1);
                                     cellRange.getCellStyle().getExcelFont().setFontName("EUDC");
                                     cellRange.setText(myData);
-                                    //System.out.println(cellRange.getStyle().getFont().getFontName());
-                                    //System.out.println("后" + cellRange.getText());
                                 }
                             }
                         }
                     }
                 }
-
                 // 组装电签设置
                 QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("type", 2);
@@ -1681,11 +1670,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         wb.saveToFile(excelPath, ExcelVersion.Version2010);
         FileUtils.excelToPdf(excelPath, pdfPath);
         BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
-        TableFile tableFile1 = tableFileService.getBaseMapper().selectOne(Wrappers.<TableFile>query().lambda()
-                .eq(TableFile::getTabId, pkeyId + "")
-                .eq(TableFile::getType, 1)
-                .eq(TableFile::getTrialRecordId, id));
-
+        TableFile tableFile1 = tableFileService.getBaseMapper().selectOne(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId + "").eq(TableFile::getType, 1).eq(TableFile::getTrialRecordId, id));
         if (tableFile1 != null) {
             tableFile1.setDomainPdfUrl(bladeFile.getLink());
             tableFileService.saveOrUpdate(tableFile1);
@@ -1699,22 +1684,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             tableFile.setIsDeleted(0);
             tableFile.setExtension(fileExtension);
             tableFile.setDomainPdfUrl(bladeFile.getLink());
-
             tableFile.setTrialRecordId(id);
-
             tableFileService.saveOrUpdate(tableFile);
         }
 
         //获取当前试验记录的中的元素表的附件文件
-        List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda()
-                .eq(TableFile::getTabId, pkeyId + "")
-                .eq(TableFile::getTrialRecordId, id)
-        );
+        List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId + "").eq(TableFile::getTrialRecordId, id));
 
         if (tableFileList.size() > 0) {
-
             tableFileList.sort(Comparator.comparing(TableFile::getType));
-
             List<String> dataListPdf = tableFileList.stream().filter(tableFile ->
                     tableFile.getDomainPdfUrl() != null
                             && (tableFile.getType() == 1 || tableFile.getType() == 2)
@@ -1755,7 +1733,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
      * 试验 多pdf
      */
     @Override
-    public String getBussPDFSTrial(String nodeId, Integer tableType, String classify, String contractId, String projectId, Long id, String tabIds) throws Exception {
+    public String getBussPDFSTrial(String nodeId, String tableType, String classify, String contractId, String projectId, Long id, String tabIds) throws Exception {
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
         //获取有权限的节点信息
         String sql = "select * from m_wbs_tree_private where is_deleted = 0 and p_key_id in (" + tabIds + ")";