From 5b44b833ef538b229ba3f71e9dfc789038ea931b Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 2 Dec 2025 10:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/back/domain/BackCsDeviceDetails.java | 1 + .../main/resources/mapper/material/back/BackChangeMapper.xml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java index f903a42..67fae1d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java @@ -73,6 +73,7 @@ public class BackCsDeviceDetails { private Date createTime; @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date updateTime; @ApiModelProperty(value = "创建人") diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml index 7b26401..7ece2a0 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml @@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.manage_type AS manageType, mdi.code AS devCode, mdi.device_count AS useNum, + cdc.update_time AS updateTime, 1 AS devType, mdi.type_id AS typeId, mdi.ma_id AS id @@ -194,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tl.manage_mode as manageType, IFNULL(tl.tool_code,'/') as devCode, IFNULL(tl.in_num, 0) as useNum, + cdc.update_time AS updateTime, 2 as devType, tl.type_id as typeId, tl.id as id @@ -206,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN tool_type tt3 ON tt2.parent_id = tt3.type_id LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id - cdc.del_flag = '0' + cdc.del_flag = '0' AND cdc.dev_type = #{devType} @@ -240,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tl.manage_mode as manageType, IFNULL(tl.tool_code,'/') as devCode, IFNULL(tl.in_num, 0) as useNum, + cdc.update_time AS updateTime, 2 as devType, tl.type_id as typeId, tl.id as id