From 9daa9a41bb738edc9305d6d78168ff5306e6fa67 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Wed, 22 Jan 2025 17:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=AE=B9=E9=94=99=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/parts/PartsServiceImpl.java       |  9 ++++-
 .../module/manage/util/number/NumberUtil.java | 39 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberUtil.java

diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java
index 472f2c820..9e638b091 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java
@@ -9,6 +9,7 @@ import com.cf.imes.module.manage.controller.admin.parts.vo.PartsSaveReqVO;
 import com.cf.imes.module.manage.util.file.FileHelperUtil;
 import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO;
 import com.cf.imes.module.manage.dal.mysql.parts.PartsMapper;
+import com.cf.imes.module.manage.util.number.NumberUtil;
 import com.cf.imes.module.system.api.organ.OrganApi;
 import com.cf.imes.module.system.api.permission.PermissionApi;
 import com.cf.imes.module.system.enums.ErrorCodeConstants;
@@ -50,6 +51,9 @@ public class PartsServiceImpl implements PartsService {
     @Resource
     private PermissionApi permissionApi;
 
+    @Resource
+    private NumberUtil numberUtil;
+
     private final static String BASE_PARTS_IMPORT_PERMISSION = "base:accessory:import"; // 导入板材
     private final static String BASE_PARTS_DELETE_PERMISSION = "base:accessory:delete"; // 删除板材信息
     private final static String BASE_PARTS_CREATE_PERMISSION = "base:accessory:create"; // 创建板材信息
@@ -139,7 +143,10 @@ public class PartsServiceImpl implements PartsService {
     @Override
     @OrganIgnore
     public PageResult<PartsDO> getPage(PartsPageReqVO pageReqVO) {
-        pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId()));
+        pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId()))
+                .setLength(numberUtil.compareLength(pageReqVO.getLength()))
+                .setWidth(numberUtil.compareLength(pageReqVO.getWidth()))
+                .setThickness(numberUtil.compareLength(pageReqVO.getThickness()));
 
         return partsMapper.selectPage(pageReqVO);
     }
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberUtil.java
new file mode 100644
index 000000000..12e0c7f35
--- /dev/null
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberUtil.java
@@ -0,0 +1,39 @@
+package com.cf.imes.module.manage.util.number;
+
+/**
+ * 数据处理相关工具类
+ */
+public class NumberUtil {
+
+    public Double[] compareLength(Double[] numbers) {
+        if (numbers == null || numbers.length < 2) {
+            return numbers; // 如果数组为空或长度不足2，直接返回原数组
+        }
+
+        Double min = numbers[0];
+        Double max = numbers[1];
+
+        // 检查前值和后值是否都为null或小于等于0
+        if ((min == null || min <= 0) && (max == null || max <= 0)) {
+            return new Double[]{null, null}; // 忽略该字段
+        }
+
+        // 只输入前值，不输入后值
+        if (max == null || max <= 0) {
+            return new Double[]{min, null};
+        }
+
+        // 不输入前值，只输入后值
+        if (min == null || min <= 0) {
+            return new Double[]{null, max};
+        }
+
+        // 前值和后值都输入，且前值大于后值，则前值和后值交换
+        if (min > max) {
+            return new Double[]{max, min};
+        }
+
+        return new Double[]{min, max};
+    }
+
+}