需求

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

@@ -734,16 +734,16 @@ public class AgreementLogic {
     public void offInsure() {
 
         workerPolicyService.lambdaUpdate()
-                .le(WorkerPolicy::getEndTime, new Date())
+                .le(WorkerPolicy::getEndTime, DateUtil.beginOfDay(new Date()))
                 .set(WorkerPolicy::getStatus, PolicyOrderStatusEnum.YSX.getKey()).update();
 
         policyOrderService.lambdaUpdate()
-                .le(PolicyOrder::getEndTime, new Date())
+                .le(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey()).update();
 
 
         List<PolicyOrder> list = policyOrderService.lambdaQuery()
-                .ge(PolicyOrder::getEndTime, new Date())
+                .ge(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -752,7 +752,7 @@ public class AgreementLogic {
 
         if (!CollectionUtils.isEmpty(list)) {
             workerPolicyService.lambdaUpdate()
-                    .ge(WorkerPolicy::getEndTime, new Date())
+                    .ge(WorkerPolicy::getEndTime,  DateUtil.beginOfDay(new Date()))
                     .le(WorkerPolicy::getStartTime, new Date())
                     .in(WorkerPolicy::getOrderId, list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
                     .ne(WorkerPolicy::getStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -762,7 +762,7 @@ public class AgreementLogic {
 
 
         policyOrderService.lambdaUpdate()
-                .ge(PolicyOrder::getEndTime, new Date())
+                .ge(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -804,16 +804,16 @@ public class AgreementLogic {
             User user = userService.getById(websitUser.getUserId());
 
             String remark = StringUtil.isEmpty(websitUser.getOverdueRemark())?"":websitUser.getOverdueRemark();
-            if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+            if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                     || (!StringUtil.isEmpty(remark) && remark.split("高空证").length < 1
-                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
+                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))) ){
                 remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
             }
 
 
-            if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+            if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                     || (!StringUtil.isEmpty(remark) && remark.split("身份证").length < 1
-                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
+                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay( DateUtil.beginOfDay(new Date())),1))) ){
                 remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
             }
 
@@ -824,9 +824,9 @@ public class AgreementLogic {
             for (WorkerPolicy workerPolicy : workerPolicies) {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) &&
                         (
-                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                         || (!StringUtil.isEmpty(remark) && remark.split("意外险").length < 1
-                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(  DateUtil.beginOfDay(new Date()),1))
                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
                         )
                 ) {
@@ -835,9 +835,9 @@ public class AgreementLogic {
                 }
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
                         (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                                         || (!StringUtil.isEmpty(remark) && remark.split("雇主险").length < 1
-                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
                         )
                 ) {
@@ -846,10 +846,10 @@ public class AgreementLogic {
 
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
                         (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                                         || (!StringUtil.isEmpty(remark) && remark.split("工伤险").length < 1
-                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
-                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
+                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                         )
                 ) {
                     remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");

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

@@ -263,8 +263,6 @@ public class WorkerManagerLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
-            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
-
             if (StringUtil.isEmpty(workerPolicy.getId())){
                 WebsitUserLog websitUserLog = new WebsitUserLog();
 
@@ -415,7 +413,6 @@ public class WorkerManagerLogic {
 
             for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
 
-                workerPolicy.setEndTime(DateUtil.offsetDay(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
 
                 if (DateUtil.endOfDay(workerPolicy.getEndTime()).after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");