From 2d229eef4d2b3bf972e1b4e46d027acf0d080d3b Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期五, 03 十一月 2023 10:26:33 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 253 insertions(+), 40 deletions(-)
diff --git a/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml b/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml
index 66e85ae..0a29984 100644
--- a/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml
+++ b/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml
@@ -25,6 +25,23 @@
<result column="is_use" jdbcType="INTEGER" property="isUse" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="create_user" jdbcType="VARCHAR" property="createUser" />
+
+ <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+ <result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
+ <result column="date_of_production" jdbcType="TIMESTAMP" property="dateOfProduction" />
+ <result column="use_year_month" jdbcType="TIMESTAMP" property="useYearMonth" />
+ <result column="shape_size" jdbcType="VARCHAR" property="shapeSize" />
+ <result column="total_power" jdbcType="VARCHAR" property="totalPower" />
+ <result column="total_weight" jdbcType="VARCHAR" property="totalWeight" />
+ <result column="original_value" jdbcType="VARCHAR" property="originalValue" />
+ <result column="year_depreciation_rate" jdbcType="VARCHAR" property="yearDepreciationRate" />
+ <result column="accumulated_depreciation" jdbcType="VARCHAR" property="accumulatedDepreciation" />
+ <result column="net_worth" jdbcType="VARCHAR" property="netWorth" />
+ <result column="use_status" jdbcType="INTEGER" property="useStatus" />
+ <result column="is_need" jdbcType="INTEGER" property="isNeed" />
+ <result column="device_source" jdbcType="VARCHAR" property="deviceSource" />
+ <result column="device_nexus" jdbcType="VARCHAR" property="deviceNexus" />
+ <result column="fixed_person" jdbcType="VARCHAR" property="fixedPerson" />
</resultMap>
@@ -92,6 +109,54 @@
<if test="companyId != null">
company_id,
</if>
+ <if test="manufacturer != null">
+ manufacturer,
+ </if>
+ <if test="dateOfProduction != null">
+ date_of_production,
+ </if>
+ <if test="useYearMonth != null">
+ use_year_month,
+ </if>
+ <if test="shapeSize != null">
+ shape_size,
+ </if>
+ <if test="totalPower != null">
+ total_power,
+ </if>
+ <if test="totalWeight != null">
+ total_weight,
+ </if>
+ <if test="originalValue != null">
+ original_value,
+ </if>
+ <if test="yearDepreciationRate != null">
+ year_depreciation_rate,
+ </if>
+ <if test="accumulatedDepreciation != null">
+ accumulated_depreciation,
+ </if>
+ <if test="netWorth != null">
+ net_worth,
+ </if>
+ <if test="useStatus != null">
+ use_status,
+ </if>
+ <if test="isNeed != null">
+ is_need,
+ </if>
+ <if test="deviceSource != null">
+ device_source,
+ </if>
+ <if test="deviceNexus != null">
+ device_nexus,
+ </if>
+ <if test="fixedPerson != null">
+ fixed_person,
+ </if>
+ <if test="adminPhone != null">
+ admin_phone,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="bigDeviceId != null">
@@ -151,6 +216,55 @@
<if test="companyId != null">
#{companyId,jdbcType=VARCHAR},
</if>
+
+ <if test="manufacturer != null">
+ #{manufacturer,jdbcType=VARCHAR},
+ </if>
+ <if test="dateOfProduction != null">
+ #{dateOfProduction,jdbcType=TIMESTAMP},
+ </if>
+ <if test="useYearMonth != null">
+ #{useYearMonth,jdbcType=TIMESTAMP},
+ </if>
+ <if test="shapeSize != null">
+ #{shapeSize,jdbcType=VARCHAR},
+ </if>
+ <if test="totalPower != null">
+ #{totalPower},
+ </if>
+ <if test="totalWeight != null">
+ #{totalWeight,jdbcType=VARCHAR},
+ </if>
+ <if test="originalValue != null">
+ #{originalValue,jdbcType=VARCHAR},
+ </if>
+ <if test="yearDepreciationRate != null">
+ #{yearDepreciationRate,jdbcType=VARCHAR},
+ </if>
+ <if test="accumulatedDepreciation != null">
+ #{accumulatedDepreciation,jdbcType=VARCHAR},
+ </if>
+ <if test="netWorth != null">
+ #{netWorth,jdbcType=VARCHAR},
+ </if>
+ <if test="useStatus != null">
+ #{useStatus,jdbcType=INTEGER},
+ </if>
+ <if test="isNeed != null">
+ #{isNeed,jdbcType=INTEGER},
+ </if>
+ <if test="deviceSource != null">
+ #{deviceSource,jdbcType=VARCHAR},
+ </if>
+ <if test="deviceNexus != null">
+ #{deviceNexus,jdbcType=VARCHAR},
+ </if>
+ <if test="fixedPerson != null">
+ #{fixedPerson,jdbcType=VARCHAR},
+ </if>
+ <if test="adminPhone != null">
+ #{adminPhone,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<insert id="picturesInsert" >
@@ -185,26 +299,57 @@
</trim>
</insert>
<select id="bigDeviceList" resultType="com.thhy.engineering.modules.biz.device.entity.TBigDevice">
- SELECT
- tbd.big_device_id AS bigDeviceId,
- tbd.big_device_Name AS bigDeviceName,
- tbd.big_device_model AS bigDeviceModel,
- tbd.big_number AS bigNumber,
- sd.dict_name AS bigTypeName,
- tbd.big_position AS bigPosition,
- tbd.big_state AS bigState,
- spu.real_name AS realName,
- ss.supplier_name AS supplierName,
- tbd.key_cabinet AS keyCabinet,
- tbd.use_life AS useLife
-FROM
- t_big_device tbd
- LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id
- LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id
- LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id
- where tbd.is_use=1
+ SELECT
+ tbd.big_device_id AS bigDeviceId,
+ tbd.big_device_Name AS bigDeviceName,
+ tbd.big_device_model AS bigDeviceModel,
+ tbd.big_number AS bigNumber,
+ sd.dict_name AS bigTypeName,
+ tbd.big_position AS bigPosition,
+ tbd.big_state AS bigState,
+ spu.real_name AS realName,
+ ss.supplier_name AS supplierName,
+ tbd.key_cabinet AS keyCabinet,
+ tbd.use_life AS useLife,
+ tbd.purchase_time as purchaseTime,
+ tbd.use_life as useLife,
+ tbd.big_type as bigType,
+ tbd.key_cabinet as keyCabinet,
+ tbd.big_notes AS bigNotes,
+ tbd.safety_code AS safetyCode,
+ tbd.is_certificate AS isCertificate,
+ tbd.create_time AS createTime,
+ tbd.manufacturer AS manufacturer,
+ tbd.date_of_production AS dateOfProduction,
+ tbd.use_year_month AS useYearMonth,
+ tbd.shape_size AS shapeSize,
+ tbd.total_power AS totalPower,
+ tbd.total_weight AS totalWeight,
+ tbd.original_value AS originalValue,
+ tbd.year_depreciation_rate AS yearDepreciationRate,
+ tbd.accumulated_depreciation AS accumulatedDepreciation,
+ tbd.net_worth AS netWorth,
+ tbd.use_status AS useStatus,
+ tbd.is_need AS isNeed,
+ tbd.device_source AS deviceSource,
+ tbd.device_nexus AS deviceNexus,
+ spu.real_name AS realName,
+ spu.phone AS zrrPhone,
+ tbd.fixed_person AS fixedPerson,
+ su.real_name AS adminRealName,
+ tbd.admin_phone AS adminPhone
+ FROM
+ t_big_device tbd
+ LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id
+ LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id
+ LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id
+ LEFT JOIN sys_users su ON su.user_id = tbd.create_user
+ where tbd.is_use=1
<if test="bigDeviceName!=null and bigDeviceName!='' ">
and tbd.big_device_Name like concat('%',#{bigDeviceName},'%')
+ </if>
+ <if test="bigNumber!=null and bigNumber!='' ">
+ and tbd.big_number like concat('%',#{bigNumber},'%')
</if>
<if test="supplierId!=null and supplierId!='' ">
and tbd.supplier_id=#{supplierId}
@@ -231,29 +376,48 @@
<select id="bigDeviceInfo" parameterType="java.lang.String" resultType="com.thhy.engineering.modules.biz.device.entity.TBigDevice">
SELECT
- tbd.big_device_id AS bigDeviceId,
- tbd.big_device_Name AS bigDeviceName,
- tbd.big_device_model AS bigDeviceModel,
- tbd.big_number AS bigNumber,
- sd.dict_name AS bigTypeName,
- tbd.big_position AS bigPosition,
- tbd.big_state AS bigState,
- spu.real_name AS realName,
- ss.supplier_name AS supplierName,
- tbd.key_cabinet AS keyCabinet,
- tbd.use_life AS useLife,
- tbd.big_type as bigType,
- tbd.supplier_id as supplierId,
- tbd.purchase_time as purchaseTime,
- tbd.big_notes as bigNotes,
- tbd.user_id as userId,
- tbd.safety_code as safetyCode,
- tbd.is_certificate as isCertificate
+ tbd.big_device_id AS bigDeviceId,
+ tbd.big_device_Name AS bigDeviceName,
+ tbd.big_device_model AS bigDeviceModel,
+ tbd.big_number AS bigNumber,
+ sd.dict_name AS bigTypeName,
+ tbd.big_position AS bigPosition,
+ tbd.big_state AS bigState,
+ spu.real_name AS realName,
+ spu.phone AS zrrPhone,
+ ss.supplier_name AS supplierName,
+ tbd.key_cabinet AS keyCabinet,
+ tbd.use_life AS useLife,
+ tbd.big_type as bigType,
+ tbd.supplier_id as supplierId,
+ tbd.purchase_time as purchaseTime,
+ tbd.big_notes as bigNotes,
+ tbd.user_id as userId,
+ tbd.safety_code as safetyCode,
+ tbd.is_certificate as isCertificate,
+ tbd.manufacturer AS manufacturer,
+ tbd.date_of_production AS dateOfProduction,
+ tbd.use_year_month AS useYearMonth,
+ tbd.shape_size AS shapeSize,
+ tbd.total_power AS totalPower,
+ tbd.total_weight AS totalWeight,
+ tbd.original_value AS originalValue,
+ tbd.year_depreciation_rate AS yearDepreciationRate,
+ tbd.accumulated_depreciation AS accumulatedDepreciation,
+ tbd.net_worth AS netWorth,
+ tbd.use_status AS useStatus,
+ tbd.is_need AS isNeed,
+ tbd.device_source AS deviceSource,
+ tbd.device_nexus AS deviceNexus,
+ tbd.fixed_person AS fixedPerson,
+ su.real_name AS adminRealName,
+ tbd.admin_phone AS adminPhone
FROM
- t_big_device tbd
- LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id
- LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id
- LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id
+ t_big_device tbd
+ LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id
+ LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id
+ LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id
+ LEFT JOIN sys_users su ON su.user_id = tbd.create_user
where tbd.is_use=1
and tbd.big_device_id=#{bigDeviceId}
</select>
@@ -329,6 +493,55 @@
<if test="createUser != null">
create_user = #{createUser,jdbcType=VARCHAR},
</if>
+
+ <if test="manufacturer != null">
+ manufacturer = #{manufacturer,jdbcType=VARCHAR},
+ </if>
+ <if test="dateOfProduction != null">
+ date_of_production = #{dateOfProduction,jdbcType=TIMESTAMP},
+ </if>
+ <if test="useYearMonth != null">
+ use_year_month = #{useYearMonth,jdbcType=TIMESTAMP},
+ </if>
+ <if test="shapeSize != null">
+ shape_size = #{shapeSize,jdbcType=VARCHAR},
+ </if>
+ <if test="totalPower != null">
+ total_power = #{totalPower},
+ </if>
+ <if test="totalWeight != null">
+ total_weight = #{totalWeight,jdbcType=VARCHAR},
+ </if>
+ <if test="originalValue != null">
+ original_value = #{originalValue,jdbcType=VARCHAR},
+ </if>
+ <if test="yearDepreciationRate != null">
+ year_depreciation_rate = #{yearDepreciationRate,jdbcType=VARCHAR},
+ </if>
+ <if test="accumulatedDepreciation != null">
+ accumulated_depreciation = #{accumulatedDepreciation,jdbcType=VARCHAR},
+ </if>
+ <if test="netWorth != null">
+ net_worth = #{netWorth,jdbcType=VARCHAR},
+ </if>
+ <if test="useStatus != null">
+ use_status = #{useStatus,jdbcType=INTEGER},
+ </if>
+ <if test="isNeed != null">
+ is_need = #{isNeed,jdbcType=INTEGER},
+ </if>
+ <if test="deviceSource != null">
+ device_source = #{deviceSource,jdbcType=VARCHAR},
+ </if>
+ <if test="deviceNexus != null">
+ device_nexus = #{deviceNexus,jdbcType=VARCHAR},
+ </if>
+ <if test="fixedPerson != null">
+ fixed_person = #{fixedPerson,jdbcType=VARCHAR},
+ </if>
+ <if test="adminPhone != null">
+ admin_phone = #{adminPhone,jdbcType=VARCHAR},
+ </if>
</set>
where big_device_id = #{bigDeviceId,jdbcType=VARCHAR}
</update>
--
Gitblit v1.9.3