bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
jiang 2025-12-02 10:28:16 +08:00
parent 6abbc18578
commit 5b44b833ef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java
View File

@ -73,6 +73,7 @@ public class BackCsDeviceDetails {
private Date createTime; private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime; private Date updateTime;
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")

5
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
View File

@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mdi.manage_type AS manageType, mdi.manage_type AS manageType,
mdi.code AS devCode, mdi.code AS devCode,
mdi.device_count AS useNum, mdi.device_count AS useNum,
cdc.update_time AS updateTime,
1 AS devType, 1 AS devType,
mdi.type_id AS typeId, mdi.type_id AS typeId,
mdi.ma_id AS id mdi.ma_id AS id
@ -194,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tl.manage_mode as manageType, tl.manage_mode as manageType,
IFNULL(tl.tool_code,'/') as devCode, IFNULL(tl.tool_code,'/') as devCode,
IFNULL(tl.in_num, 0) as useNum, IFNULL(tl.in_num, 0) as useNum,
cdc.update_time AS updateTime,
2 as devType, 2 as devType,
tl.type_id as typeId, tl.type_id as typeId,
tl.id as id 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 tt3 ON tt2.parent_id = tt3.type_id
LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
<where> <where>
cdc.del_flag = '0' cdc.del_flag = '0'
<if test="devType!=null and devType!=''"> <if test="devType!=null and devType!=''">
AND cdc.dev_type = #{devType} AND cdc.dev_type = #{devType}
</if> </if>
@ -240,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tl.manage_mode as manageType, tl.manage_mode as manageType,
IFNULL(tl.tool_code,'/') as devCode, IFNULL(tl.tool_code,'/') as devCode,
IFNULL(tl.in_num, 0) as useNum, IFNULL(tl.in_num, 0) as useNum,
cdc.update_time AS updateTime,
2 as devType, 2 as devType,
tl.type_id as typeId, tl.type_id as typeId,
tl.id as id tl.id as id