From 80662b34fe93b4ede00c7fc03fbd9f01355c94e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 07 四月 2025 13:52:17 +0800
Subject: [PATCH] 修改任务接口
---
business/src/main/java/com/ycl/service/impl/ProjectInvestmentPolicyComplianceServiceImpl.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentPolicyComplianceServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentPolicyComplianceServiceImpl.java
index 8299d67..d9b933e 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentPolicyComplianceServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentPolicyComplianceServiceImpl.java
@@ -1,8 +1,16 @@
package com.ycl.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.common.enums.business.FileTypeEnum;
+import com.ycl.common.utils.SecurityUtils;
+import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInvestmentPolicyCompliance;
+import com.ycl.domain.entity.ProjectUnitRegistrationInfo;
+import com.ycl.domain.vo.ProjectUnitRegistrationInfoVO;
+import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectInvestmentPolicyComplianceMapper;
+import com.ycl.service.FileService;
import com.ycl.service.ProjectInvestmentPolicyComplianceService;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +21,9 @@
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.stream.Collectors;
@@ -29,17 +39,33 @@
public class ProjectInvestmentPolicyComplianceServiceImpl extends ServiceImpl<ProjectInvestmentPolicyComplianceMapper, ProjectInvestmentPolicyCompliance> implements ProjectInvestmentPolicyComplianceService {
private final ProjectInvestmentPolicyComplianceMapper projectInvestmentPolicyComplianceMapper;
-
+ private final FileService fileService;
+ private final FileMapper fileMapper;
/**
* 娣诲姞
* @param form
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result add(ProjectInvestmentPolicyComplianceForm form) {
ProjectInvestmentPolicyCompliance entity = ProjectInvestmentPolicyComplianceForm.getEntityByForm(form, null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
baseMapper.insert(entity);
- return Result.ok("娣诲姞鎴愬姛");
+ //娣诲姞鏂囦欢
+ if (!CollectionUtils.isEmpty(form.getFileList())) {
+ List<File> fileList = form.getFileList();
+ fileList.forEach(item -> {
+ item.setId(null);
+ item.setBusId(entity.getId());
+ item.setType(FileTypeEnum.INVEST_POLICY);
+ });
+ fileService.saveBatch(fileList);
+ }
+ //閬垮厤鏂板涓�涓悗閲嶅鏂板杩斿洖id缁欏墠绔垽鏂�
+ return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
/**
@@ -50,11 +76,27 @@
@Override
public Result update(ProjectInvestmentPolicyComplianceForm form) {
ProjectInvestmentPolicyCompliance entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
baseMapper.updateById(entity);
+ if (!CollectionUtils.isEmpty(form.getFileList())) {
+ List<File> fileList = form.getFileList();
+ fileList.forEach(item->{
+ item.setId(null);
+ item.setBusId(entity.getId());
+ item.setType(FileTypeEnum.INVEST_POLICY);
+ });
+ //鍒犻櫎鍘熸湁鏂囦欢
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.INVEST_POLICY.getType());
+ fileQueryWrapper.eq("bus_id",entity.getId());
+ fileMapper.delete(fileQueryWrapper);
+ //鏇挎崲鎴愮幇鏈�
+ fileService.saveBatch(fileList);
+ }
return Result.ok("淇敼鎴愬姛");
}
@@ -99,8 +141,18 @@
*/
@Override
public Result detail(Integer id) {
- ProjectInvestmentPolicyComplianceVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ QueryWrapper<ProjectInvestmentPolicyCompliance> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("project_id", id);
+ ProjectInvestmentPolicyCompliance entity = baseMapper.selectOne(queryWrapper);
+ ProjectInvestmentPolicyComplianceVO vo = new ProjectInvestmentPolicyComplianceVO();
+ if (entity != null) {
+ vo = ProjectInvestmentPolicyComplianceVO.getVoByEntity(entity, null);
+ QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.eq("type",FileTypeEnum.INVEST_POLICY.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