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/ProjectInvestmentFundingServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
index d77109b..ff2a93b 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
@@ -1,7 +1,11 @@
package com.ycl.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectInvestmentFunding;
+import com.ycl.domain.entity.ProjectInvestmentInfo;
+import com.ycl.domain.vo.ProjectInvestmentInfoVO;
import com.ycl.mapper.ProjectInvestmentFundingMapper;
import com.ycl.service.ProjectInvestmentFundingService;
import com.ycl.common.base.Result;
@@ -38,8 +42,11 @@
@Override
public Result add(ProjectInvestmentFundingForm form) {
ProjectInvestmentFunding entity = ProjectInvestmentFundingForm.getEntityByForm(form, null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
baseMapper.insert(entity);
- return Result.ok("娣诲姞鎴愬姛");
+ return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
/**
@@ -54,6 +61,8 @@
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -99,8 +108,11 @@
*/
@Override
public Result detail(Integer id) {
- ProjectInvestmentFundingVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ QueryWrapper<ProjectInvestmentFunding> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("project_id",id);
+ ProjectInvestmentFunding entity = baseMapper.selectOne(queryWrapper);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInvestmentFundingVO vo = ProjectInvestmentFundingVO.getVoByEntity(entity, null);
return Result.ok().data(vo);
}
--
Gitblit v1.8.0