From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
index d93e298..15b0a85 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
@@ -5,8 +5,8 @@
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProductionOrderRouteItemParamDto;
import com.ruoyi.production.mapper.ProductionOrderRouteItemParamMapper;
import com.ruoyi.production.pojo.ProductionOrderRouteItemParam;
@@ -47,16 +47,11 @@
return list.stream().map(item -> {
ProductionOrderRouteItemParamDto dto = new ProductionOrderRouteItemParamDto();
BeanUtils.copyProperties(item, dto);
- dto.setParamFormat(toUpperCasePattern(dto.getParamFormat()));
+ dto.setParamFormat(DateUtils.toUpperCasePattern(dto.getParamFormat()));
return dto;
}).collect(Collectors.toList());
}
- private String toUpperCasePattern(String pattern) {
- if (StringUtils.isEmpty(pattern)) return "";
- return pattern.replace("yyyy", "YYYY")
- .replace("dd", "DD");
- }
@Override
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.9.3