平台服务商合同时间校验

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/controller/HlwCpSubcontractorController.java

@@ -103,10 +103,13 @@ public class HlwCpSubcontractorController extends JeecgController<HlwCpSubcontra
 	 public Result<?> validateTime(HlwCpSubcontractor hlwCpSubcontractor) {
 	 	List<HlwCpSubcontractor> hlwCpSubcontractorList= hlwCpSubcontractorService.findHlwCpSubcontractorList(hlwCpSubcontractor);
 		if(hlwCpSubcontractorList.size()>0){
-			return Result.error("有效期存在重叠！");
+			if(hlwCpSubcontractor.getStartDate().getTime()<=hlwCpSubcontractorList.get(0).getEndDate().getTime()){
+				return Result.error("有效期存在重叠！");
+			}
 		}else{
 			return Result.ok();
 		}
+		return Result.ok();
 	 }
 
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/mapper/xml/HlwCpSubcontractorMapper.xml

@@ -46,9 +46,12 @@
         <include refid="hlwCpSubcontractorColumns"/>
         FROM hlw_cp_subcontractor a
         <include refid="hlwCpSubcontractorJoins"/>
-        where a.subcontractor_id=#{hlwCpSubcontractor.subcontractorId}
-        and  to_days(a.start_date) &lt;= to_days(#{hlwCpSubcontractor.startDate})
-        and to_days(a.end_date) &gt;= to_days(#{hlwCpSubcontractor.startDate})
+        where
+        a.subcontractor_id=#{hlwCpSubcontractor.subcontractorId}
+        <if test="hlwCpSubcontractor.id!=null">
+            and a.id!=#{hlwCpSubcontractor.id}
+        </if>
+        order by a.end_date desc
     </select>