需求

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

@@ -800,9 +800,16 @@ public class AgreementLogic {
                 websitUser.updateById();
             }
         }
+        List<WebsitUser> websitUsersOk = websitUserService.lambdaQuery().eq(WebsitUser::getExamineStatus, "OK").list();
 
+        for (WebsitUser websitUser : websitUsers) {
+            if (workerPolicyService.lambdaQuery().in(WorkerPolicy::getStatus, "BZZ")
+                    .eq(WorkerPolicy::getWebsitUserId, websitUser.getId()).count() < 2) {
+                websitUser.setExamineStatus("POLICY_WAIT");
+                websitUser.updateById();
+            }
+        }
     }
 
-    public void huizhi() {
-    }
+
 }

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

@@ -151,7 +151,6 @@ public class WorkerManagerLogic {
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkerManagerBean workerManagerBean) {
         workerManagerBean.setCreateTime(null);
-
         User user = userService.getById(workerManagerBean.getUserId());
 
         if (!StringUtil.isEmpty(user.getWorkerNumber())){
@@ -160,13 +159,22 @@ public class WorkerManagerLogic {
             }
         }
 
+
+
         if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getWorkerNumber())
                 .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
             throw new RemoteServiceException("已有该师傅编号");
 
+
+        workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());
+        workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
+
         workerManagerBean.updateById();
 
 
+        workerManagerBean.getUser().updateById();
+
+
         this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
 
         workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
@@ -275,6 +283,7 @@ public class WorkerManagerLogic {
 
         workerManagerBean.setCreateTime(null);
 
+
         workerManagerBean.setExamineBy(adminUser.getNickName());
         workerManagerBean.setExamineTime(new Date());
 
@@ -286,16 +295,18 @@ public class WorkerManagerLogic {
                 throw new RemoteServiceException("师傅编号已经录入不允许更改");
             }
         }
-        if (StringUtil.isEmpty(workerManagerBean.getWorkerNumber()))
+        if (StringUtil.isEmpty(workerManagerBean.getUser().getWorkerNumber()))
             throw new RemoteServiceException("师傅编号不能为空");
 
 
-        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getWorkerNumber())
+        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getUser().getWorkerNumber())
                 .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
             throw new RemoteServiceException("已有该师傅编号");
 
 
-        workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
+        workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());
+        workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
+
 
         workerManagerBean.updateById();
 
@@ -367,6 +378,13 @@ public class WorkerManagerLogic {
 
 
             if (adminWebsit.getInsureType().equals("意外险,工伤险")) {
+
+                if (workerManagerBean.getWorkerPolicies().stream()
+                        .filter(item -> item.getPolicyType().equals("EM") && item.getStatus().equals("BZZ")).count() > 0) {
+                    throw new RemoteServiceException("该网点未配置雇主保险");
+                }
+
+
                 List<WorkerPolicy> workerPoliciesIn = workerManagerBean.getWorkerPolicies().stream()
                         .filter(item -> item.getPolicyType().equals("IN")).collect(Collectors.toList());
 
@@ -381,6 +399,14 @@ public class WorkerManagerLogic {
                 }
 
             } else {
+
+
+                if (workerManagerBean.getWorkerPolicies().stream()
+                        .filter(item -> item.getPolicyType().equals("IN") && item.getStatus().equals("BZZ")).count() > 0) {
+                    throw new RemoteServiceException("该网点未配置工伤保险");
+                }
+
+
                 List<WorkerPolicy> workerPoliciesEm = workerManagerBean.getWorkerPolicies().stream()
                         .filter(item -> item.getPolicyType().equals("EM")).collect(Collectors.toList());
 
@@ -593,6 +619,10 @@ public class WorkerManagerLogic {
         workerManagerBean.setPolicyExamineTime(new Date());
 
 
+        workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());
+        workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
+
+
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
         if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey()))
@@ -664,6 +694,13 @@ public class WorkerManagerLogic {
 
 
         if (adminWebsit.getInsureType().equals("意外险,工伤险")) {
+
+            if (workerManagerBean.getWorkerPolicies().stream()
+                    .filter(item -> item.getPolicyType().equals("EM") && item.getStatus().equals("BZZ")).count() > 0) {
+                throw new RemoteServiceException("该网点未配置雇主保险");
+            }
+
+
             List<WorkerPolicy> workerPoliciesIn = workerManagerBean.getWorkerPolicies().stream()
                     .filter(item -> item.getPolicyType().equals("IN")).collect(Collectors.toList());
 
@@ -688,6 +725,11 @@ public class WorkerManagerLogic {
             }
 
         } else {
+
+            if (workerManagerBean.getWorkerPolicies().stream()
+                    .filter(item -> item.getPolicyType().equals("IN") && item.getStatus().equals("BZZ")).count() > 0) {
+                throw new RemoteServiceException("该网点未配置工伤保险");
+            }
             List<WorkerPolicy> workerPoliciesEm = workerManagerBean.getWorkerPolicies().stream()
                     .filter(item -> item.getPolicyType().equals("EM")).collect(Collectors.toList());
 

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

@@ -323,7 +323,7 @@
             and a.order_status = #{ex.orderStatus.key}
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='YCD'.toString()">
-            and a.is_exception =1
+            and a.is_exception =1 and a.order_status NOT IN ('YWG','YJS')
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DYY'.toString()">
             and a.appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD')