‘linchangsheng’ 5 months ago
parent
commit
1c37505124

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

@@ -291,8 +291,8 @@ public class UserLogic {
 
             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()+"导入师傅保险已过期");
@@ -305,8 +305,8 @@ public class UserLogic {
 
             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));
+                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()+"导入师傅保险已过期");
@@ -316,8 +316,8 @@ public class UserLogic {
 
             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));
+                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);
@@ -340,8 +340,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);
@@ -349,9 +349,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"));
             }
 
 

BIN
mall-server-api/src/main/resources/template/工伤险购买明细模板.xlsx


BIN
mall-server-api/src/main/resources/template/师傅资料初始化模板.xlsx


BIN
mall-server-api/src/main/resources/template/雇主险导入.xlsx