From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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 7f650e5..1cddb79 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,15 +1,18 @@
package com.ycl.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.enums.business.FileTypeEnum;
+import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
import com.ycl.framework.utils.PageUtil;
+import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.service.FileService;
import com.ycl.service.ProjectInfoService;
@@ -37,6 +40,7 @@
private final ProjectInfoMapper projectInfoMapper;
private final FileService fileService;
+ private final FileMapper fileMapper;
/**
* 娣诲姞
*
@@ -48,6 +52,9 @@
public Result add(ProjectInfoForm form) {
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
baseMapper.insert(entity);
//娣诲姞鏂囦欢
List<File> fileList = form.getFileList();
@@ -56,7 +63,7 @@
item.setType(FileTypeEnum.PROJECT_INFO);
});
fileService.saveBatch(fileList);
- return Result.ok("娣诲姞鎴愬姛");
+ return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
/**
@@ -66,12 +73,28 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result update(ProjectInfoForm form) {
ProjectInfo entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
+ ProjectInfoForm.getEntityByForm(form,entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
+
+ List<File> fileList = form.getFileList();
+ fileList.forEach(item->{
+ item.setBusId(entity.getId());
+ item.setType(FileTypeEnum.PROJECT_INFO);
+ });
+ //鍒犻櫎鍘熸湁鏂囦欢
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
+ fileQueryWrapper.eq("bus_id",entity.getId());
+ fileMapper.delete(fileQueryWrapper);
+ //鏇挎崲鎴愮幇鏈�
+ fileService.saveBatch(fileList);
+ //鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -83,6 +106,7 @@
* @return
*/
@Override
+ //TODO:寰呭畬鍠�
public Result remove(List<String> ids) {
baseMapper.deleteBatchIds(ids);
return Result.ok("鍒犻櫎鎴愬姛");
@@ -95,6 +119,7 @@
* @return
*/
@Override
+ //TODO:寰呭畬鍠�
public Result removeById(String id) {
baseMapper.deleteById(id);
return Result.ok("鍒犻櫎鎴愬姛");
@@ -108,9 +133,17 @@
*/
@Override
public Result page(ProjectInfoQuery query) {
- IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
+ IPage<ProjectInfo> page = PageUtil.getPage(query, ProjectInfo.class);
baseMapper.getPage(page, query);
- return Result.ok().data(page.getRecords()).total(page.getTotal());
+ List<ProjectInfo> records = page.getRecords();
+ List<ProjectInfoVO> list = records.stream()
+ .map(entity -> {
+ ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
+ vo.setProjectColorCode("green");
+ return vo;
+ })
+ .collect(Collectors.toList());
+ return Result.ok().data(list).total(page.getTotal());
}
/**
@@ -121,8 +154,14 @@
*/
@Override
public Result detail(Integer id) {
- ProjectInfoVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ ProjectInfo entity = baseMapper.getById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
+ fileQueryWrapper.eq("bus_id",vo.getId());
+ List<File> files = fileMapper.selectList(fileQueryWrapper);
+ vo.setFileList(files);
return Result.ok().data(vo);
}
--
Gitblit v1.8.0