From dd15f7f00e9eda3b15bd956ff830ccbe78752a4f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 20 五月 2024 17:11:07 +0800
Subject: [PATCH] 田间灌溉项目管理 项目模块 解决分页问题、增加创建时间字段、解决地址ID不一致问题               灌溉单元模块 创建Ctrl SV mapper 实体类

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
index d451fd2..3fbb007 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
@@ -169,8 +169,22 @@
         where id = #{id,jdbcType=BIGINT}
     </update>
     <!--鏌ヨ涓�涓俊鎭�-->
-    <select id="selectById" resultMap="BaseResultMap">
-        select     <include refid="Base_Column_List" /> from ir_project where id = #{id,jdbcType=BIGINT} and deleted = 0
+    <select id="selectById" resultType="com.dy.pipIrrGlobal.voIr.VoProjectOne">
+        select
+        CAST(pro.id AS char)AS projectId,
+        CAST(pro.province_id AS char)AS provinceId,
+        CAST(pro.city_id AS char)AS cityId,
+        CAST(pro.county_id AS char)AS countyId,
+        CAST(pro.town_id AS char)AS townId,
+        CAST(pro.village_id AS char)AS villageId,
+        pro.project_name  AS  projectName,
+        pro.project_state  AS  projectState,
+        cli.name         AS operatorName,
+        pro.remarks,
+        pro.operate_time  AS  operateDt
+        from ir_project pro
+        left join se_client cli on cli.id = pro.operator
+        where pro.id = #{id,jdbcType=BIGINT} and pro.deleted = 0
     </select>
     <!--鍒嗛〉鏌ヨ鏁伴噺-->
     <select id="getRecordCount" resultType="java.lang.Long">
@@ -193,7 +207,8 @@
         pro.project_name  AS  projectName,
         pro.project_state  AS  projectState,
         CONCAT(province.`name`,city.`name`,country.`name`, town.`name`, village.`name`) AS address,
-        pro.remarks
+        pro.remarks,
+        pro.operate_time  AS  operateDt
         FROM ir_project pro
         LEFT JOIN ba_district province ON pro.province_id = province.id
         LEFT JOIN ba_district city ON pro.city_id = city.id
@@ -209,5 +224,9 @@
                 AND pro.project_state = #{projectState}
             </if>
         </where>
+        ORDER BY pro.operate_time DESC
+        <if test="pageCurr != null and pageSize != null">
+            LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0