From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 39be98b..4beeb90 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ycl.mapper.ProjectInfoMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProjectInfoVO">
+ <resultMap id="BaseResultMap" type="com.ycl.domain.entity.ProjectInfo">
<id column="id" property="id"/>
<result column="project_name" property="projectName" />
<result column="project_code" property="projectCode" />
@@ -15,10 +15,9 @@
<result column="project_phase" property="projectPhase" />
<result column="tag" property="tag" />
<result column="competent_department" property="competentDepartment" />
- <result column="area_code" property="areaCode" />
+ <result column="area" property="area" />
<result column="management_centralization" property="managementCentralization" />
<result column="project_approval_type" property="projectApprovalType" />
- <result column="investment_catalogue" property="investmentCatalogue" />
<result column="importance_type" property="importanceType" />
<result column="year" property="year" />
<result column="year_invest_amount" property="yearInvestAmount" />
@@ -34,16 +33,11 @@
<result column="project_owner_unit" property="projectOwnerUnit" />
<result column="project_contact_person" property="projectContactPerson" />
<result column="contact" property="contact" />
- <result column="gmt_create_time" property="gmtCreateTime" />
- <result column="gmt_update_time" property="gmtUpdateTime" />
+ <result column="gmt_create" property="gmtCreate" />
+ <result column="gmt_update" property="gmtUpdate" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
</resultMap>
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
@@ -58,10 +52,9 @@
TPI.project_phase,
TPI.tag,
TPI.competent_department,
- TPI.area_code,
+ TPI.area,
TPI.management_centralization,
TPI.project_approval_type,
- TPI.investment_catalogue,
TPI.importance_type,
TPI.year,
TPI.year_invest_amount,
@@ -77,8 +70,8 @@
TPI.project_owner_unit,
TPI.project_contact_person,
TPI.contact,
- TPI.gmt_create_time,
- TPI.gmt_update_time,
+ TPI.gmt_create,
+ TPI.gmt_update,
TPI.update_by,
TPI.create_by,
TPI.id
@@ -101,10 +94,9 @@
TPI.project_phase,
TPI.tag,
TPI.competent_department,
- TPI.area_code,
+ TPI.area,
TPI.management_centralization,
TPI.project_approval_type,
- TPI.investment_catalogue,
TPI.importance_type,
TPI.year,
TPI.year_invest_amount,
@@ -120,8 +112,8 @@
TPI.project_owner_unit,
TPI.project_contact_person,
TPI.contact,
- TPI.gmt_create_time,
- TPI.gmt_update_time,
+ TPI.gmt_create,
+ TPI.gmt_update,
TPI.update_by,
TPI.create_by,
TPI.id
--
Gitblit v1.8.0