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

mall-server-api/src/main/java/com/gree/mall/manager/bean/letter/LeUserDepartmentVO.java

@@ -29,6 +29,8 @@ public class LeUserDepartmentVO   {
     @ApiModelProperty(value = "科室id")
     private String dapartmentId;
 
+
+    @ZfireField(hide = true)
     private String adminUserId;
 
     @ApiModelProperty(value = "账号名称")

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

@@ -790,21 +790,25 @@ public class AgreementLogic {
 
         List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey()).list();
 
+        Mailbox mailbox = mailboxService.getById("1");
+
         for (WebsitUser websitUser : websitUsers) {
 
             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( DateUtil.beginOfDay(new Date()),1)))
+            String remark = "";
+            if ((user.getHightExamineTime() != null && user.getHightExamineTime().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)))
+            if (( user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
 
-                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay( DateUtil.beginOfDay(new Date())),1)) ){
+            ){
+                if (!StringUtil.isEmpty(remark))
+                    remark = remark+",";
                 remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
             }
 
@@ -815,48 +819,41 @@ 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( DateUtil.beginOfDay(new Date()),1)))
-
-                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(  DateUtil.beginOfDay(new Date()),1))
-                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-
+                workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                 ) {
-
+                    if (!StringUtil.isEmpty(remark))
+                        remark = remark+",";
                     remark = remark+"意外险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
-                        (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-
-                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
-                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-
+                        workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                 ) {
+                    if (!StringUtil.isEmpty(remark))
+                        remark = remark+",";
                     remark = remark+"雇主险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
 
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
-                        (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(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)))
-
+                        workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetDay( DateUtil.beginOfDay(new Date()),mailbox.getOverNum()))
                 ) {
+                    if (!StringUtil.isEmpty(remark))
+                        remark = remark+",";
                     remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
             }
 
-            WebsitUser websitUser1 = new WebsitUser();
-            websitUser1.setId(websitUser.getId());
-            websitUser1.setOverdueRemark(remark);
-            if (!StringUtil.isEmpty(remark)){
-                websitUser1.setIsOverdue(IsYesNoEnum.YES.getKey());
-            }else {
-                websitUser1.setIsOverdue(IsYesNoEnum.NO.getKey());
+            if (!StringUtil.isEmpty(remark)) {
+
+                WebsitUser websitUser1 = new WebsitUser();
+                websitUser1.setId(websitUser.getId());
+                websitUser1.setOverdueRemark(remark);
+                if (!StringUtil.isEmpty(remark)) {
+                    websitUser1.setIsOverdue(IsYesNoEnum.YES.getKey());
+                } else {
+                    websitUser1.setIsOverdue(IsYesNoEnum.NO.getKey());
+                }
+                websitUser1.updateById();
             }
-            websitUser1.updateById();
 
         }