From 59bbe6c66de49d71e7bc14ebdcaa42a5b2ead943 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 20 Dec 2024 11:16:45 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisExchangeRateController.java  |  5 ++++
 .../mapper/EmisExchangeRateMapper.xml         | 26 +++++++------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
index 7a8b307b8..15ca51918 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
@@ -121,6 +121,11 @@ public class EmisExchangeRateController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody EmisExchangeRate emisExchangeRate)
     {
+        int cnt=emisExchangeRateService.checkUnique(emisExchangeRate);
+        if(cnt>0){
+            return AjaxResult.error("配置重复,请检查时间范围");
+        }
+
         return toAjax(emisExchangeRateService.insertEmisExchangeRate(emisExchangeRate));
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
index b2cc0954b..4301d8074 100644
--- a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
@@ -42,23 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="checkUnique" parameterType="EmisExchangeRate"  resultType="int">
-		select count(1) from  emis_exchange_rate
-		where del_flag='0'
-           and id = #{id}
-           and currency = #{currency}
-           and dest_currency = #{destCurrency}
-           and rate = #{rate}
-           and start_date = #{startDate}
-           and end_date = #{endDate}
-           and bl_valid = #{blValid}
-           and del_flag = #{delFlag}
-           and create_by = #{createBy}
-           and create_time = #{createTime}
-           and update_by = #{updateBy}
-           and update_time = #{updateTime}
-           and remark = #{remark}
-           and create_site = #{createSite}
-           and update_site = #{updateSite}
+        select count(1) from emis_exchange_rate
+        where del_flag='0'
+        and currency = #{currency}
+        and dest_currency = #{destCurrency}
+        and (
+            (start_date <![CDATA[ <= ]]>  #{startDate} and #{startDate} <![CDATA[ <= ]]> end_date )
+            or
+            (start_date <![CDATA[ <= ]]>  #{endDate} and #{endDate} <![CDATA[ <= ]]> end_date )
+        )
 		limit 1
 	</select>