From 1b9936ba920d65df09ab8dba79c6252568ee26e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 12:16:02 +0800
Subject: [PATCH] 任务统计bug

---
 business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 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..7720701 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,12 @@
 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.conditions.query.LambdaQueryChainWrapper;
+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 +37,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 +66,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 +86,7 @@
 
     /**
      * id鍒犻櫎
+     *
      * @param id
      * @return
      */
@@ -82,6 +98,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param query
      * @return
      */
@@ -94,18 +111,25 @@
 
     /**
      * 鏍规嵁id鏌ユ壘
+     *
      * @param id
      * @return
      */
     @Override
     public Result detail(Integer id) {
-        ProjectUnitRegistrationInfoVO vo = baseMapper.getById(id);
-        Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+        ProjectUnitRegistrationInfo entity = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(ProjectUnitRegistrationInfo::getProjectId, id)
+                .one();
+        ProjectUnitRegistrationInfoVO vo = new ProjectUnitRegistrationInfoVO();
+        if (entity != null) {
+            vo = ProjectUnitRegistrationInfoVO.getVoByEntity(entity, null);
+        }
         return Result.ok().data(vo);
     }
 
     /**
      * 鍒楄〃
+     *
      * @return
      */
     @Override
@@ -116,4 +140,12 @@
                 .collect(Collectors.toList());
         return Result.ok().data(vos);
     }
+
+    @Override
+    public Result getUnitRegistrationInfoByName(String name) {
+        List<ProjectUnitRegistrationInfo> entity = new LambdaQueryChainWrapper<>(baseMapper)
+                .like(ProjectUnitRegistrationInfo::getProjectUnit,name)
+                .list();
+        return Result.ok().data(entity);
+    }
 }

--
Gitblit v1.8.0