From 5d2cfd4562f74496a5263db3451c1e78ff53aead Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 27 三月 2025 08:44:16 +0800
Subject: [PATCH] 单据增加查询返回字段

---
 assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java
index 62fb995..32d3922 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java
@@ -10,6 +10,8 @@
 import com.gkhy.assess.common.utils.StringUtils;
 import com.gkhy.assess.system.domain.AssPlanPerson;
 import com.gkhy.assess.system.domain.AssProject;
+import com.gkhy.assess.system.domain.SysAgency;
+import com.gkhy.assess.system.domain.vo.AssProjectVo;
 import com.gkhy.assess.system.domain.vo.PersonRecognitionVO;
 import com.gkhy.assess.system.domain.vo.ProjectStaticVO;
 import com.gkhy.assess.system.enums.ProgressPhaseEnum;
@@ -19,8 +21,10 @@
 import com.gkhy.assess.system.mapper.AssProjectMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gkhy.assess.system.domain.SysUser;
+import com.gkhy.assess.system.mapper.SysAgencyMapper;
 import com.gkhy.assess.system.service.AssProjectService;
 import com.gkhy.assess.system.utils.ShiroUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +46,8 @@
 public class AssProjectServiceImpl extends ServiceImpl<AssProjectMapper, AssProject> implements AssProjectService {
     @Autowired
     private AssPlanPersonMapper planPersonMapper;
+    @Autowired
+    private SysAgencyMapper agencyMapper;
 
     @Override
     public CommonPage projectList(AssProject project) {
@@ -80,8 +86,21 @@
     }
 
     @Override
-    public AssProject getProjectById(Long projectId) {
-        return baseMapper.getProjectById(projectId);
+    public AssProjectVo getProjectById(Long projectId) {
+        AssProject projectById = baseMapper.getProjectById(projectId);
+
+        if(projectById!=null){
+            AssProjectVo projectVo = new AssProjectVo();
+            BeanUtils.copyProperties(projectById, projectVo);
+            Long agencyId = projectVo.getAgencyId();
+            if (agencyId != null) {
+                SysAgency agency = agencyMapper.getAgencyById(agencyId);
+                projectVo.setAgency(agency);
+            }
+
+            return projectVo;
+        }
+        return null;
     }
 
     @Override

--
Gitblit v1.9.2