Merge branch 'songyuanshuo' into 'master'

1.修改接口/Plan/Record/export  Excel导出第一页少显示一行2.为TestObjectData添加字段remark和notApplicable用于前端页面展示

See merge request !23

quality-review/src/main/java/com/ruoyi/common/ExcelMultipleSheetsUtil.java

@@ -52,7 +52,7 @@ public class ExcelMultipleSheetsUtil {
             CellRangeAddress mergeRegion = new CellRangeAddress(1, 2, 0, 1);
             // 将合并区域添加到工作表中
             sheetFirst.addMergedRegion(mergeRegion);
-            final int[] i = {2};
+            final int[] i = {3};
             cover.forEach((key,value)->{
                 Row dataRow  =   sheetFirst.createRow(i[0]);
                 dataRow.setHeightInPoints(20);

quality-review/src/main/java/com/ruoyi/domain/TestObjectData.java

@@ -34,4 +34,10 @@ public class TestObjectData {
 
     @ApiModelProperty("分组标识")
     private String flag;
+
+    @ApiModelProperty("注释")
+    private String remark;
+
+    @ApiModelProperty("不适用描述")
+    private String notApplicable;
 }

quality-review/src/main/java/com/ruoyi/web/TestObjectDataController.java

@@ -42,6 +42,8 @@ public class TestObjectDataController {
             Map mapObj =new HashMap();
             mapObj.put("options",value);
             map.put("componentProps",mapObj);
+            map.put("remark",value.get(0).getRemark());
+            map.put("notApplicable",value.get(0).getNotApplicable());
             list.add(map);
             sum[0] = sum[0] +1;
         });

quality-review/src/main/java/com/ruoyi/web/TestPlanRecordController.java

@@ -182,7 +182,7 @@ public class TestPlanRecordController extends BaseController{
                 resultDesc.put(key, new ArrayList<>());
             }
         });
-        ExcelMultipleSheetsUtil.excelMultipleSheets(resultDesc, "检测方案" + DateUtil.format(new Date(), "yyyyMMdd"), XLSX_SUFFIX, respon,cover);
+        ExcelMultipleSheetsUtil.excelMultipleSheets(resultDesc, "检测方案" + systemReviewExportRequest.getCarModel(), XLSX_SUFFIX, respon,cover);
 
     }