Merge pull request '测试' (#214) from feature/cl into develop

Reviewed-on: #214

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);
 
 }

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

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);