diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java index f10d3c69..29b6fb85 100644 --- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java @@ -28,7 +28,7 @@ public class EquipmentDataDetail { private String value8; private String value9; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String createDate; + private Date createDate; private Date createBy; private String photoValue1; //批次号 diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java index 3c2291d3..060d6eb4 100644 --- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java @@ -18,7 +18,7 @@ public class EquipmentFolderLocation { private String buNo; private String itemNo; private String backupFolderPath; - + private String batchDate; //文件编号 private String fileNo; diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java index 354effa5..a57c10c8 100644 --- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java @@ -11,6 +11,7 @@ import com.xujie.sys.modules.reader.service.EquipmentFolderLocationService; import com.xujie.sys.modules.reader.service.GetInformationForExcelService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,6 +22,7 @@ import java.io.FileReader; import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; @@ -97,7 +99,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpltime){ + batchNo = equipments.get(equipments.size() - 1).getBatchNo() + 1; + }else { + batchNo = equipments.get(equipments.size() - 1).getBatchNo(); + } } //对图片保存 if (CollectionUtils.isNotEmpty(imageFiles)){ @@ -276,6 +288,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl