diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java index a6cca388..d0bb2e2d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java @@ -5,12 +5,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Set; /** * @description 综合查询--保有设备总量查询 @@ -43,15 +43,15 @@ public class MaterialRetainedEquipmentInfo { private String impUnitName; @ApiModelProperty(value = "项目部") - @Excel(name = "项目部") + @Excel(name = "项目部", width = 25) private String departName; @ApiModelProperty(value = "工程名称") - @Excel(name = "工程名称") + @Excel(name = "工程名称", width = 40) private String proName; @ApiModelProperty(value = "分包单位") - @Excel(name = "分包单位") + @Excel(name = "分包单位", width = 25) private String subUnitName; @ApiModelProperty(value = "班组名称") @@ -80,7 +80,7 @@ public class MaterialRetainedEquipmentInfo { private BigDecimal usNum; @ApiModelProperty(value = "数量") - @Excel(name = "数量") + @Excel(name = "数量",align = HorizontalAlignment.RIGHT) private BigDecimal allNum; @ApiModelProperty(value = "购置单价") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index f8ae8666..a3f9e526 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -1295,7 +1295,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" '编码' ELSE '数量' - END manageType + END manageType, + '站内库存' AS teamName, + '/' AS subUnitName FROM ma_type mt LEFT JOIN ( SELECT