From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
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..daeda58 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 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">
@@ -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