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

Merge branch 'master' of http://192.168.0.56:3000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2024-12-24 13:33:17 +08:00
parent bc7c4f57fd 062de4984b
commit 3736bff1de
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
View File

@ -25,13 +25,13 @@ public class MachineVo extends Machine {
private String materialModel; private String materialModel;
@ApiModelProperty("库管员id") @ApiModelProperty("库管员id")
private Long keeperId; private String keeperId;
@ApiModelProperty("库管员名称") @ApiModelProperty("库管员名称")
private String keeperName; private String keeperName;
@ApiModelProperty("维修员id") @ApiModelProperty("维修员id")
private Long repairId; private String repairId;
@ApiModelProperty("维修员名称") @ApiModelProperty("维修员名称")
private String repairName; private String repairName;

6
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -158,8 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ma.inspect_man as inspectMan, ma.inspect_man as inspectMan,
ma.inspect_status as inspectStatus, ma.inspect_status as inspectStatus,
ma.phone as phone, ma.phone as phone,
GROUP_CONCAT( DISTINCT su1.nick_name ORDER BY su1.nick_name SEPARATOR ', ' ) AS keeperName, GROUP_CONCAT( DISTINCT su1.user_id ORDER BY su1.user_id SEPARATOR ', ' ) AS keeperId,
GROUP_CONCAT( DISTINCT su2.nick_name ORDER BY su2.nick_name SEPARATOR ', ' ) AS repairName, GROUP_CONCAT( DISTINCT su1.nick_name ORDER BY su1.user_id SEPARATOR ', ' ) AS keeperName,
GROUP_CONCAT( DISTINCT su2.user_id ORDER BY su2.user_id SEPARATOR ', ' ) AS repairId,
GROUP_CONCAT( DISTINCT su2.nick_name ORDER BY su2.user_id SEPARATOR ', ' ) AS repairName,
baa.asset_name as assetName, baa.asset_name as assetName,
ma.assets_id as assetsId, ma.assets_id as assetsId,
ma.remark as remark ma.remark as remark