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/domain/vo/AssProjectVo.java | 15 +++++++++++++++
assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java | 23 +++++++++++++++++++++--
assess-system/src/main/java/com/gkhy/assess/system/service/AssProjectService.java | 3 ++-
assess-system/src/main/resources/mapper/AssProjectMapper.xml | 3 ++-
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/vo/AssProjectVo.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/vo/AssProjectVo.java
new file mode 100644
index 0000000..7c8ebb6
--- /dev/null
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/vo/AssProjectVo.java
@@ -0,0 +1,15 @@
+package com.gkhy.assess.system.domain.vo;
+
+import com.gkhy.assess.system.domain.AssProject;
+import com.gkhy.assess.system.domain.SysAgency;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AssProject对象详情", description = "AssProject对象详情")
+public class AssProjectVo extends AssProject {
+
+ @ApiModelProperty(value = "机构信息")
+ private SysAgency agency;
+}
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/AssProjectService.java b/assess-system/src/main/java/com/gkhy/assess/system/service/AssProjectService.java
index b8116e4..ce14cf6 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/AssProjectService.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/AssProjectService.java
@@ -3,6 +3,7 @@
import com.gkhy.assess.common.api.CommonPage;
import com.gkhy.assess.system.domain.AssProject;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.assess.system.domain.vo.AssProjectVo;
import com.gkhy.assess.system.domain.vo.ProjectStaticVO;
import com.gkhy.assess.system.enums.ReportProgressEnum;
@@ -28,7 +29,7 @@
* @param projectId
* @return
*/
- AssProject getProjectById(Long projectId);
+ AssProjectVo getProjectById(Long projectId);
/**
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
diff --git a/assess-system/src/main/resources/mapper/AssProjectMapper.xml b/assess-system/src/main/resources/mapper/AssProjectMapper.xml
index 4d286f8..4e9126c 100644
--- a/assess-system/src/main/resources/mapper/AssProjectMapper.xml
+++ b/assess-system/src/main/resources/mapper/AssProjectMapper.xml
@@ -43,6 +43,7 @@
<resultMap id="userResult" type="com.gkhy.assess.system.domain.SysUser">
<id property="id" column="leader_id" />
<result property="name" column="leader_name" />
+ <result property="phone" column="link_phone" />
</resultMap>
<resultMap id="contractResult" type="com.gkhy.assess.system.domain.AssContract">
@@ -55,7 +56,7 @@
select distinct p.id,p.name, p.code,p.client,p.province,p.city,p.district,p.business,p.invest,p.address,p.agency_id,
p.actual_location,p.location,p.estimate_type,p.filing_date,
p.credit_code,p.report_progress,p.phase,p.state,p.introduction,p.is_review,p.del_flag,p.create_by,p.create_time,
- p.update_by,p.update_time,p.remark,d1.label as business_name,d2.label as estimate_type_name,e.leader_id,u.name as leader_name,
+ p.update_by,p.update_time,p.remark,d1.label as business_name,d2.label as estimate_type_name,e.leader_id,u.name as leader_name,e.link_phone,
c.id as contract_id,c.contract_money,c.actual_contract_money,a.name as agency_name,
(select count(*) from ass_project_material m where m.project_id=p.id and m.file_id is not null) as material_cnt
from ass_project p
--
Gitblit v1.9.2