From 1414ef5291ede52a9884e462793898e96fb54781 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 10 Jan 2025 10:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=EF=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=BF=E7=BC=96=E5=8F=B7=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=B1=BB=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomPlateNoServiceHandler.java     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java
index 9f493f869..09320a657 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java
@@ -10,6 +10,7 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.exception.ErrorCode;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
+import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO;
 import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO;
@@ -33,6 +34,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,7 +80,26 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand
 
     @Override
     public List<SystemConfigDO> selectList(ConfigPageReqVO pageReqVO) {
-        return null;
+        SystemConfigTypeEnum customPlateNoEnum = SystemConfigTypeEnum.CUSTOM_PLATE_NO;
+        List<SystemConfigDO> systemConfigDOS = systemConfigMapper.selectList(new LambdaQueryWrapperX<SystemConfigDO>()
+                .eq(SystemConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .eq(SystemConfigDO::getType, pageReqVO.getType())
+                .eqIfPresent(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId())
+                .select(SystemConfigDO::getId, SystemConfigDO::getName, SystemConfigDO::getStatus, SystemConfigDO::getType)
+                .orderByAsc(SystemConfigDO::getId));
+        if (systemConfigDOS.isEmpty()) {
+            SystemConfigDO initCustomPlateNoConfig = new SystemConfigDO().builder().id(null).name(customPlateNoEnum.getName()).type(customPlateNoEnum.getType()).build();
+            return List.of(initCustomPlateNoConfig);
+        } else {
+            // configDOPageResult下的自定义板编号配置只保留version最大的一项
+            Optional<SystemConfigDO> maxVersionCustPlateNoConfigOptinal = systemConfigDOS.stream()
+                    .filter(s -> ObjectUtil.equal(customPlateNoEnum.getType(), s.getType()))
+                    .max(Comparator.comparing(SystemConfigDO::getVersion));
+            if (maxVersionCustPlateNoConfigOptinal.isPresent()) {
+                systemConfigDOS.removeIf(s -> ObjectUtil.equal(customPlateNoEnum.getType(), s.getType()) && ObjectUtil.notEqual(s.getId(), maxVersionCustPlateNoConfigOptinal.get().getId()));
+            }
+            return systemConfigDOS;
+        }
     }
 
     @Override