From 8722d2bb39c6c0697647e77a879d14b28d3ef0f5 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 19:16:36 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
index fc033af..424d266 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
@@ -13,7 +13,8 @@
<result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="type" column="type" />
- <result property="transactionDate" column="transaction_date" />
+ <result property="outboundDate" column="outbound_date" />
+ <result property="inboundDate" column="inbound_date" />
<result property="optUser" column="opt_user" />
<result property="applyUser" column="apply_user" />
<result property="number" column="number" />
@@ -22,7 +23,7 @@
</resultMap>
<sql id="selectDeviceLogVo">
- select id, code, project_id, project_name, device_id, device_code, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
+ select id, code, project_id, project_name, device_id, device_code, device_name, type, outbound_date, inbound_date, opt_user, apply_user, number, create_date, remark from js_device_log
</sql>
<select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
@@ -57,7 +58,8 @@
<if test="deviceCode != null and deviceCode != ''">device_code,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="type != null and type != ''">type,</if>
- <if test="transactionDate != null and transactionDate != ''">transaction_date,</if>
+ <if test="outboundDate != null and outboundDate != ''">outbound_date,</if>
+ <if test="inboundDate != null and inboundDate != ''">inbound_date,</if>
<if test="optUser != null and optUser != ''">opt_user,</if>
<if test="applyUser != null and applyUser != ''">apply_user,</if>
<if test="number != null and number != ''">number,</if>
@@ -73,7 +75,8 @@
<if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="type != null and type != ''">#{type},</if>
- <if test="transactionDate != null and transactionDate != ''">#{transactionDate},</if>
+ <if test="outboundDate != null and outboundDate != ''">#{outboundDate},</if>
+ <if test="inboundDate != null and inboundDate != ''">#{inboundDate},</if>
<if test="optUser != null and optUser != ''">#{optUser},</if>
<if test="applyUser != null and applyUser != ''">#{applyUser},</if>
<if test="number != null and number != ''">#{number},</if>
@@ -92,7 +95,8 @@
<if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="type != null and type != ''">type = #{type},</if>
- <if test="transactionDate != null and transactionDate != ''">transaction_date = #{transactionDate},</if>
+ <if test="outboundDate != null and outboundDate != ''">outbound_date = #{outboundDate},</if>
+ <if test="inboundDate != null and inboundDate != ''">inbound_date = #{inboundDate},</if>
<if test="optUser != null and optUser != ''">opt_user = #{optUser},</if>
<if test="applyUser != null and applyUser != ''">apply_user = #{applyUser},</if>
<if test="number != null and number != ''">number = #{number},</if>
--
Gitblit v1.9.1