From f38434cc0ed46496b875ebe997d4907addade6a7 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 二月 2025 15:57:40 +0800 Subject: [PATCH] 翻译业主单位 --- business/src/main/resources/mapper/ProjectInfoMapper.xml | 4 ++-- business/src/main/resources/mapper/ProjectProcessMapper.xml | 4 +++- business/src/main/java/com/ycl/domain/vo/ProjectVO.java | 2 +- business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java index b38f0b9..25d3d3c 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java @@ -170,7 +170,7 @@ private ProjectUnitRegistrationInfoVO projectUnitRegistrationInfo; private ProjectInvestmentPolicyComplianceVO projectInvestmentPolicyCompliance; private Boolean auditRole; - + private String projectOwnerUnitName; public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) { if(vo == null) { vo = new ProjectInfoVO(); diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectVO.java index a1c210f..53f134a 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectVO.java @@ -16,7 +16,7 @@ private List<String> managementCentralizationList; private String remark; private Long processId; - + private String projectOwnerUnitName; /** 鏄惁鑳藉鏍� */ private boolean auditRole; } diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index 468764e..02890f4 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -96,7 +96,7 @@ TPURI.contact_address as TPURI_contact_address, TPURI.post_code as TPURI_post_code, TPURI.email as TPURI_email, - TPI.coding + TPI.coding,d.dept_name as project_owner_unit_name FROM t_project_info TPI LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0 @@ -104,7 +104,7 @@ LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0 LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0 LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0 --- LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit + LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit <where> TPI.deleted = 0 <if test="query.projectName !=null and query.projectName!=''"> diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml index 6aded0e..b2d5fb5 100644 --- a/business/src/main/resources/mapper/ProjectProcessMapper.xml +++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml @@ -31,6 +31,7 @@ <result column="longitude" property="longitude" /> <result column="latitude" property="latitude" /> <result column="project_owner_unit" property="projectOwnerUnit" /> + <result column="project_owner_unit_name" property="projectOwnerUnitName" /> <result column="project_contact_person" property="projectContactPerson" /> <result column="contact" property="contact" /> <result column="gmt_create_time" property="gmtCreateTime" /> @@ -61,7 +62,8 @@ SELECT PI.*, TPP.process_def_id, - TPP.process_ins_id + TPP.process_ins_id, + d.dept_name as project_owner_unit_name FROM t_project_info PI LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 -- Gitblit v1.8.0