fix(asset): 修复资产处置模块的字段长度限制和时间格式问题

- 修复HTML模板中max-length属性拼写错误为maxlength
- 统一资产状态常量引用替换硬编码字符串
- 优化驳回原因输入框的弹窗实现并添加长度限制
- 调整时间格式化模式从日期到日期时间格式
- 规范化服务层接口中的泛型类型声明

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;
 
     /** 单据状态 */

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<com.ruoyi.asset.domain.AmsAsset> selectAvailableDisposalAssetList(com.ruoyi.asset.domain.AmsAsset asset, Long currentOrderId);
+    public List<AmsAsset> selectAvailableDisposalAssetList(AmsAsset asset, Long currentOrderId);
 }

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()));
             }

ruoyi-asset/src/main/resources/templates/asset/disposal/add.html

@@ -32,7 +32,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">处置方式：</label>
                         <div class="col-sm-8">
-                            <input name="disposalMethod" class="form-control" type="text" placeholder="如：报废、变卖、捐赠等" required max-length="64">
+                            <input name="disposalMethod" class="form-control" type="text" placeholder="如：报废、变卖、捐赠等" required maxlength="64">
                         </div>
                     </div>
                 </div>
@@ -42,7 +42,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">申请备注：</label>
                         <div class="col-sm-10">
-                            <textarea name="remark" class="form-control" placeholder="请输入报废备注信息" max-length="500"></textarea>
+                            <textarea name="remark" class="form-control" placeholder="请输入报废备注信息" maxlength="500"></textarea>
                         </div>
                     </div>
                 </div>

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;

ruoyi-asset/src/main/resources/templates/asset/disposal/edit.html

@@ -53,7 +53,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">处置方式：</label>
                         <div class="col-sm-8">
-                            <input name="disposalMethod" th:field="*{disposalMethod}" class="form-control" type="text" placeholder="如：报废、变卖、捐赠等" required max-length="64">
+                            <input name="disposalMethod" th:field="*{disposalMethod}" class="form-control" type="text" placeholder="如：报废、变卖、捐赠等" required maxlength="64">
                         </div>
                     </div>
                 </div>
@@ -63,7 +63,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">申请备注：</label>
                         <div class="col-sm-10">
-                            <textarea name="remark" class="form-control" placeholder="请输入报废备注信息" max-length="500">[[*{remark}]]</textarea>
+                            <textarea name="remark" class="form-control" placeholder="请输入报废备注信息" maxlength="500">[[*{remark}]]</textarea>
                         </div>
                     </div>
                 </div>