需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -75,6 +75,7 @@ public class UserVO   {
     @ApiModelProperty("审批时间")
     private Date examineTime;
 
+    @ZfireField(tbName = "b")
     @ApiModelProperty(value = "过期提醒")
     private String overdueRemark;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -42,7 +42,7 @@ public class OrderBaseVO     {
     @ZfireField(sortNum = 5)
     @ApiModelProperty(value = "工单单号")
     private String id;
-    @ZfireField(sortNum = 5)
+    @ZfireField(sortNum = 5,multiple = true)
     @ApiModelProperty(value = "工单状态")
     private OrderBaseStatusEnum orderStatus;
     @ZfireField(sortNum = 5)

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

@@ -75,6 +75,9 @@ public class AgreementLogic {
     @Autowired
     WebsitUserService websitUserService;
 
+    @Autowired
+    UserService userService;
+
 
     public IPage<AgreementVo> list(Page page, ZfireParamBean zfireParam) {
 
@@ -812,4 +815,47 @@ public class AgreementLogic {
     }
 
 
+    public void task5() {
+
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey()).list();
+
+        for (WebsitUser websitUser : websitUsers) {
+
+            User user = userService.getById(websitUser.getUserId());
+
+            String remark = "";
+            if (!(websitUser.getOverdueRemark().split("高空证").length > 0) && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
+            }
+
+            if (!(websitUser.getOverdueRemark().split("身份证").length > 0) && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
+            }
+
+            List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery()
+                    .in(WorkerPolicy::getStatus, WorkerPolicyStatusEnum.BZZ.getKey(), WorkerPolicyStatusEnum.DSX.getKey())
+                    .list();
+
+            for (WorkerPolicy workerPolicy : workerPolicies) {
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                    remark = remark+"意外险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
+                }
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                    remark = remark+"雇主险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
+                }
+
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetDay(new Date(),3))) {
+                    remark = remark+"工伤"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
+                }
+            }
+
+            WebsitUser websitUser1 = new WebsitUser();
+            websitUser1.setId(websitUser.getId());
+            websitUser1.setOverdueRemark(remark);
+            websitUser1.updateById();
+
+        }
+
+
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -14,7 +14,7 @@ import java.io.IOException;
 /**
  * 定时购买保险
  */
-@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+//@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Component
 public class InsureEmailSchedule {
 
@@ -52,4 +52,12 @@ public class InsureEmailSchedule {
     }
 
 
+    //扫表身份证，高空证过期备注
+    @Scheduled(fixedDelay = 60* 1000)
+    public void task5(){
+        agreementLogic.task5();
+    }
+
+
+
 }