|
|
@@ -5,19 +5,18 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
|
import com.xjrsoft.module.base.entity.*;
|
|
|
import com.xjrsoft.module.base.mapper.*;
|
|
|
+import com.xjrsoft.module.internship.entity.InternshipPlanManage;
|
|
|
+import com.xjrsoft.module.internship.mapper.InternshipPlanManageMapper;
|
|
|
import com.xjrsoft.module.organization.entity.User;
|
|
|
import com.xjrsoft.module.organization.mapper.UserMapper;
|
|
|
import com.xjrsoft.module.system.mapper.DictionarydetailMapper;
|
|
|
import com.xjrsoft.module.system.mapper.DictionaryitemMapper;
|
|
|
-import com.xjrsoft.module.veb.entity.InternshipPlanManage;
|
|
|
import com.xjrsoft.module.veb.entity.InternshipPlanManageParticipant;
|
|
|
import com.xjrsoft.module.veb.entity.TrainingOutside;
|
|
|
import com.xjrsoft.module.veb.entity.TrainingSchool;
|
|
|
-import com.xjrsoft.module.veb.mapper.InternshipPlanManageMapper;
|
|
|
import com.xjrsoft.module.veb.mapper.InternshipPlanManageParticipantMapper;
|
|
|
import com.xjrsoft.module.veb.mapper.TrainingOutsideMapper;
|
|
|
import com.xjrsoft.module.veb.mapper.TrainingSchoolMapper;
|
|
|
@@ -31,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
@@ -425,7 +425,7 @@ public class ImportRubAndHandServiceImpl implements ImportRubAndHandService {
|
|
|
row)) {
|
|
|
return sb.toString();
|
|
|
}
|
|
|
- internshipPlanManage.setCreateDate(new Date());
|
|
|
+ internshipPlanManage.setCreateDate(LocalDateTime.now());
|
|
|
internshipPlanManage.setCreateUserId(StpUtil.getLoginIdAsLong());
|
|
|
internshipPlanManageMap.put(key, internshipPlanManage);
|
|
|
} else {
|
