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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/ExamineWorkerStatusEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 
 @Getter
 public enum ExamineWorkerStatusEnum   {
-    WAIT_WORKER("WAIT_WORKER","待师傅购买"),
+    WAIT_WORKER("WAIT_WORKER","待购买"),
     POLICY_WAIT("POLICY_WAIT","保险待审核"),
     WAIT("WAIT","入驻待审核"),
     FAIL("FAIL","驳回"),

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -92,7 +92,7 @@ public class CommonLogic {
         if (StringUtils.isBlank(device) && StringUtils.isBlank(appid)) {
             throw new RemoteServiceException("非法请求，缺少必须的参数");
         }
-        log.info("打印token："+token);
+       // log.info("打印token："+token);
         AdminCompanyWechat adminCompanyWechat;
         User user = null;
         if (StringUtils.isBlank(device)) {

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -92,7 +92,11 @@ public class WorkerLogic {
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .count() < 1 &&
                     policyOrderService.lambdaQuery().eq(PolicyOrder::getWebsitUserId,websitUser.getId())
-                    .eq(PolicyOrder::getType,"AC").eq(PolicyOrder::getIsReceipt,IsYesNoEnum.NO.getKey()).count() < 1) {
+                    .eq(PolicyOrder::getType,"AC").eq(PolicyOrder::getIsReceipt,IsYesNoEnum.NO.getKey()).count() < 1
+
+                    && workerPolicyService.lambdaQuery()
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId()).eq(WorkerPolicy::getPolicyType,"AC").count()< 1
+            ) {
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
 
@@ -104,7 +108,11 @@ public class WorkerLogic {
                 workerReminds.add(workerRemind);
             }
 
-            if (websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT.getKey())) {
+            if (websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT.getKey()) &&
+                    !(workerPolicyService.lambdaQuery()
+                            .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .eq(WorkerPolicy::getPolicyType,"AC")
+                            .count() > 0)) {
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
 
@@ -162,7 +170,8 @@ public class WorkerLogic {
                     .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .le(WorkerPolicy::getExTime,new Date())
+                    .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
+
                     .count() > 0){
 
                 workerPolicyService.lambdaUpdate()
@@ -439,7 +448,8 @@ public class WorkerLogic {
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
-        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, currentCompanyWechat.getUserId()).list();
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, currentCompanyWechat.getUserId())
+                .ne(WebsitUser::getExamineStatus,"WAIT").list();
 
         List<AdminWebsit> adminWebsits = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {

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

@@ -3,8 +3,10 @@ package com.gree.mall.manager.bean.listvo;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.ExamineWorkerStatusEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.UserTypeEnum;
 import com.gree.mall.manager.plus.entity.User;
+import com.gree.mall.manager.plus.entity.WebsitUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +16,7 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 @ApiModel
 @Data
-public class UserVO   {
+public class UserVO     {
 
     @ZfireField(hide = true, tbName = "b")
     private String id;
@@ -83,6 +85,10 @@ public class UserVO   {
     @ApiModelProperty("银行卡")
     private String bankAccount;
 
+    @ZfireField(tbName = "b")
+    @ApiModelProperty("是否有快过期")
+    private IsYesNoEnum isOverdue;
+
 //    @ApiModelProperty("是否允许二手商城发布")
 //    private IsEnum isEs;
 

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -82,7 +82,7 @@ public interface CommonMapper {
      * @param isOK
      * @return
      */
-    public IPage<UserVO> userList(IPage page, @Param("ex") WorkerParamBean zfireParamBean, @Param("type") UserTypeEnum type, @Param("isOK") Boolean isOK);
+    public IPage<UserVO> userList(IPage page, @Param("ex") WorkerParamBean zfireParamBean, @Param("type") UserTypeEnum type);
 
 
     /**

mall-server-api/src/main/java/com/gree/mall/manager/enums/ExamineWorkerStatusEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 
 @Getter
 public enum ExamineWorkerStatusEnum implements BaseEnum {
-    WAIT_WORKER("WAIT_WORKER","待师傅购买"),
+    WAIT_WORKER("WAIT_WORKER","待购买"),
     POLICY_WAIT("POLICY_WAIT","保险待审核"),
     WAIT("WAIT","入驻待审核"),
     FAIL("FAIL","驳回"),

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

@@ -81,6 +81,12 @@ public class AgreementLogic {
     @Autowired
     UserService userService;
 
+    @Autowired
+    AdminWebsitService adminWebsitService;
+
+    @Autowired
+    SysDictCompanyService sysDictCompanyService;
+
 
     public IPage<AgreementVo> list(Page page, ZfireParamBean zfireParam) {
 
@@ -485,7 +491,7 @@ public class AgreementLogic {
                 MailboxSendRecordPolicy mailboxSendRecordPolicy = new MailboxSendRecordPolicy();
 
                 mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatId());
-                mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatName());
+                mailboxSendRecordPolicy.setCompanyWechatName(mailboxSendRecord.getCompanyWechatName());
                 mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getPolicyId());
                 mailboxSendRecordPolicy.setPolicyName(policyOrder.getWorkerName());
                 mailboxSendRecordPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -594,7 +600,7 @@ public class AgreementLogic {
 
                         //取师傅最后时间的后一天，小于保险时间就取保险时间
 
-                        Date startTime = new Date();
+                        Date startTime = DateUtil.offsetDay(new Date(),1);
 
                         if (!CollectionUtils.isEmpty(workerPolicies)){
                             startTime = DateUtil.beginOfDay(DateUtil.offsetDay(workerPolicies.get(0).getEndTime(),1));
@@ -697,7 +703,7 @@ public class AgreementLogic {
                             .in(PolicyOrder::getId, policyOrderId)
                             .set(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                             .set(PolicyOrder::getReceiptTime, new Date())
-                            .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey()).update();
+                            .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey()).update();
 
 
                 }
@@ -768,7 +774,7 @@ public class AgreementLogic {
         for (WebsitUser websitUser : websitUsersOk) {
             if (workerPolicyService.lambdaQuery().in(WorkerPolicy::getStatus, "BZZ")
                     .eq(WorkerPolicy::getWebsitUserId, websitUser.getId()).count() < 2) {
-                websitUser.setExamineStatus("POLICY_WAIT");
+                websitUser.setExamineStatus("WAIT_WORKER");
                 websitUser.updateById();
             }
         }
@@ -839,6 +845,11 @@ public class AgreementLogic {
             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();
 
         }
@@ -1047,11 +1058,104 @@ public class AgreementLogic {
         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().in(WorkerPolicy::getWebsitUserId, websitUserIds)
                 .eq(WorkerPolicy::getPolicyType,PolicyTypeEnum.IN.getKey())
                 .eq(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
-                .ge(WorkerPolicy::getEndTime,DateUtil.offsetDay(DateUtil.endOfDay(new Date()),-3))
+                .le(WorkerPolicy::getEndTime,DateUtil.offsetDay(DateUtil.endOfDay(new Date()),3))
                 .list();
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+                    .eq(PolicyOrder::getType,"IN").count() > 0) {
+                continue;
+            }
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            User user = userService.getById(websitUser.getUserId());
+
+            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
+                    .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
+
+
+            PolicyOrder policyOrder = new PolicyOrder();
+            policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
+            policyOrder.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
+            policyOrder.setPolicyOrderStatus(PolicyOrderInStutasEnum.DGM.getKey());
+            policyOrder.setPolicyName("工伤险");
+            policyOrder.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+            policyOrder.setCompanyWechatName(adminWebsit.getCompanyWechatName());
+            policyOrder.setPolicyId(IdWorker.getIdStr());
+            policyOrder.setId(policyOrder.getPolicyId());
+            policyOrder.setWebsitId(adminWebsit.getWebsitId());
+            policyOrder.setWebsitName(adminWebsit.getName());
+            policyOrder.setWorkerNumber(websitUser.getWorkerNumber());
+            policyOrder.setWorkerName(user.getNickName());
+            policyOrder.setWorkerIdcard(user.getIdCard());
+            policyOrder.setWorkerMobile(user.getMobile());
+            policyOrder.setBuyUnitId(adminWebsit.getInsureSteadUnit());
+            policyOrder.setBuyUnit(sysDictCompany.getDictValue());
+            policyOrder.setCompany(sysDictCompany.getDictValue());
+
+            policyOrder.setWebsitUserId(websitUser.getId());
+            policyOrder.setType("IN");
+            policyOrder.insert();
+
+
         }
     }
+
+    public void task7() {
+        Mailbox mailbox = mailboxService.getById(1);
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey()).list();
+
+        List<String> websitUserIds = websitUsers.stream().map(WebsitUser::getId).collect(Collectors.toList());
+
+
+        List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().in(WorkerPolicy::getWebsitUserId, websitUserIds)
+                .eq(WorkerPolicy::getPolicyType,PolicyTypeEnum.EM.getKey())
+                .eq(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
+                .le(WorkerPolicy::getEndTime,DateUtil.offsetDay(DateUtil.endOfDay(new Date()),mailbox.getOverNum()))
+                .list();
+
+        for (WorkerPolicy workerPolicy : workerPolicies) {
+
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+                    .eq(PolicyOrder::getType,"EM").count() > 0) {
+                continue;
+            }
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            User user = userService.getById(websitUser.getUserId());
+
+            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
+                    .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
+
+
+            PolicyOrder policyOrder = new PolicyOrder();
+            policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
+            policyOrder.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
+            policyOrder.setPolicyOrderStatus(PolicyOrderEmStutasEnum.XG.getKey());
+            policyOrder.setPolicyName("雇主险");
+            policyOrder.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+            policyOrder.setCompanyWechatName(adminWebsit.getCompanyWechatName());
+            policyOrder.setPolicyId(IdWorker.getIdStr());
+            policyOrder.setId(policyOrder.getPolicyId());
+            policyOrder.setWebsitId(adminWebsit.getWebsitId());
+            policyOrder.setWebsitName(adminWebsit.getName());
+            policyOrder.setWorkerNumber(websitUser.getWorkerNumber());
+            policyOrder.setWorkerName(user.getNickName());
+            policyOrder.setWorkerIdcard(user.getIdCard());
+            policyOrder.setWorkerMobile(user.getMobile());
+            policyOrder.setBuyUnitId(adminWebsit.getInsureSteadUnit());
+            policyOrder.setBuyUnit(sysDictCompany.getDictValue());
+            policyOrder.setCompany(sysDictCompany.getDictValue());
+
+            policyOrder.setWebsitUserId(websitUser.getId());
+            policyOrder.setType("EM");
+            policyOrder.insert();
+
+
+        }
+
+    }
 }

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

@@ -14,6 +14,7 @@ import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.PolicyOrderEmStutasEnum;
 import com.gree.mall.manager.enums.PolicyOrderStatusEnum;
+import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
@@ -22,8 +23,10 @@ import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.RemoteAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.rmi.RemoteException;
 import java.util.Date;
 import java.util.List;
 
@@ -52,6 +55,9 @@ public class PolicyOrderLogic {
     @Autowired
     WorkerPolicyService workerPolicyService;
 
+    @Autowired
+    UserService userService;
+
     public IPage<PolicyOrderVO> listPolicyOrder(Page page, ZfireParamBean zfireParam) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -137,6 +143,7 @@ public class PolicyOrderLogic {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void importData(List<Object> objects) {
 
         for (Object o : objects) {
@@ -145,7 +152,7 @@ public class PolicyOrderLogic {
 
             PolicyOrder policyOrder = policyOrderService.lambdaQuery()
                     .eq(PolicyOrder::getWebsitId, (String) row.get(1))
-                    .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
+                    .eq(PolicyOrder::getWorkerIdcard, (String) row.get(6))
                     .eq(PolicyOrder::getType, "IN")
                     .eq(PolicyOrder::getPolicyOrderStatus, "DGM").one();
 
@@ -153,7 +160,7 @@ public class PolicyOrderLogic {
                     .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
 
             if (policyOrder == null)
-                throw new RemoteAccessException((String) row.get(1)+"网点下工程师未找到"+(String) row.get(3));
+                throw new RemoteServiceException((String) row.get(1)+"网点下工程师未找到"+(String) row.get(6));
 
 
             if (policyOrder != null) {
@@ -179,7 +186,7 @@ public class PolicyOrderLogic {
 
                 if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
                     workerPolicy.setStatus("BZZ");
-                else if (new Date().after(policyOrder.getEndTime()))
+                else if (new Date().after(workerPolicy.getEndTime()))
                     workerPolicy.setStatus("YSX");
                 else {
                     workerPolicy.setStatus("DSX");
@@ -211,6 +218,7 @@ public class PolicyOrderLogic {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void importEm(List<Object> objects) {
 
         for (Object o : objects) {
@@ -218,8 +226,16 @@ public class PolicyOrderLogic {
 
             AdminWebsit adminWebsit = adminWebsitService.lambdaQuery().eq(AdminWebsit::getWebsitNumber, (String) row.get(1)).one();
 
-            WebsitUser websitUser = websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId, (String) row.get(1))
-                    .eq(WebsitUser::getWorkerNumber, (String) row.get(3)).one();
+            User user = userService.lambdaQuery().eq(User::getIdCard, (String) row.get(4))
+                    .one();
+
+            if (user == null)
+                throw new RemoteServiceException((String) row.get(4)+"身份证找不到对应师傅");
+
+            WebsitUser websitUser = websitUserService.lambdaQuery()
+                    .eq(WebsitUser::getWebsitId, (String) row.get(1))
+                    .eq(WebsitUser::getUserId, user.getUserId())
+                    .one();
 
 
 

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

@@ -854,7 +854,9 @@ public class WorkerManagerLogic {
         workerUserCount.setBxsp(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey())).count());
         workerUserCount.setZtzc(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OK.getKey())).count());
         workerUserCount.setYbh(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.FAIL.getKey())).count());
-        workerUserCount.setZjkgq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.EXPIRED.getKey())).count());
+
+        workerUserCount.setZjkgq(websitUsers.stream().filter(item -> item.getIsOverdue().equals(IsYesNoEnum.YES.getKey())).count());
+
         workerUserCount.setZjygq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OVERDUE.getKey())).count());
         workerUserCount.setYzt(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.STOP.getKey())).count());
         workerUserCount.setYlz(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.QUIT.getKey())).count());

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -114,17 +114,10 @@ public class UserLogic {
      */
     public IPage<UserVO> page2(WorkerParamBean userZfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        boolean isOK = false;
-        if (CollectionUtils.isNotEmpty(userZfireParamBean.getParams())) {
-            final long count = userZfireParamBean.getParams().stream()
-                    .filter(v -> v.getParam().equals("b.examine_status") && v.getValue().equals(ExamineStatusEnum.OK.getKey()))
-                    .count();
-            isOK = count > 0;
-        }
 
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
-        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, isOK);
+        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null);
         return userVOIPage;
     }
 
@@ -244,17 +237,9 @@ public class UserLogic {
             String  policy_order= (String) row.get(14);
             String policy_start_time = (String) row.get(15);
             String policy_end_time = (String) row.get(16);
-            String em_company = (String) row.get(17);
-            String  em_policy_name= (String) row.get(18);
-            String em_policy_order = (String) row.get(19);
-            String em_policy_start_time = (String) row.get(20);
-            String em_policy_end_time = (String) row.get(21);
-            String in_company = (String) row.get(22);
-            String in_policy_name = (String) row.get(23);
-            String  in_policy_order= (String) row.get(24);
-            String in_policy_start_time = (String) row.get(25);
-            String in_policy_end_time = (String) row.get(26);
-            if (StringUtils.isAnyBlank(name, mobile, websitNumber,workerNumber,idcard,idcardStartTime,idcardEndTime)) {
+
+
+            if (StringUtils.isAnyBlank(name, mobile, websitNumber,idcard,idcardStartTime,idcardEndTime)) {
                 throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
             }
             if (mobile.length() != 11) {
@@ -274,35 +259,78 @@ public class UserLogic {
                     throw new RemoteServiceException(errPrefix + "网点不存在");
                 }
             }
-            if (StringUtils.isBlank(workerNumber)) {
-                throw new RemoteServiceException(errPrefix + "师傅编号不能为空");
-            }
+
             UserWait userWait = new UserWait();
             userWait.setUserType(userTypeEnum.getKey());
             userWait.setMobile(mobile);
+            userWait.setIdcard(idcard);
 
-            if(websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId,adminWebsit.getWebsitId())
-            .eq(WebsitUser::getWorkerNumber,workerNumber).count() > 0)
-                throw new RemoteServiceException(workerNumber+"该师傅已有入驻信息");
+            List<User> userList = userService.lambdaQuery().eq(User::getIdCard, idcard).list();
+
+            if (!CollectionUtils.isEmpty(userList)) {
+
+                User user = userList.get(0);
+                if (websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId, adminWebsit.getWebsitId())
+                        .eq(WebsitUser::getUserId, user.getUserId()).count() > 0)
+                    throw new RemoteServiceException(idcard + "该师傅已有入驻信息");
+            }
 
 
             if (adminWebsit.getInsureType().equals("意外险,工伤险")) {
 
+                String in_company = row.size() > 22?(String) row.get(22):"";
+                String in_policy_name = row.size() > 22?(String) row.get(23):"";
+                String in_policy_order = row.size() > 22?(String) row.get(24):"";
+                String in_policy_start_time = row.size() > 22?(String) row.get(25):"";
+                String in_policy_end_time = row.size() > 22?(String) row.get(26):"";
+
+                if (!StringUtil.isEmpty(in_company)) {
+                    userWait.setInCompany(in_company);
+                    userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy-MM-dd"));
+                    userWait.setInPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy-MM-dd")),-1));
+                    if (userWait.getInPolicyEndTime().before(new Date()))
+                        throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
+                    userWait.setInPolicyName(in_policy_name);
+                    userWait.setInPolicyOrder(in_policy_order);
+                }
+
+
                 if (StringUtil.isEmpty(in_company))
-                    throw new RemoteServiceException(userWait.getWorkerNumber()+"必须导入工伤险");
+                    throw new RemoteServiceException(userWait.getIdcard()+"必须导入工伤险");
             }else {
+
+                String em_company = (String) row.get(17);
+                String  em_policy_name= (String) row.get(18);
+                String em_policy_order = (String) row.get(19);
+                String em_policy_start_time = (String) row.get(20);
+                String em_policy_end_time = (String) row.get(21);
+
+
+                if (!StringUtil.isEmpty(em_company)) {
+                    userWait.setEmCompany(em_company);
+                    userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy-MM-dd"));
+                    userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy-MM-dd")),-1));
+
+                    if (userWait.getEmPolicyEndTime().before(new Date()))
+                        throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
+                    userWait.setEmPolicyName(em_policy_name);
+                    userWait.setEmPolicyOrder(em_policy_order);
+                }
+
+
+
                 if (StringUtil.isEmpty(em_company))
-                    throw new RemoteServiceException(userWait.getEmCompany()+"必须导入雇主险");
+                    throw new RemoteServiceException(userWait.getIdcard()+"必须导入雇主险");
             }
 
 
             if (!StringUtil.isEmpty(company)) {
                 userWait.setCompany(company);
-                userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy/MM/dd"));
-                userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")),-1));
+                userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")),-1));
 
                 if (userWait.getPolicyEndTime().before(new Date()))
-                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
+                    throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
 
                 userWait.setPolicyName(policy_name);
                 userWait.setPolicyOrder(policy_order);
@@ -310,26 +338,6 @@ public class UserLogic {
                 throw new RemoteServiceException(userWait.getEmCompany()+"必须导入意外险");
             }
 
-            if (!StringUtil.isEmpty(em_company)) {
-                userWait.setEmCompany(em_company);
-                userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy/MM/dd"));
-                userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy/MM/dd")),-1));
-
-                if (userWait.getEmPolicyEndTime().before(new Date()))
-                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
-                userWait.setEmPolicyName(em_policy_name);
-                userWait.setEmPolicyOrder(em_policy_order);
-            }
-
-            if (!StringUtil.isEmpty(in_company)) {
-                userWait.setInCompany(in_company);
-                userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy/MM/dd"));
-                userWait.setInPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy/MM/dd")),-1));
-                if (userWait.getInPolicyEndTime().before(new Date()))
-                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
-                userWait.setInPolicyName(in_policy_name);
-                userWait.setInPolicyOrder(in_policy_order);
-            }
 
             if (Objects.nonNull(adminWebsit)) {
                 userWait.setWebsitId(adminWebsit.getWebsitId());
@@ -347,8 +355,8 @@ public class UserLogic {
 
             userWait.setName(name);
             userWait.setIdcard(idcard);
-            userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy/MM/dd"));
-            userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy/MM/dd"));
+            userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
+            userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy-MM-dd"));
             userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
             userWait.setCompanyWechatName(adminUser.getCompanyName());
             userWait.setBankAccount(brank);
@@ -356,9 +364,9 @@ public class UserLogic {
 
             if (!StringUtil.isEmpty(hightNumber)) {
                 userWait.setNumber(hightNumber);
-                userWait.setStartTime(DateUtil.parse(hightStartTime, "yyyy/MM/dd"));
-                userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy/MM/dd"));
-                userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy/MM/dd"));
+                userWait.setStartTime(DateUtil.parse(hightStartTime, "yyyy-MM-dd"));
+                userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy-MM-dd"));
+                userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy-MM-dd"));
             }
 
 

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

@@ -65,4 +65,10 @@ public class InsureEmailSchedule {
     public void task6(){
         agreementLogic.task6();
     }
+
+    //雇主提前设置天数续保
+    @Scheduled(fixedDelay = 60* 1000)
+    public void task7(){
+        agreementLogic.task7();
+    }
 }

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

@@ -41,7 +41,7 @@ public class SyncSchedule {
 
 
     //同步工单数据
-    @Scheduled(fixedDelay = 5* 1000)
+   // @Scheduled(fixedDelay = 5* 1000)
     public void task3() throws IOException, MessagingException {
         syncOrderInfoLogic.task3();
     }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -100,9 +100,6 @@
             </foreach>
         </if>
         and a.apply_type='WORKER'
-        <if test="isOK != null and isOK == true">
-            AND a.worker_number IS NOT NULL
-        </if>
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>