需求

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

@@ -796,14 +796,14 @@ public class AgreementLogic {
 
             String remark = StringUtil.isEmpty(websitUser.getOverdueRemark())?"":websitUser.getOverdueRemark();
             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( DateUtil.beginOfDay(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( DateUtil.beginOfDay(new Date()),1)))
-                    || (!StringUtil.isEmpty(remark) && remark.split("身份证").length < 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");
             }
@@ -817,10 +817,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) &&
                         (
                 (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(  DateUtil.beginOfDay(new Date()),1))
                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-                        )
+
                 ) {
 
                     remark = remark+"意外险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
@@ -828,10 +828,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
                         (
                                 (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( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-                        )
+
                 ) {
                     remark = remark+"雇主险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
@@ -839,10 +839,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
                         (
                                 (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( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                        )
+
                 ) {
                     remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }