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

Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2025-09-18 17:34:50 +08:00
parent 140305f73f 9f70189db7
commit 5ecbf25188
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java
View File

@ -245,4 +245,10 @@ public class MaterialRetainedEquipmentInfo {
private String endTime;
private String unitValue;
@ApiModelProperty(value = "报告编码")
private String reportCode;
@ApiModelProperty(value = "报告路径")
private String reportUrl;
}

5
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -743,6 +743,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name AS typeModelName,
sai.ma_id AS maId,
mm.ma_code AS maCode,
mm.ex_code AS reportCode,
mm.ex_url AS reportUrl,
mm.this_check_time AS thisCheckTime,
mm.next_check_time AS nextCheckTime,
bp.imp_unit AS impUnit,
@ -807,7 +809,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.pro_name like concat('%',#{keyWord},'%') or
mt2.type_name like concat('%',#{keyWord},'%') or
mt.type_name like concat('%',#{keyWord},'%') or
mm.ma_code like concat('%',#{keyWord},'%')
mm.ma_code like concat('%',#{keyWord},'%') or
mm.ex_code like concat('%',#{keyWord},'%')
)
</if>
) AS temp -- 子查询别名