From 01f7b8b3baea652f29e534f78cdcae33bb1ae060 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 28 十一月 2024 21:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 1cddb79..26368cf 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -8,6 +8,7 @@
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
+import com.ycl.domain.form.DocumentInfoForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
@@ -81,7 +82,8 @@
ProjectInfoForm.getEntityByForm(form,entity);
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
-
+ //鏇存柊椤圭洰淇℃伅
+ baseMapper.updateById(entity);
List<File> fileList = form.getFileList();
fileList.forEach(item->{
item.setBusId(entity.getId());
@@ -94,8 +96,6 @@
fileMapper.delete(fileQueryWrapper);
//鏇挎崲鎴愮幇鏈�
fileService.saveBatch(fileList);
- //鏇存柊椤圭洰淇℃伅
- baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -211,4 +211,32 @@
map.put("processExceptionProject", 0);
return map;
}
+
+ @Override
+ public Result docDetail(Integer id) {
+ DocumentInfoForm documentInfoForm = new DocumentInfoForm();
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.DOCUMENT_INFO.getType());
+ fileQueryWrapper.eq("bus_id",id);
+ List<File> files = fileMapper.selectList(fileQueryWrapper);
+ documentInfoForm.setFileList(files);
+ return Result.ok().data(documentInfoForm);
+ }
+
+ @Override
+ public Result addDoc(DocumentInfoForm form) {
+ List<File> fileList = form.getFileList();
+ fileList.forEach(item->{
+ item.setBusId(form.getProjectId());
+ item.setType(FileTypeEnum.DOCUMENT_INFO);
+ });
+ //鍒犻櫎鍘熸湁鏂囦欢
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.DOCUMENT_INFO.getType());
+ fileQueryWrapper.eq("bus_id",form.getProjectId());
+ fileMapper.delete(fileQueryWrapper);
+ //鏇挎崲鎴愮幇鏈�
+ fileService.saveBatch(fileList);
+ return Result.ok();
+ }
}
--
Gitblit v1.8.0