From 88d53422e149c87af61f1f06fb20edd220d13bab Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 7 Sep 2023 17:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/mapper/staff/StaffPlanMapper.java    |  2 +-
 .../organization/mapper/staff/StaffPlanMapper.xml     |  4 ++--
 .../service/impl/StaffPlanServiceImpl.java            | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java
index b61b10ba..57607596 100644
--- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java
+++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java
@@ -82,6 +82,6 @@ public interface StaffPlanMapper {
      * @param: [timeStart, timeEnd, ecCompany, controlDimension]
      * @return: com.engine.organization.entity.staff.po.StaffPlanPO
      */
-    StaffPlanPO customSelect(@Param("timeStart") String timeStart,@Param("timeEnd") String timeEnd,@Param("ecCompany") String ecCompany,@Param("controlDimension") String controlDimension);
+    List<StaffPlanPO> customSelect(@Param("timeStart") String timeStart,@Param("timeEnd") String timeEnd,@Param("ecCompany") String ecCompany,@Param("controlDimension") String controlDimension);
 
 }
diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
index f1a760a2..57d4560a 100644
--- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
+++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
@@ -299,8 +299,8 @@
     <select id="customSelect" resultMap="BaseResultMap">
         select
         <include refid="baseColumns"/>
-        from jcl_org_staffplan t where
-        ((time_start &lt;= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE}) OR (time_end &lt;= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}))
+        from jcl_org_staffplan t where ((time_start &lt;= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE})
+        OR (time_start &lt;= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}))
         AND ec_company = #{ecCompany}
         AND control_dimension = #{controlDimension}
         AND delete_type = 0
diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
index 6b92a96b..971a3a8f 100644
--- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
+++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
@@ -10,6 +10,7 @@ import com.engine.organization.entity.staff.bo.StaffPlanBO;
 import com.engine.organization.entity.staff.param.StaffPlanSearchParam;
 import com.engine.organization.entity.staff.po.StaffPlanPO;
 import com.engine.organization.entity.staff.vo.StaffPlanTableVO;
+import com.engine.organization.exception.OrganizationRunTimeException;
 import com.engine.organization.mapper.staff.StaffPlanMapper;
 import com.engine.organization.service.StaffPlanService;
 import com.engine.organization.util.*;
@@ -73,8 +74,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         Date startDate = DateUtil.parseToDate(timeStart);
         Date endDate = DateUtil.parseToDate(timeEnd);
         OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
-        StaffPlanPO staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
-        OrganizationAssert.isNull(staffPlanPO1,"同一维度下，相同适用公司编制方案的时间段不允许出现交叉");
+        List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
+        OrganizationAssert.isEmpty(staffPlanPO1,"同一维度下，相同适用公司编制方案的时间段不允许出现交叉");
         return getStaffPlanMapper().insertIgnoreNull(staffPlanPO);
     }
 
@@ -94,8 +95,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         Date startDate = DateUtil.parseToDate(timeStart);
         Date endDate = DateUtil.parseToDate(timeEnd);
         OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
-        StaffPlanPO staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
-        OrganizationAssert.isNull(staffPlanPO1,"同一维度下，相同适用公司编制方案的时间段不允许出现交叉");
+        List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
+        if (staffPlanPO1.size() > 1) {
+            throw new OrganizationRunTimeException("同一维度下，相同适用公司编制方案已存在");
+        }
         // 多选赋值
         staffPlanPO.setCompanyId(staffPlanPO.getEcCompany());
         return getStaffPlanMapper().updateStaffPlan(staffPlanPO);