‘linchangsheng’ пре 7 месеци
родитељ
комит
d118188889

+ 2 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -734,6 +734,7 @@ public class AgreementLogic {
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
+                .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
                 .select(PolicyOrder::getId)
                 .list();
 
@@ -753,6 +754,7 @@ public class AgreementLogic {
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
+                .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
                 .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
                 .update();
 

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

@@ -134,6 +134,24 @@ public class WorkerManagerLogic {
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.QUIT.getKey());
         websitUser.updateById();
 
+        AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
+        if (adminWebsit.getInsureType().equals("意外险,雇主险")){
+            policyOrderService.lambdaUpdate()
+                    .ge(PolicyOrder::getEndTime,new Date())
+                    .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
+                    .eq(PolicyOrder::getType,PolicyTypeEnum.EM.getKey())
+                    .set(PolicyOrder::getPolicyOrderStatus,PolicyOrderEmStutasEnum.KTH.getKey())
+                    .update();
+
+            workerPolicyService.lambdaUpdate()
+                    .ge(WorkerPolicy::getEndTime,new Date())
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                    .eq(WorkerPolicy::getType,PolicyTypeEnum.EM.getKey())
+                    .set(WorkerPolicy::getStatus,PolicyOrderEmStutasEnum.YSX.getKey())
+                    .update();
+
+        }
+
         WebsitUserLog websitUserLog = new WebsitUserLog();
 
         websitUserLog.setTypeText("操作离职");
@@ -156,6 +174,26 @@ public class WorkerManagerLogic {
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.POLICY_WAIT.getKey());
         websitUser.updateById();
 
+        AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
+        if (adminWebsit.getInsureType().equals("意外险,雇主险")){
+            List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery()
+                    .ge(PolicyOrder::getEndTime, new Date())
+                    .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
+                    .eq(PolicyOrder::getType, PolicyTypeEnum.EM.getKey())
+                    .eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.KTH.getKey())
+                    .list();
+
+            for (PolicyOrder policyOrder : policyOrders) {
+                workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,policyOrder.getId())
+                        .set(WorkerPolicy::getEndTime,policyOrder.getEndTime())
+                        .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey()).update();
+
+                policyOrder.setPolicyOrderStatus(PolicyOrderStatusEnum.BZZ.getKey());
+                policyOrder.updateById();
+            }
+
+        }
+
         WebsitUserLog websitUserLog = new WebsitUserLog();
 
         websitUserLog.setTypeText("重新入职");