diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusImportServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusImportServiceImpl.java index d6427af..8e0ab8f 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusImportServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusImportServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.cus.service.impl; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; @@ -176,8 +177,8 @@ public class CusImportServiceImpl implements ICusImportService { customer.setDeptId(thisUser.getDeptId()); } customer.setFollowStep(customerInfo.getFollowStep()); - customer.setCreateTime(new Date()); - customer.setUpdateTime(new Date()); + customer.setCreateTime(StringUtils.isEmpty(customerInfo.getCreateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getCreateTime())); + customer.setUpdateTime(StringUtils.isEmpty(customerInfo.getUpdateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getUpdateTime())); customer.setRemark(customerInfo.getCusRemark()); cusMainList.add(customer); @@ -191,7 +192,7 @@ public class CusImportServiceImpl implements ICusImportService { companyInfo.setBusiType(customerInfo.getBusinessType()); companyInfo.setContactAddress(customerInfo.getContactAddress()); companyInfo.setCreator(customerInfo.getCreateBy()); - companyInfo.setCreateTime(new Date()); + companyInfo.setCreateTime(StringUtils.isEmpty(customerInfo.getCreateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getCreateTime())); cusCompanyList.add(companyInfo); // 提取客户管理信息表 CusManager @@ -203,7 +204,7 @@ public class CusImportServiceImpl implements ICusImportService { managementInfo.setSeasGroup(customerInfo.getSeasGroup()); managementInfo.setOldDept(customerInfo.getOldDept()); managementInfo.setCreator(customerInfo.getCreateBy()); - managementInfo.setCreateTime(new Date()); + managementInfo.setCreateTime(StringUtils.isEmpty(customerInfo.getCreateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getCreateTime())); cusManagerList.add(managementInfo); //客户时间轴信息 @@ -226,10 +227,8 @@ public class CusImportServiceImpl implements ICusImportService { customerContact.setEmail(contact.getEmail()); customerContact.setTelephone(contact.getTelephone()); customerContact.setSex(contact.getSex()); - customerContact.setBirthday(new Date()); customerContact.setWhatsApp(contact.getWhatsApp()); customerContact.setCreator(contact.getCreateBy()); - customerContact.setCreateTime(new Date()); cusContactsList.add(customerContact); } @@ -330,8 +329,8 @@ public class CusImportServiceImpl implements ICusImportService { customer.setMainProds(customerInfo.getMainProds()); customer.setSiteUrl(customerInfo.getSiteUrl()); customer.setCreator(customerInfo.getCreateBy()); - customer.setCreateTime(new Date()); - customer.setUpdateTime(new Date()); + customer.setCreateTime(StringUtils.isEmpty(customerInfo.getCreateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getCreateTime())); + customer.setUpdateTime(StringUtils.isEmpty(customerInfo.getUpdateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getUpdateTime())); customer.setUserName(customerInfo.getUserName()); if(userMap.containsKey(customerInfo.getUserName())){ SysUser thisUser = userMap.get(customerInfo.getUserName()).get(0); @@ -364,7 +363,7 @@ public class CusImportServiceImpl implements ICusImportService { managementInfo.setSeasGroup(customerInfo.getSeasGroup()); managementInfo.setOldDept(customerInfo.getOldDept()); managementInfo.setCreator(customerInfo.getCreateBy()); - managementInfo.setCreateTime(new Date()); + customer.setCreateTime(StringUtils.isEmpty(customerInfo.getCreateTime())? new Date() :DateUtil.parseDateTime(customerInfo.getCreateTime())); cusManagerList.add(managementInfo); //客户时间轴信息 @@ -387,10 +386,8 @@ public class CusImportServiceImpl implements ICusImportService { customerContact.setEmail(contact.getEmail()); customerContact.setTelephone(contact.getTelephone()); customerContact.setSex(contact.getSex()); - customerContact.setBirthday(new Date()); customerContact.setWhatsApp(contact.getWhatsApp()); customerContact.setCreator(contact.getCreateBy()); - customerContact.setCreateTime(new Date()); cusContactsList.add(customerContact); }