From 74f59462b7906f7a4cd7b1c87abd8ac34e0b2506 Mon Sep 17 00:00:00 2001 From: yangk Date: Thu, 18 Jun 2026 10:48:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(asset):=20=E4=BF=AE=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=A4=84=E7=BD=AE=E6=A8=A1=E5=9D=97=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E5=92=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复HTML模板中max-length属性拼写错误为maxlength - 统一资产状态常量引用替换硬编码字符串 - 优化驳回原因输入框的弹窗实现并添加长度限制 - 调整时间格式化模式从日期到日期时间格式 - 规范化服务层接口中的泛型类型声明 --- .../java/com/ruoyi/asset/domain/AmsDisposalOrder.java | 8 ++++---- .../ruoyi/asset/service/IAmsDisposalOrderService.java | 3 ++- .../asset/service/impl/AmsDisposalOrderServiceImpl.java | 5 +++-- .../src/main/resources/templates/asset/disposal/add.html | 4 ++-- .../resources/templates/asset/disposal/disposal.html | 9 +++++++-- .../main/resources/templates/asset/disposal/edit.html | 4 ++-- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/domain/AmsDisposalOrder.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/domain/AmsDisposalOrder.java index 20e3f55..72a5009 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/domain/AmsDisposalOrder.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/domain/AmsDisposalOrder.java @@ -50,8 +50,8 @@ public class AmsDisposalOrder extends BaseEntity private String confirmUserName; /** 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date confirmTime; /** 驳回原因 */ @@ -63,8 +63,8 @@ public class AmsDisposalOrder extends BaseEntity private String disposalMethod; /** 处置时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date disposalTime; /** 单据状态 */ diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsDisposalOrderService.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsDisposalOrderService.java index 7f5bffb..695babb 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsDisposalOrderService.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsDisposalOrderService.java @@ -1,6 +1,7 @@ package com.ruoyi.asset.service; import java.util.List; +import com.ruoyi.asset.domain.AmsAsset; import com.ruoyi.asset.domain.AmsDisposalOperateContext; import com.ruoyi.asset.domain.AmsDisposalOrder; @@ -97,5 +98,5 @@ public interface IAmsDisposalOrderService * @param currentOrderId 当前报废单ID * @return 资产列表 */ - public List selectAvailableDisposalAssetList(com.ruoyi.asset.domain.AmsAsset asset, Long currentOrderId); + public List selectAvailableDisposalAssetList(AmsAsset asset, Long currentOrderId); } diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsDisposalOrderServiceImpl.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsDisposalOrderServiceImpl.java index 4d30dd9..713621a 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsDisposalOrderServiceImpl.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsDisposalOrderServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.asset.constant.AssetStatus; import com.ruoyi.asset.constant.DisposalOrderStatus; import com.ruoyi.asset.domain.AmsAsset; import com.ruoyi.asset.domain.AmsDisposalOperateContext; @@ -433,7 +434,7 @@ public class AmsDisposalOrderServiceImpl implements IAmsDisposalOrderService { throw new ServiceException("资产不存在或已删除"); } - if (!"IN_STOCK".equals(asset.getAssetStatus()) && !"IN_USE".equals(asset.getAssetStatus())) + if (!AssetStatus.IN_STOCK.equals(asset.getAssetStatus()) && !AssetStatus.IN_USE.equals(asset.getAssetStatus())) { throw new ServiceException(StringUtils.format("资产【{}】当前状态【{}】不允许进行报废", asset.getAssetCode(), asset.getAssetStatus())); @@ -478,7 +479,7 @@ public class AmsDisposalOrderServiceImpl implements IAmsDisposalOrderService { throw new ServiceException("资产不存在或已删除"); } - if (!"IN_STOCK".equals(asset.getAssetStatus()) && !"IN_USE".equals(asset.getAssetStatus())) + if (!AssetStatus.IN_STOCK.equals(asset.getAssetStatus()) && !AssetStatus.IN_USE.equals(asset.getAssetStatus())) { throw new ServiceException(StringUtils.format("资产【{}】状态已发生改变，不能进行该操作", asset.getAssetCode())); } diff --git a/ruoyi-asset/src/main/resources/templates/asset/disposal/add.html b/ruoyi-asset/src/main/resources/templates/asset/disposal/add.html index b355749..ab6d625 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/disposal/add.html +++ b/ruoyi-asset/src/main/resources/templates/asset/disposal/add.html @@ -32,7 +32,7 @@
- +
@@ -42,7 +42,7 @@
- +
diff --git a/ruoyi-asset/src/main/resources/templates/asset/disposal/disposal.html b/ruoyi-asset/src/main/resources/templates/asset/disposal/disposal.html index 1ba8067..f481dee 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/disposal/disposal.html +++ b/ruoyi-asset/src/main/resources/templates/asset/disposal/disposal.html @@ -181,8 +181,13 @@ } function rejectOrder(orderId) { - $.modal.openPrompt("驳回原因", "请输入驳回原因", function(index, layero) { - var rejectReason = layero.find(".layui-layer-input").val(); + layer.prompt({ + formType: 2, + title: '请输入驳回原因', + value: '', + maxlength: 500 + }, function(value, index, elem) { + var rejectReason = value.trim(); if ($.common.isEmpty(rejectReason)) { $.modal.msgWarning("驳回原因不能为空"); return false; diff --git a/ruoyi-asset/src/main/resources/templates/asset/disposal/edit.html b/ruoyi-asset/src/main/resources/templates/asset/disposal/edit.html index 97f89d8..23bb4ae 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/disposal/edit.html +++ b/ruoyi-asset/src/main/resources/templates/asset/disposal/edit.html @@ -53,7 +53,7 @@
- +
@@ -63,7 +63,7 @@
- +