From 3de8e4aaa684feeb312c6fd8dd33a04e24bad896 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 27 Sep 2024 10:34:46 +0800
Subject: [PATCH] =?UTF-8?q?9/27=20=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoSplitFifoInvRelController.java      | 14 ++++++++++++++
 .../api/dao/collect/IoSplitFifoInvRelMapper.java  |  9 +++++++--
 .../service/collect/IoSplitFifoInvRelService.java | 15 +++++++++++++++
 .../mapper/collect/IoCollectOrderMapper.xml       |  5 ++++-
 .../mapper/collect/IoSplitFifoInvRelMapper.xml    |  5 +++++
 5 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java
 create mode 100644 src/main/java/com/glxp/api/service/collect/IoSplitFifoInvRelService.java
 create mode 100644 src/main/resources/mybatis/mapper/collect/IoSplitFifoInvRelMapper.xml

diff --git a/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java b/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java
new file mode 100644
index 000000000..e6e0183e1
--- /dev/null
+++ b/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java
@@ -0,0 +1,14 @@
+package com.glxp.api.controller.collect;
+
+import com.glxp.api.controller.BaseController;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/9/27 10:25
+ * @modyified By :
+ */
+
+@RestController
+public class IoSplitFifoInvRelController extends BaseController {
+}
diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitFifoInvRelMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitFifoInvRelMapper.java
index 86417bbb1..98ab380dd 100644
--- a/src/main/java/com/glxp/api/dao/collect/IoSplitFifoInvRelMapper.java
+++ b/src/main/java/com/glxp/api/dao/collect/IoSplitFifoInvRelMapper.java
@@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.collect.IoSplitFifoInvRel;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * @author : zhangsan
+ * @date : 2024/9/27 10:26
+ * @modyified By :
+ */
 @Mapper
-public interface IoSplitFifoInvRelMapper extends BaseMapper<IoSplitFifoInvRel> {
-}
\ No newline at end of file
+public interface IoSplitFifoInvRelMapper  extends BaseMapper<IoSplitFifoInvRel> {
+}
diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitFifoInvRelService.java b/src/main/java/com/glxp/api/service/collect/IoSplitFifoInvRelService.java
new file mode 100644
index 000000000..63627a70f
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/collect/IoSplitFifoInvRelService.java
@@ -0,0 +1,15 @@
+package com.glxp.api.service.collect;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.collect.IoSplitFifoInvRelMapper;
+import com.glxp.api.entity.collect.IoSplitFifoInvRel;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/9/27 10:27
+ * @modyified By :
+ */
+@Service
+public class IoSplitFifoInvRelService extends ServiceImpl<IoSplitFifoInvRelMapper, IoSplitFifoInvRel> {
+}
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index e62a2f8c4..99b45604c 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -103,9 +103,12 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="invAlert != null">
+            <if test="invAlert != null and invAlert != 1">
                 and ico.invAlert =#{invAlert}
             </if>
+            <if test="invAlert == 1">
+                and ico.invAlert in (0,1)
+            </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
                 and ico.invAlert in
                 <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitFifoInvRelMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitFifoInvRelMapper.xml
new file mode 100644
index 000000000..dd552fd4e
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/collect/IoSplitFifoInvRelMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.collect.IoSplitFifoInvRelMapper">
+
+</mapper>