Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -193,7 +193,9 @@ public class WorkerManagerLogic {
 
         //todo 检测保险情况 自建，第三方网点
 
-       // adminWebsitService.getById()
+        workerManagerBean.getWorkerPolicies();
+
+
 
 
 
@@ -204,6 +206,23 @@ public class WorkerManagerLogic {
 
     }
 
+    public Boolean hasOverlap(List<WorkerPolicy> workerPolicies){
+
+        for (int i= 0; i<workerPolicies.size();i++){
+            WorkerPolicy workerPolicy = workerPolicies.get(i);
+            for (int j = i+1; j <workerPolicies.size() ; j++) {
+                WorkerPolicy workerPolicy2 = workerPolicies.get(j);
+                if (workerPolicy.getEndTime().after(workerPolicy2.getStartTime()) && workerPolicy2.getEndTime().after(workerPolicy.getStartTime())){
+                    return true;
+                }
+            }
+        }
+
+        return false;
+
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     public void examine(WorkerManagerBean workerManagerBean) {