From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 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 bc12c84..daeda58 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
@@ -17,6 +17,11 @@
<result column="operate_time" jdbcType="TIMESTAMP" property="operateDt" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, project_name, province_id, city_id, county_id, town_id, `village_id`, project_state, remarks, `operator`,
+ operate_time, deleted
+ </sql>
<!--娣诲姞-->
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrProject">
<!--@mbg.generated-->
@@ -115,7 +120,7 @@
set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
-
+ <!--淇敼淇℃伅-->
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrProject">
update ir_project
<set>
@@ -155,7 +160,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
-
+ <!--淇敼鐘舵��-->
<update id="updateProjectState">
update ir_project
set project_state = #{projectState,jdbcType=TINYINT},
@@ -163,4 +168,65 @@
operate_time = #{operateDt,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
+ <!--鏌ヨ涓�涓俊鎭�-->
+ <select id="selectById" resultType="com.dy.pipIrrGlobal.voIr.VoProjectOne">
+ select
+ CAST(pro.id AS char)AS id,
+ 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">
+ SELECT COUNT(*) AS recordCount
+ FROM ir_project pro
+ <where>
+ pro.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+ <if test = "projectState != null and projectState != ''">
+ AND pro.project_state = #{projectState}
+ </if>
+ </where>
+ </select>
+ <!--鍒嗛〉鏌ヨ鏁版嵁-->
+ <select id="getProjects" resultType="com.dy.pipIrrGlobal.voIr.VoProject">
+ SELECT
+ CAST(pro.id AS char)AS projectId,
+ 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.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
+ LEFT JOIN ba_district country ON pro.county_id = country.id
+ LEFT JOIN ba_district town ON pro.town_id = town.id
+ LEFT JOIN ba_district village ON pro.village_id = village.id
+ <where>
+ pro.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+ <if test = "projectState != null and projectState != ''">
+ 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