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 implem @Transactional(rollbackFor = Exception.class) public Result insertUserList(MultipartFile file,Map 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 userExcelList = ExcelImportUtil.importExcel(f, UserExcel.class, importParams); @@ -977,16 +988,18 @@ public class UserServiceImpl extends BaseServiceImpl implem if (!parentAndAllDeptDTOResult.success()) { return new Result().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");