diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java index bae14c0f..bbdd866e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java @@ -47,7 +47,7 @@ public class StorageStatus { * 规格型号 */ @ApiModelProperty(value = "规格型号") - @Excel(name = "规格名称") + @Excel(name = "规格型号") private String typeModelName; /** @@ -111,14 +111,12 @@ public class StorageStatus { * 租赁数量 */ @ApiModelProperty(value = "租赁数量") - @Excel(name = "租赁数量",cellType = Excel.ColumnType.NUMERIC) private Double outNum; /** * 归还数量 */ @ApiModelProperty(value = "归还数量") - @Excel(name = "归还数量",cellType = Excel.ColumnType.NUMERIC) private Double backNum; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml index faf8dd90..254aa23a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" baif.`code`, mm.ma_code AS maCode, bcd.back_num AS backNum, - su.nick_name AS backPerson, + baif.back_person AS backPerson, bcd.create_time AS createTime, bpl.lot_name AS proName, bui.unit_name AS unitName @@ -114,7 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id - LEFT JOIN sys_user su ON su.user_id = baif.back_person where 1 = 1 and (baif.`code` like concat('%',#{keyWord},'%') or @@ -139,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.agreement_code like concat('%',#{agreementCode},'%') + ORDER BY bcd.create_time DESC