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/IrIrrigateUnitMapper.xml | 185 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 175 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
index a23be44..600d56d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoIr.IrIrrigateUnitMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoIr.IrProject">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoIr.IrIrrigateUnit">
<!--@mbg.generated-->
- <!--@Table ir_project-->
+ <!--@Table ir_irrigate_unit-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="project_name" jdbcType="VARCHAR" property="projectName" />
- <result column="province_id" jdbcType="BIGINT" property="provinceId" />
- <result column="city_id" jdbcType="BIGINT" property="cityId" />
- <result column="county_id" jdbcType="BIGINT" property="countyId" />
- <result column="town_id" jdbcType="BIGINT" property="townId" />
- <result column="village_id" jdbcType="BIGINT" property="villageId" />
- <result column="project_state" jdbcType="TINYINT" property="projectState" />
+ <result column="project_id" jdbcType="BIGINT" property="projectId" />
+ <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
+ <result column="area" jdbcType="FLOAT" property="area" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operate_time" jdbcType="TIMESTAMP" property="operateDt" />
@@ -19,7 +15,176 @@
</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`,
+ id, project_id,intake_id, area, remarks, `operator`,
operate_time, deleted
</sql>
+
+ <!--娣诲姞-->
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrIrrigateUnit">
+ <!--@mbg.generated-->
+ insert into ir_irrigate_unit
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="projectId != null">
+ project_id,
+ </if>
+ <if test="intakeId != null">
+ intake_id,
+ </if>
+ <if test="area != null">
+ area,
+ </if>
+ <if test="remarks != null">
+ remarks,
+ </if>
+ <if test="operator != null">
+ `operator`,
+ </if>
+ <if test="operateDt != null">
+ operate_time,
+ </if>
+ <if test="deleted != null">
+ deleted,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="projectId != null">
+ #{projectId,jdbcType=BIGINT},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="area != null">
+ #{area,jdbcType=FLOAT},
+ </if>
+ <if test="remarks != null">
+ #{remarks,jdbcType=VARCHAR},
+ </if>
+ <if test="operator != null">
+ #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="deleted != null">
+ #{deleted,jdbcType=TINYINT},
+ </if>
+ </trim>
+ </insert>
+
+ <!--閫昏緫鍒犻櫎-->
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ update ir_irrigate_unit
+ set deleted = 1
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <!--淇敼涓�涓亴婧夊崟鍏�-->
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrIrrigateUnit">
+ update ir_irrigate_unit
+ <set>
+ <if test="projectId != null">
+ project_id = #{projectId,jdbcType=BIGINT},
+ </if>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="area != null">
+ area = #{area,jdbcType=FLOAT},
+ </if>
+ <if test="remarks != null">
+ remarks = #{remarks,jdbcType=VARCHAR},
+ </if>
+ <if test="operator != null">
+ operator = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ operate_time = #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <!--鏌ヤ竴涓亴婧夊崟鍏�-->
+ <select id="selectById" resultType="com.dy.pipIrrGlobal.voIr.VoUnitOne">
+ select
+ CAST(pro.id AS char)AS projectId,
+ pro.project_name AS projectName,
+ CAST(intake.id AS char)AS intakeId,
+ intake.name AS intakeName,
+ CAST(uni.id AS char)AS id,
+ CAST(uni.operator AS char)AS operator,
+ cli.name AS operatorName,
+ gru.group_code AS groupCode,
+ uni.area,
+ uni.remarks,
+ uni.operate_time AS operateDt
+ from ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
+ left join ir_project pro on pro.id = uni.project_id
+ left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
+ where uni.id = #{id,jdbcType=BIGINT} and uni.deleted = 0
+ </select>
+ <!--鍒嗛〉鏌ョ亴婧夊崟鍏�-->
+ <select id="getUnits" resultType="com.dy.pipIrrGlobal.voIr.VoUnit">
+ SELECT
+ CAST(pro.id AS char)AS projectId,
+ pro.project_name AS projectName,
+ CAST(intake.id AS char)AS intakeId,
+ intake.name AS intakeName,
+ CAST(uni.id AS char)AS unitId,
+ CAST(uni.operator AS char)AS operator,
+ cli.name AS operatorName,
+ gru.group_code AS groupCode,
+ uni.area,
+ uni.remarks,
+ uni.operate_time AS operateDt
+ FROM ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
+ left join ir_project pro on pro.id = uni.project_id
+ left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
+ <where>
+ uni.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+ <if test = "groupCode != null and groupCode != ''">
+ AND gru.group_code = #{groupCode}
+ </if>
+ </where>
+ ORDER BY uni.operate_time DESC
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+ </if>
+ </select>
+ <!--鍒嗛〉鏌ョ亴婧夊崟鍏冭褰曟暟-->
+ <select id="getRecordCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
+ left join ir_project pro on pro.id = uni.project_id
+ left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
+ <where>
+ uni.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+ <if test = "groupCode != null and groupCode != ''">
+ AND gru.group_code = #{groupCode}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0