From 15e0cd26d651510fde1aea51cd536b7ea2f377e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 11:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java
index 13893b9..0b5678b 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.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.ProjectInvestmentInfo;
 import com.ycl.domain.entity.ProjectUnitRegistrationInfo;
+import com.ycl.domain.vo.ProjectInvestmentInfoVO;
 import com.ycl.mapper.ProjectUnitRegistrationInfoMapper;
 import com.ycl.service.ProjectUnitRegistrationInfoService;
 import com.ycl.common.base.Result;
@@ -32,18 +36,25 @@
 
     /**
      * 娣诲姞
+     *
      * @param form
      * @return
      */
     @Override
     public Result add(ProjectUnitRegistrationInfoForm form) {
         ProjectUnitRegistrationInfo entity = ProjectUnitRegistrationInfoForm.getEntityByForm(form, null);
+        Long userId = SecurityUtils.getUserId();
+        entity.setCreateBy(userId);
+        entity.setUpdateBy(userId);
+
         baseMapper.insert(entity);
-        return Result.ok("娣诲姞鎴愬姛");
+        //閬垮厤鏂板涓�涓悗閲嶅鏂板杩斿洖id缁欏墠绔垽鏂�
+        return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
     }
 
     /**
      * 淇敼
+     *
      * @param form
      * @return
      */
@@ -54,12 +65,15 @@
         // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
         Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
         BeanUtils.copyProperties(form, entity);
+        Long userId = SecurityUtils.getUserId();
+        entity.setUpdateBy(userId);
         baseMapper.updateById(entity);
         return Result.ok("淇敼鎴愬姛");
     }
 
     /**
      * 鎵归噺鍒犻櫎
+     *
      * @param ids
      * @return
      */
@@ -71,6 +85,7 @@
 
     /**
      * id鍒犻櫎
+     *
      * @param id
      * @return
      */
@@ -82,6 +97,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param query
      * @return
      */
@@ -94,18 +110,25 @@
 
     /**
      * 鏍规嵁id鏌ユ壘
+     *
      * @param id
      * @return
      */
     @Override
     public Result detail(Integer id) {
-        ProjectUnitRegistrationInfoVO vo = baseMapper.getById(id);
-        Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+        QueryWrapper<ProjectUnitRegistrationInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", id);
+        ProjectUnitRegistrationInfo entity = baseMapper.selectOne(queryWrapper);
+        ProjectUnitRegistrationInfoVO vo = new ProjectUnitRegistrationInfoVO();
+        if (entity != null) {
+            vo = ProjectUnitRegistrationInfoVO.getVoByEntity(entity, null);
+        }
         return Result.ok().data(vo);
     }
 
     /**
      * 鍒楄〃
+     *
      * @return
      */
     @Override

--
Gitblit v1.8.0