Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveExpertConclusion.java

@@ -47,6 +47,9 @@ public class ArchiveExpertConclusion extends BaseEntity {
     @ApiModelProperty("结论报表的pdf地址")
     private String tableUrl;
 
+    @ApiModelProperty("结论标题")
+    private String tableTitle;
+
     @ApiModelProperty("是否生成打分表：0否1是")
     private Integer isBuildScore;
 

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

@@ -14,6 +14,8 @@ import org.springblade.archive.service.IArchiveExpertScoreService;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.feign.ProjectClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,6 +27,8 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
 
     private final IArchiveExpertScoreService scoreService;
 
+    private final ProjectClient projectClient;
+
     @Override
     @Transactional
     public R saveBaseTableInfo(Long projectId, String appUrl) {
@@ -35,6 +39,11 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         conclusion.setIsBuildScore(0);
         conclusion.setStatus(1);
         conclusion.setApproveStatus(0);
+        ProjectInfo info = projectClient.getById(projectId + "");
+        if (info == null){
+            return R.fail("获取项目信息失败");
+        }
+        conclusion.setTableTitle(info.getProjectName()+"项目档案验收报告");
         this.save(conclusion);
         //保存评分基础信息
         scoreService.saveBaseScoreInfo(projectId);

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1666,12 +1666,12 @@ public class TaskController extends BladeController {
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "附件文件上传", notes = "传入TaskDataUploadFileDTO")
     public R<Object> dataUploadFile(@RequestBody TaskDataUploadFileDTO dto) {
-        if (ObjectUtil.isEmpty(dto.getTaskId())) {
-            throw new ServiceException("未获取到taskId");
+        if (ObjectUtil.isEmpty(dto.getTaskId()) || ObjectUtil.isEmpty(dto.getDataId())) {
+            throw new ServiceException("未获取到taskId或dataId");
         }
         Task task = jdbcTemplate.query("SELECT meter_task_type,process_instance_id,contract_id,project_id,status FROM u_task WHERE id = " + dto.getTaskId(), new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if (task != null) {
-            if (task.getStatus().equals(2)) {
+            if (Arrays.asList(2, 3).contains(task.getStatus())) {
                 throw new ServiceException("当前任务已完成审批，无法上传");
             }
             check(task);
@@ -1701,7 +1701,7 @@ public class TaskController extends BladeController {
         }
         Task task = jdbcTemplate.query("SELECT meter_task_type,process_instance_id,status FROM u_task WHERE id = " + taskId, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if (task != null) {
-            if (task.getStatus().equals(2)) {
+            if (Arrays.asList(2, 3).contains(task.getStatus())) {
                 throw new ServiceException("当前任务已完成审批，无法删除");
             }
             check(task);