需求

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

@@ -220,7 +220,7 @@ public class WorkerManagerLogic {
         workerManagerBean.getUser().updateById();
 
 
-        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
 
         workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
 
@@ -244,9 +244,11 @@ public class WorkerManagerLogic {
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
-            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
         }
 
+
+        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
 
@@ -287,7 +289,8 @@ public class WorkerManagerLogic {
                     WebsitUserLog websitUserLog = new WebsitUserLog();
 
                     websitUserLog.setTypeText("更改保险日期");
-                    websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
+                    websitUserLog.setOpRemark("原保险时间为"+ DateUtil.format(workerPolicyOne.getStartTime(),"yyyy-MM-dd")+","+
+                            DateUtil.format(workerPolicyOne.getEndTime(),"yyyy-MM-dd")+"，变更为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
                             DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
 
                     websitUserLog.setWebsitUserId(workerPolicy.getWebsitUserId());
@@ -414,7 +417,7 @@ public class WorkerManagerLogic {
 
                 workerPolicy.setEndTime(DateUtil.offsetDay(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
 
-                if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
+                if (DateUtil.endOfDay(workerPolicy.getEndTime()).after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");
                 } else {
                     workerPolicy.setStatus("DSX");
@@ -737,7 +740,6 @@ public class WorkerManagerLogic {
 
 
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
-            workerPolicy.setEndTime(DateUtil.offsetMillisecond(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
         }