修改时间

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 {

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");