From 2a76c275227b53ae1912608a7858fdd10bc9af1a Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 11 Nov 2025 16:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 2 +- .../basic/domain/ProjUsingRecordExport.java | 19 ++++++++++--------- .../lease/mapper/LeaseApplyInfoMapper.java | 7 +++++++ .../impl/LeaseApplyInfoServiceImpl.java | 7 +++++++ .../material/ma/domain/MaTypeHistory.java | 5 +++-- .../bonus/material/ma/domain/PartType.java | 2 +- .../material/part/domain/PartInventory.java | 2 +- .../part/domain/PartTypeCheckInfo.java | 9 +++++---- .../material/push/domain/IwsCostPushBean.java | 3 ++- .../material/repair/domain/PartDetails.java | 9 ++++----- .../repair/domain/vo/RepairProjectInfo.java | 3 ++- .../material/lease/LeaseApplyInfoMapper.xml | 15 +++++++++++++++ .../mapper/material/ma/TypeMapper.xml | 6 ++++-- 13 files changed, 62 insertions(+), 27 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 2fb83851..47db4a3d 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -94,7 +94,7 @@ public class LeaseApplyInfo extends BaseEntity{ /** 任务编号: 业务联系单号 */ @ApiModelProperty(value = "业务联系单号") - @Excel(name = "业务联系单号") + //@Excel(name = "业务联系单号") private String businessCode; /** 任务ID */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java index a1f39ed4..e144b6a7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.io.Serializable; import java.math.BigDecimal; @@ -69,39 +70,39 @@ public class ProjUsingRecordExport implements Serializable { private BigDecimal backNum; @ApiModelProperty(value = "需求数量") - @Excel(name = "需求数量") + @Excel(name = "需求数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private String needNum; @ApiModelProperty(value = "已供数量") - @Excel(name = "已供数量") + @Excel(name = "已供数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private String supplyNum; @ApiModelProperty(value = "差值") - @Excel(name = "差值") + @Excel(name = "差值", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private String diffNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量") + @Excel(name = "在用数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal usNum; @ApiModelProperty(value = "在库数量") - @Excel(name = "库存数量") + @Excel(name = "库存数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal storeNum; @ApiModelProperty(value = "在修数量") - @Excel(name = "在修数量") + @Excel(name = "在修数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal repairNum; @ApiModelProperty(value = "待入库数量") - @Excel(name = "待入库数量") + @Excel(name = "待入库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal inputNum; @ApiModelProperty(value = "总保有量") - @Excel(name = "总保有量") + @Excel(name = "总保有量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal allNum; @ApiModelProperty(value = "总在用数量") - @Excel(name = "总在用工程明细") + @Excel(name = "总在用工程明细", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal allUsNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index 734fac6c..d5425cb5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -312,4 +312,11 @@ public interface LeaseApplyInfoMapper { * @return */ BigDecimal getInCountNum(LeaseApplyInfo leaseApplyInfo); + + /** + * 获取领用该批次的签名数据 + * @param applyInfo + * @return + */ + List selectPublishSignList(LeaseApplyInfo applyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 9a075f2f..0b92cc1e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -844,6 +844,13 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { list.addAll(leaseApplyOutList); } for (LeaseApplyInfo applyInfo : list) { + if (StringUtils.isBlank(applyInfo.getSignUrl()) && applyInfo.getSignId() == null) { + // 如果签名url或者签名id都为空，则根据id或者发布批次去出库表查询该单据是否存在其他签名 + List leaseApplyInfoList = leaseApplyInfoMapper.selectPublishSignList(applyInfo); + if (!CollectionUtils.isEmpty(leaseApplyInfoList)) { + applyInfo.setSignId(leaseApplyInfoList.get(0)); + } + } // 判断协议号是否为空 if (StringUtils.isBlank(applyInfo.getAgreementCode())) { if (applyInfo.getLeaseUnit() != null && applyInfo.getLeaseProjectId() != null) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java index c77873db..5a499850 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -31,9 +32,9 @@ public class MaTypeHistory { private String maName; @Excel(name = "规格型号") private String maModel; - @Excel(name = "修改前租赁价格(元)") + @Excel(name = "修改前租赁价格(元)", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal beforePrice; - @Excel(name = "修改后租赁价格(元)") + @Excel(name = "修改后租赁价格(元)", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal afterPrice; @Excel(name = "修改人") private String createBy; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java index 2b6bef52..c1508fb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java @@ -69,7 +69,7 @@ public class PartType extends BaseEntity private BigDecimal buyPrice; /** 实时库存 */ - @Excel(name = "数量",sort=6, align = HorizontalAlignment.RIGHT) + @Excel(name = "数量",sort=6, align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "实时库存") private Long storageNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java index 555ca6ef..ab8fe82d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartInventory.java @@ -27,6 +27,6 @@ public class PartInventory { private String unit; @ApiModelProperty(value = "在库数量") - @Excel(name = "库存",cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "库存",cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal storeNum; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeCheckInfo.java index 8c712fa3..1a0373b1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeCheckInfo.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -84,7 +85,7 @@ public class PartTypeCheckInfo extends BaseEntity { /** * 采购数量 */ - @Excel(name = "采购数量", sort = 3) + @Excel(name = "采购数量", sort = 3, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "采购数量--外层Table字段") private BigDecimal purchaseMaNumber; @@ -109,21 +110,21 @@ public class PartTypeCheckInfo extends BaseEntity { /** * 采购单价(不含税) */ - @Excel(name = "采购单价(不含税)", sort = 5) + @Excel(name = "采购单价(不含税)", sort = 5, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "采购单价(不含税)--外层Table字段") private BigDecimal purchasePrice; /** * 采购单价(含税) */ - @Excel(name = "采购单价(含税)", sort = 4) + @Excel(name = "采购单价(含税)", sort = 4, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "采购单价(含税)--外层Table字段") private BigDecimal purchaseTaxPrice; /** * 税率 */ - @Excel(name = "税率", sort = 6) + @Excel(name = "税率", sort = 6, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "税率 0~100") @Size(max = 100, message = "税率长度必须介于 0 和 100 之间") private BigDecimal taxRate; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java index 49cdeaa2..c7b24d5e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -171,7 +172,7 @@ public class IwsCostPushBean implements Serializable { private BigDecimal pendingNum; @ApiModelProperty(value = "出库数量") - @Excel(name = "出库数量") + @Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal outNum; // 工程id数组 private String[] projectIds; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/PartDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/PartDetails.java index 31ed76f8..bfb741ff 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/PartDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/PartDetails.java @@ -1,15 +1,14 @@ package com.bonus.material.repair.domain; -import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import lombok.experimental.Accessors; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; -import java.util.List; /** * 维修配件详细对象 repair_part_details @@ -58,7 +57,7 @@ public class PartDetails extends BaseEntity { @ApiModelProperty(value = "物资名称") private String typeModelName; - @Excel(name = "规格型号",sort = 5) + @Excel(name = "规格型号",sort = 5, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "规格型号") private String typeName; @@ -72,7 +71,7 @@ public class PartDetails extends BaseEntity { /** * 配件数量 */ - @Excel(name = "使用数量",sort = 10) + @Excel(name = "使用数量",sort = 10, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "配件数量") private Integer partNum; @@ -82,7 +81,7 @@ public class PartDetails extends BaseEntity { /** * 配件费用 */ - @Excel(name = "金额（元）",sort = 12) + @Excel(name = "金额（元）",sort = 12, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "配件费用") private BigDecimal partCost; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairProjectInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairProjectInfo.java index 23020a81..5f6a04e4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairProjectInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairProjectInfo.java @@ -5,6 +5,7 @@ import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; @@ -64,7 +65,7 @@ public class RepairProjectInfo extends BaseEntity { private String unitName; /** 在修数量 */ - @Excel(name = "在修数量") + @Excel(name = "在修数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "在修数量（定损+维修）") private BigDecimal repairNum; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index dd136f43..f29ba52c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -1153,4 +1153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index b91920b4..fbeb60d7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -1293,11 +1293,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_user su2 ON mtr.user_id = su2.user_id GROUP BY type_id ) AS mtr ON m.type_id = mtr.type_id - WHERE m.del_flag = '0' and - m.parent_id in + WHERE m.del_flag = '0' + + and m.parent_id in #{id} + AND (m.type_name like concat('%',#{type.keyword},'%') or m1.type_name like concat('%',#{type.keyword},'%')