试车逻辑调整

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

@@ -450,6 +450,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         detailVo.setTestaddress(detailDo.getTestaddress());
         // 分类全路径id
         detailVo.setTreefullid(detailDo.getTreefullid());
+        // 接收标准
+        detailVo.setAcceptancecriteria(detailDo.getAcceptancecriteria());
         /*if(Objects.nonNull(detailDo.getChapterno())) {
             List<ZhcxCommissionCheckDetailDo> doList = baseMapper.selectDetailListByPidAndChapterno(pid,detailDo.getChapterno());
             if (!doList.isEmpty()) {
@@ -1641,7 +1643,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,
@@ -1650,14 +1652,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);
@@ -1665,17 +1673,23 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     for (ZhcxCommissionCheckBaseInfoDetailDo detailWordVO : res.getDetailList()) {
                         // 插入表格的第一行
                         builder.insertCell();
-                        buildTableTextContent(builder, 30, 9, DEFAULT_FONT_NAME, false, detailWordVO.getChapterno());
+                        buildTableTextContent(builder, 10, 9, DEFAULT_FONT_NAME, false, detailWordVO.getChapterno());
                         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, 60, 9, DEFAULT_FONT_NAME, false, detailWordVO.getTestmethod());
+                        // 标准测试时间
+                        buildTableTextContent(builder, 50, 9, DEFAULT_FONT_NAME, false,
+                                String.valueOf(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())) {
@@ -1899,6 +1913,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                 BigDecimal testTime = (row.getCell(11) == null || row.getCell(11).getCellType() == CellType.BLANK) ? null : new BigDecimal(row.getCell(11).toString());
                 String status = row.getCell(12) == null ? "" : row.getCell(12).toString().trim();
                 String isTitle = row.getCell(13) == null ? "" : row.getCell(13).toString().trim();
+                String acceptancecriteria = row.getCell(14) == null ? "" : row.getCell(14).toString().trim();
                 if (StringUtils.isBlank(number)) {
                     stringBuilder.append("章节号必填");
                 } else {
@@ -1925,10 +1940,14 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                 if ("否".equals(isTitle) && StringUtils.isBlank(twoClassification)) {
                     stringBuilder.append("模式2必填");
                 }
-                // 2025-03-11 标准测试时间新增必填校验
+                // 标准测试时间新增必填校验
                 if ("否".equals(isTitle) && testTime == null ) {
                     stringBuilder.append("标准测试时间必填");
                 }
+                // 接收标准必填校验
+                if("否".equals(isTitle) && StringUtils.isBlank(acceptancecriteria)){
+                    stringBuilder.append("接收标准必填");
+                }
                 if (StringUtil.isNotBlank(stringBuilder)) {
                     allStrBuilder.append("第").append(i + 1).append("行").append(stringBuilder).append("<br>");
                 } else {
@@ -1969,6 +1988,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         detailDo.setTestaddress(testAddress);
                         detailDo.setStatus(status);
                         detailDo.setDeleted("0");
+                        detailDo.setAcceptancecriteria(acceptancecriteria);// 接收标准
                         detailList.add(detailDo);
                     }
                 }
@@ -2539,6 +2559,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             }
             infoDetailDo.setTestaddress(checkDetailDo.getTestaddress());
             infoDetailDo.setTreefullid(newTreeFullId.toString());
+            // 接收标准
+            infoDetailDo.setAcceptancecriteria(checkDetailDo.getAcceptancecriteria());
             resultBaseInfoList.add(infoDetailDo);
         }
         // 保存结果集

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckBaseInfoDetailDo.java

@@ -193,4 +193,9 @@ public class ZhcxCommissionCheckBaseInfoDetailDo extends BaseDo implements Seria
     @TableField("TESTADDRESS")
     private String testaddress;
 
+    /**
+     * 接收标准
+     */
+    @TableField("ACCEPTANCECRITERIA")
+    private String acceptancecriteria;
 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckDetailDo.java

@@ -273,4 +273,11 @@ public class ZhcxCommissionCheckDetailDo extends BaseDo implements Serializable
      */
     @TableField("TREEID")
     private String treeid;
+
+    /**
+     * 接收标准
+     */
+    @JsonProperty("ACCEPTANCECRITERIA")
+    @TableField("ACCEPTANCECRITERIA")
+    private String acceptancecriteria;
 }