diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java index 87d309eb..bcacec37 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java @@ -32,7 +32,6 @@ public class RetainedEquipmentInfo { private Integer id; @ApiModelProperty(value = "仓库信息") - @Excel(name = "仓库信息") private String whHouseName; @ApiModelProperty(value = "施工类型") @@ -67,23 +66,18 @@ public class RetainedEquipmentInfo { private BigDecimal usNum; @ApiModelProperty(value = "在修数量") - @Excel(name = "在修数量") private BigDecimal repairNum; @ApiModelProperty(value = "新购待入库") - @Excel(name = "新购待入库数量") private BigDecimal inputNum; @ApiModelProperty(value = "修试后待入库") - @Excel(name = "修试后待入库数量") private BigDecimal repairInputNum; @ApiModelProperty(value = "待报废数量") - @Excel(name = "待报废数量") private BigDecimal pendingScrapNum; @ApiModelProperty(value = "已审核报废数量") - @Excel(name = "已审核报废数量") private BigDecimal scrapNum; @ApiModelProperty(value = "总保有量") @@ -94,25 +88,22 @@ public class RetainedEquipmentInfo { private BigDecimal buyPrice; @ApiModelProperty(value = "投入总价值") - @Excel(name = "总保有量资产(万元)") + //@Excel(name = "总保有量资产(万元)") private BigDecimal totalPrice; @ApiModelProperty(value = "五年以内成新率") - @Excel(name = "五年以内成新率") private String fiveReplacementRate; @ApiModelProperty(value = "五年以内设备数量") private BigDecimal fiveReplacementNum; @ApiModelProperty(value = "五年至十年成新率") - @Excel(name = "五年至十年成新率") private String tenReplacementRate; @ApiModelProperty(value = "五年至十年设备数量") private BigDecimal tenReplacementNum; @ApiModelProperty(value = "十年以上成新率") - @Excel(name = "十年以上成新率") private String tenPlusReplacementRate; @ApiModelProperty(value = "十年以上设备数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java index 0c18b308..25c0765f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java @@ -35,7 +35,7 @@ public class StorageInfo { private BigDecimal storeNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "租赁价") private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java index 478dcf19..6f109743 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java @@ -35,7 +35,7 @@ public class UseStorageInfo { private String typeModelName; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "租赁价") private BigDecimal buyPrice; @ApiModelProperty(value = "在用数量") @@ -59,11 +59,11 @@ public class UseStorageInfo { private Date outTime; @ApiModelProperty(value = "领料单号") - @Excel(name = "领料单号") private String code; - @ApiModelProperty(value = "工程名称") - private String projectName; + @ApiModelProperty(value = "班组名称") + @Excel(name = "班组名称") + private String teamName; @ApiModelProperty(value = "关键字") private String keyWord; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 8d3d4cea..0eedbd08 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -348,7 +348,7 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { (item.getTypeModelName() != null && item.getTypeModelName().contains(keyWord)) || (item.getCreator() != null && item.getCreator().equals(keyWord)) || (item.getMaCode() != null && item.getMaCode().contains(keyWord)) || - (item.getProjectName() != null && item.getProjectName().contains(keyWord)) || + (item.getTeamName() != null && item.getTeamName().contains(keyWord)) || (item.getCode() != null && item.getCode().contains(keyWord)) ; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmTeamMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmTeamMapper.xml index 540eb9be..65374cf8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmTeamMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmTeamMapper.xml @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t.bzz_idcard as teamLeaderIdCard from bm_team t left join bm_pro_depart sd on t.depart_id = sd.id - where t.del_flag = 0 + where t.del_flag = 0 and t.status = '0' and t.depart_id = #{departId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index def86dea..a2237548 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -606,7 +606,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.lease_price AS buyPrice, sai.num AS usNum, mm.ma_code AS maCode, - bp.pro_name AS projectName, + bt.team_name AS teamName, sai.lease_id AS leaseId, sai.type_id AS typeId, lai.code AS code @@ -616,7 +616,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai.agreement_id - LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id + LEFT JOIN bm_team bt ON bai.team_id = bt.id LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id WHERE sai.end_time IS NULL diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 7c0ed5fa..b7df0a5e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -353,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_team bt ON bp.external_id = bt.project_id WHERE bp.del_flag = '0' + AND bt.del_flag = '0' AND bt.`status` = '0' AND bt.team_name = #{teamName}