Merge remote-tracking branch 'origin/zhuwei' into test-merge-02

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/TaskSplitVO.java

@@ -0,0 +1,18 @@
+package org.springblade.archive.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.archive.entity.TaskSplit;
+
+/**
+ * 解析主标任务视图实体类
+ *
+ * @author BladeX
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TaskSplitVO extends TaskSplit {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -161,4 +161,7 @@ public interface ArchiveFileClient {
 
     @PostMapping(API_PREFIX + "/updateFilesEx")
     void updateArchiveFileEx(@RequestBody List<ArchiveFile> files);
+
+    @PostMapping(API_PREFIX + "/saveArchiveFile")
+    void saveArchiveFile(@RequestBody ArchiveFile archiveFile);
 }

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

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.archive.entity.TaskSplit;
-import org.springblade.archive.vo.TaskSplitVO;
 import org.springblade.archive.service.ITaskSplitService;
 import org.springblade.core.boot.ctrl.BladeController;
 
@@ -74,13 +73,13 @@ public class TaskSplitController extends BladeController {
 	/**
 	 * 查询任务任务信息
 	 */
-	@GetMapping("/selectTaskSplit")
+/*	@GetMapping("/selectTaskSplit")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查询任务任务信息", notes = "传入taskSplit")
 	public R<IPage<TaskSplitVO>> page(TaskSplitVO taskSplit, Query query) {
 		IPage<TaskSplitVO> pages = taskSplitService.selectTaskSplitPage(Condition.getPage(query), taskSplit);
 		return R.data(pages);
-	}
+	}*/
 
 	/**
 	 * 新增 解析主标任务

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

@@ -4165,6 +4165,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(fileUrl==null || Func.isNull(fileUrl)){
 			R.fail("请上传fileUrl");
 		}
+
+
 		if(fileName==null || Func.isNull(fileName)){
 			R.fail("请上传fileName");
 		}
@@ -4178,6 +4180,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(treeContractId==null || Func.isNull(treeContractId)){
 			R.fail("请校验传输的nodeId和contractId,没有查到父节点Id");
 		}
+
+
+
 		// 将数据插入到 auto表中
 		ArchivesAuto archivesAuto = new ArchivesAuto();
 		long newPkId = SnowFlakeUtil.getId(); //主键Id
@@ -4185,8 +4190,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		archivesAuto.setProjectId(Func.toLong(contractInfo.getPId()));
 		archivesAuto.setContractId(Func.toLong(contractId));
 		archivesAuto.setName(fileName);
-
-		return null;
+		archivesAuto.setIsDeleted(0);
+		this.save(archivesAuto);
+
+		// 保存文件到archive_file表中
+		long arueId = SnowFlakeUtil.getId(); //主键Id
+		ArchiveFile archiveFile = new ArchiveFile();
+		archiveFile.setId(arueId);
+		archiveFile.setArchiveId(newPkId);
+		archiveFile.setFileName(fileName);
+		archiveFileClient.saveArchiveFile(archiveFile);
+		return R.success("保存成功");
 	}
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -341,4 +341,9 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
         }
     }
 
+    @Override
+    public void saveArchiveFile(ArchiveFile archiveFile) {
+        iArchiveFileService.save(archiveFile);
+    }
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -167,6 +167,17 @@ public class WbsTreeController extends BladeController {
         return R.data(iUserService.queryInformationByContractIdAndName(contractId, name));
     }
 
+    @GetMapping("/informationWriteQuery/queryInformationByFileNumber")
+    @ApiOperation("根据合同段Id，模糊文件名查询(杭宁项目专用)")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "contractId",value = "合同段Id"),
+            @ApiImplicitParam(name="fileNumber",value = "文件编号")
+    })
+    public R<List<InformationQueryVO1>> queryInformationByFileNumber(@RequestParam String contractId, @RequestParam String fileNumber){
+        return R.data(iUserService.queryInformationByFileNumber(contractId, fileNumber));
+    }
+
+
 //    /**
 //     * 项目全加载树
 //     *

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -244,4 +244,6 @@ public interface IUserService extends BaseService<User> {
 
 
     List<InformationQueryVO1> queryInformationByContractIdAndName(String contractId, String name);
+
+    List<InformationQueryVO1> queryInformationByFileNumber(String contractId, String fieldNumber);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -2093,4 +2093,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     }
 
 
+    @Override
+    public List<InformationQueryVO1> queryInformationByFileNumber(String contractId, String fileNumber) {
+        if (StringUtil.isEmpty(contractId)) {
+            throw new ServiceException("未获取到合同段id");
+        }
+
+        List<InformationQueryVO1> informationQueryVO1s = baseMapper.queryInformationByContractIdAndName(contractId, fileNumber);
+
+        return informationQueryVO1s;
+    }
+
 }