Browse Source

导入优化

guarantee-lsq 2 years ago
parent
commit
b4e7b6e12a

+ 3 - 0
platform-office/src/main/java/com/platform/office/poi/excel/imports/CellValueServer.java

@@ -175,6 +175,9 @@ public class CellValueServer {
             result = replaceValue(entity.getReplace(), result);
         }
         result = hanlderValue(dataHanlder, object, result, titleString);
+        if("class java.time.LocalDate".equals(xclass) && "".equals(result)){
+            result = null;
+        }
         System.out.println("-------------result----------------"+result + "------" + xclass);
         return getValueByType(xclass, result, entity);
     }

+ 9 - 9
platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -1,6 +1,7 @@
 package com.platform.service.store.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.enums.DataFilterTypeEnum;
@@ -9,32 +10,31 @@ import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.dto.store.*;
 import com.platform.dao.dto.store.OutStoreDetailDTO;
-import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.dto.store.OutStoreFormDTO;
+import com.platform.dao.dto.store.SparePickFormDTO;
 import com.platform.dao.entity.sb.SbOil;
 import com.platform.dao.entity.store.*;
-import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
-import com.platform.dao.vo.query.store.*;
-import com.platform.dao.vo.sb.SbInfoVO;
+import com.platform.dao.vo.query.store.OutStoreFormVO;
+import com.platform.dao.vo.query.store.SparePickDetailVO;
+import com.platform.dao.vo.query.store.StoreCheckJobVO;
+import com.platform.dao.vo.query.store.StoreVO;
+import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
-import com.platform.service.store.InStoreFormService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.store.StoreService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;