修改验收报告列表与标题2

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveExpertConclusionController.java

@@ -136,13 +136,10 @@ public class ArchiveExpertConclusionController extends BladeController {
     /**
      * 编写结论-暂存草稿
      */
-    @PostMapping("/getTable")
+    @PostMapping("/saveTable")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "在线验收-暂存草稿", notes = "传入结论信息")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
-    })
-    public R getTable(@RequestBody ArchiveExpertConclusion conclusion) {
+    public R saveTable(@RequestBody ArchiveExpertConclusion conclusion) {
         conclusionService.updateById(conclusion);
         return R.data("草稿保存成功");
     }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExpertConclusionServiceImpl.java

@@ -189,13 +189,17 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
      * 编写结论-确认提交
      */
     @Override
+    @Transactional
     public void submitTable(ArchiveExpertConclusion conclusion) {
+        //保存数据
+        //查询出数据
+        //判断是否追加
+        //调用生成
 
     }
 
     @Override
     public Boolean checkSubmit(Long projectId) {
-        Long userId = AuthUtil.getUserId();
         //判断当前用户职位是否为专家组长，专家组长允许提交
         String userRole = AuthUtil.getUserRole();
         if ("专家组长".equals(userRole)){

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -2935,7 +2935,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			total += (int)Math.ceil(new Double(vo2.getName().length()+4) / 50);
 			//如果出现不相同，则合并之前的
 			document.add(dataTable);
-			if (total >= 35 && i !=  (vo2s.size()-1)) {
+			if (total >= 40 && i !=  (vo2s.size()-1)) {
 				total = 0;
 				document.newPage();
 				tableHeader(projectName,document,size10font,size17font,floats);