From 034dbc8e51bf9aca30c7018fa75f47a236e70689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 17 Feb 2020 11:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartyMembersServiceImpl.java   |  2 +-
 .../esua/epdc/service/impl/UserServiceImpl.java | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index a161256ec..b507b5fc5 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -361,7 +361,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
             partyMembersEntity.setParentDeptIds(userItem.getParentDeptIds());
             partyMembersEntity.setParentDeptNames(userItem.getParentDeptNames());
             partyMembersEntity.setDeptId(userItem.getDeptId());
-            partyMembersEntity.setRegistTime(new Date());
+            partyMembersEntity.setRegistTime(userItem.getRegisterTime());
             if (partyMembersEntity.getId() != null) {
                 partyMembersEntityList.add(partyMembersEntity);
             } else {
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 1e526513c..f1905abea 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -75,6 +75,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -969,6 +971,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Transactional(rollbackFor = Exception.class)
     public Result insertUserList(MultipartFile file,Map<String, Object> params) {
         Long gridId = Long.parseLong((String) params.get("gridId"));
+        String time = (String) params.get("time");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        try {
+            date = simpleDateFormat.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
         File f = StreamUtils.conversionFile(file);
         ImportParams importParams = new ImportParams();
         List<UserExcel> userExcelList = ExcelImportUtil.importExcel(f, UserExcel.class, importParams);
@@ -977,16 +988,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (!parentAndAllDeptDTOResult.success()) {
             return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
         }
+        int i=0;
         for(UserEntity userItem: userEntities){
             userItem.setNickname(userItem.getRealName());
-            userItem.setRegisterTime(new Date());
-            userItem.setLastLoginTime(new Date());
+            userItem.setRegisterTime(date);
+            userItem.setLastLoginTime(date);
             userItem.setLastLoginIp("219.146.91.110");
             userItem.setCreatedBy("0");
             userItem.setCreatedTime(new Date());
             userItem.setIdentityNo(userItem.getIdentityNo().trim());
             userItem.setRealName(userItem.getRealName().trim());
             userItem.setMobile(userItem.getMobile().trim());
+            userItem.setWxOpenId("taidong_"+time+""+(i++));
             userItem.setDeptId(gridId);
             userItem.setPartyFlag("1");
             userItem.setState("3");