试车world导出调整

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -341,7 +341,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             baseMapper.deleteTreeByPid(zhcxCommissionCheckDo.getId());
             treeDoList.forEach(tree -> {
                 ZhcxCommissionCheckDetailTreeDo target = new ZhcxCommissionCheckDetailTreeDo();
-                BeanUtils.copyProperties(tree, target);
+                BeanUtils.copyProperties(tree, target,tree.getAnnex(),tree.getSummary());
                 String id = tree.getId().split("_")[0] + "_" + zhcxCommissionCheckDo.getProjectcode() + zhcxCommissionCheckDo.getMachineno();
                 target.setId(id);
                 target.setRemark(tree.getId().split("_")[0]);
@@ -2293,7 +2293,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     if (ObjectUtil.isNotEmpty(res.getDetailList())) {
                         // 插入表头
                         builder.insertCell();
-                        buildTableTitleContent(builder, 30, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                        buildTableTitleContent(builder, 10, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
                                 9, true, "NO.", null);
                         builder.insertCell();
                         buildTableTitleContent(builder, 40, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
@@ -2302,14 +2302,20 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         buildTableTitleContent(builder, 40, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
                                 9, true, "模式2", null);
                         builder.insertCell();
-                        buildTableTitleContent(builder, 60, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                        buildTableTitleContent(builder, 50, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
                                 9, true, "测试内容中文", null);
                         builder.insertCell();
-                        buildTableTitleContent(builder, 60, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                        buildTableTitleContent(builder, 50, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
                                 9, true, "测试内容英文", null);
                         builder.insertCell();
-                        buildTableTitleContent(builder, 60, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
-                                9, true, "标准测试方法", null);
+                        /*buildTableTitleContent(builder, 60, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                                9, true, "标准测试方法", null);*/
+                        buildTableTitleContent(builder, 50, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                                9, true, "标准测试时间", null);
+                        // 接收标准
+                        builder.insertCell();
+                        buildTableTitleContent(builder, 50, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
+                                9, true, "接收标准", null);
                         builder.insertCell();
                         buildTableTitleContent(builder, 60, 20, HeightRule.EXACTLY, TextOrientation.HORIZONTAL, DEFAULT_FONT_NAME, StyleIdentifier.NORMAL,
                                 9, true, "测试地点", null);
@@ -2319,17 +2325,23 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                             count++;
                             // 插入表格的第一行
                             builder.insertCell();
-                            buildTableTextContent(builder, 30, 9, DEFAULT_FONT_NAME, false, String.valueOf(count));
+                            buildTableTextContent(builder, 10, 9, DEFAULT_FONT_NAME, false, String.valueOf(count));
                             builder.insertCell();
                             buildTableTextContent(builder, 40, 9, DEFAULT_FONT_NAME, false, detailWordVO.getClassification());
                             builder.insertCell();
                             buildTableTextContent(builder, 40, 9, DEFAULT_FONT_NAME, false, detailWordVO.getClassificationtwo());
                             builder.insertCell();
-                            buildTableTextContent(builder, 60, 9, DEFAULT_FONT_NAME, false, detailWordVO.getChtestcontent());
+                            buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false, detailWordVO.getChtestcontent());
+                            builder.insertCell();
+                            buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false, detailWordVO.getEntestcontent());
                             builder.insertCell();
-                            buildTableTextContent(builder, 60, 9, DEFAULT_FONT_NAME, false, detailWordVO.getEntestcontent());
+                            //buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false, detailWordVO.getTestmethod());
+                            // 标准测试时间
+                            buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false,
+                                    (detailWordVO.getTesttime() != null ? detailWordVO.getTesttime() : "").replace(".0", ""));
+                            // 接收标准
                             builder.insertCell();
-                            buildTableTextContent(builder, 60, 9, DEFAULT_FONT_NAME, false, detailWordVO.getTestmethod());
+                            buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false, detailWordVO.getAcceptancecriteria());
                             builder.insertCell();
                             String testAddress = "";
                             if (StringUtils.isNotBlank(detailWordVO.getTestaddress())) {