‘linchangsheng’ 3 月之前
父節點
當前提交
b924f07862

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

@@ -252,7 +252,8 @@ public class PolicyOrderLogic {
                 policyOrder.setBuyUnitId(sysDictCompany.getDictCode());
 
 
-
+                if (policyOrder.getStartTime().before(policyOrder.getEndTime()))
+                    throw new RemoteServiceException(policyOrder.getWorkerIdcard()+"开始时间不能大于结束时间");
 
                 if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
                     policyOrder.setPolicyOrderStatus("BZZ");
@@ -307,6 +308,9 @@ public class PolicyOrderLogic {
                 policyOrderup.setClassWebsitName((String)row.get(12));
                 policyOrderup.setPayAmount(Convert.toBigDecimal(row.get(8)));
 
+                if (policyOrder.getStartTime().before(policyOrder.getEndTime()))
+                    throw new RemoteServiceException(policyOrder.getWorkerIdcard()+"开始时间不能大于结束时间");
+
 
                 if (new Date().after(policyOrderup.getStartTime()) && new Date().before(policyOrderup.getEndTime()))
                     policyOrderup.setPolicyOrderStatus("BZZ");
@@ -463,6 +467,9 @@ public class PolicyOrderLogic {
 
             policyOrder.setType("EM");
 
+            if (policyOrder.getStartTime().before(policyOrder.getEndTime()))
+                throw new RemoteServiceException((String) row.get(4)+"开始时间不能大于结束时间");
+
             if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
                 policyOrder.setPolicyOrderStatus("BZZ");
             else if (new Date().after(policyOrder.getEndTime()))

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

@@ -886,6 +886,10 @@ public class WorkerManagerLogic {
             throw new RemoteServiceException("请填工程师意外险");
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
+
+            if (workerPolicy.getStartTime().before(workerPolicy.getEndTime()))
+                throw new RemoteServiceException(workerPolicy.getWorkerName()+"意外开始时间不能大于结束时间");
+
             if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                 workerPolicy.setStatus("BZZ");
             }else {
@@ -941,6 +945,10 @@ public class WorkerManagerLogic {
                 throw new RemoteServiceException("工伤险有相同覆盖范围内的保险");
 
             for (WorkerPolicy workerPolicy : workerPoliciesIn) {
+
+                if (workerPolicy.getStartTime().before(workerPolicy.getEndTime()))
+                    throw new RemoteServiceException(workerPolicy.getWorkerName()+"工伤开始时间不能大于结束时间");
+
                 if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");
                 }else {
@@ -971,6 +979,11 @@ public class WorkerManagerLogic {
 
 
             for (WorkerPolicy workerPolicy : workerPoliciesEm) {
+
+                if (workerPolicy.getStartTime().before(workerPolicy.getEndTime()))
+                    throw new RemoteServiceException(workerPolicy.getWorkerName()+"雇主开始时间不能大于结束时间");
+
+
                 if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");
                 }else {