From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 29 十月 2024 22:07:02 +0800 Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性,都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ); 2、工作报中数据查询SQL中增加clientAddr农户地址字段。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml index b8ea9e2..a40bbe2 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml @@ -35,6 +35,10 @@ delete from pr_controller_tramp where id = #{id,jdbcType=BIGINT} </delete> + <!--娓呯┖娴佹氮鎺у埗鍣ㄨ〃--> + <delete id="emptyTrampController"> + delete from pr_controller_tramp + </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp"> <!--@mbg.generated--> insert into pr_controller_tramp (id, rtuAddr, protocol, @@ -132,13 +136,19 @@ id = #{id,jdbcType=VARCHAR} </if> <if test="rtuAddr != null and rtuAddr != ''"> - AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR} + AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR} </if> <if test="protocol != null and protocol != ''"> - AND protocol = #{protocol,jdbcType=VARCHAR} + AND protocol = #{protocol,jdbcType=VARCHAR} </if> </where> - </select> + order by id desc + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> +</select> <!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄦ暟閲�--> <select id="getTrampControllersCount" resultType="java.lang.Long"> select -- Gitblit v1.8.0