Merge remote-tracking branch 'origin/master'

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

@@ -956,7 +956,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_1, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
                 } else {
                     if (res.getLevel() == 2) {
-                        buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
+                        buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_2, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
                     } else {
                         buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 12, true, res.getChapterno() + "." + res.getTitleContent(), null);
                     }
@@ -2333,7 +2333,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_1, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
                     } else {
                         if (res.getLevel() == 2) {
-                            buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
+                            buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_2, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
                         } else {
                             buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 12, true, res.getChapterno() + "." + res.getTitleContent(), null);
                         }
@@ -3142,7 +3142,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_1, 15, true, res.getChapterno() + "." + res.getTitleContent(), null);
                 } else {
                     if (res.getLevel() == 2) {
-                        buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
+                        buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_2, 14, true, res.getChapterno() + "." + res.getTitleContent(), null);
                     } else {
                         buildTitleContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_3, 12, true, res.getChapterno() + "." + res.getTitleContent(), null);
                     }

business-common/src/main/java/com/rongwei/bscommon/sys/utils/ImportCommissionHelp.java

@@ -82,9 +82,9 @@ public class ImportCommissionHelp {
                                 throw new CustomException("字段 '标准测试时间' 不能为空");
                             }
                             detail.setTesttime(rowJson.getString("标准测试时间"));
-                            if (ObjectUtil.isEmpty(rowJson.getString("接收标准"))) {
+                            /*if (ObjectUtil.isEmpty(rowJson.getString("接收标准"))) {
                                 throw new CustomException("字段 '接收标准' 不能为空");
-                            }
+                            }*/
                             detail.setAcceptancecriteria(rowJson.getString("接收标准"));
                             String testAddress = rowJson.getString("测试地点");
                             if (ObjectUtil.isEmpty(testAddress) || ObjectUtil.isEmpty(importDto.getDictMap().get(testAddress))) {