From 7be8384fbc39e1236e67eeca6fe9d613f8cd86cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 26 Jan 2026 10:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9A=84=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=92=8C=E5=BC=80=E5=A7=8B=E8=B4=A8=E4=BF=9D?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=94=B1LocalDate=E6=94=B9?= =?UTF-8?q?=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/DeviceController.java | 16 +++++------ .../admin/pojo/vo/CmrDeviceResultVO.java | 8 ++---- .../admin/service/AdminDeviceService.java | 25 ++--------------- .../common/util/DateTimeUtil.java | 13 +++------ .../gongfu/controller/DeviceController.java | 16 +++++------ .../gongfu/pojo/vo/CmrDeviceResultVO.java | 8 ++---- .../gongfu/service/AdminDeviceService.java | 28 ++----------------- .../gongfu/service/CrmService.java | 7 ++--- .../repository/entity/Device.java | 4 +-- .../repository/entity/GongfuDevice.java | 4 +-- 10 files changed, 34 insertions(+), 95 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 31472ef7..6e244ed6 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -390,8 +390,8 @@ public class DeviceController extends ControllerBase { } if (StrUtil.isNotBlank(dto.getShipmentDate())) { try { - LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setShipmentDate(dto.getShipmentDate()); + LocalDate date = LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + device.setShipmentDate(DateTimeUtil.asSystemDate(date)); } catch (DateTimeParseException e) { sb.append("发货日期无效;"); } @@ -399,7 +399,7 @@ public class DeviceController extends ControllerBase { if (StrUtil.isNotBlank(dto.getStartWarrantyDate())) { try { LocalDate date = LocalDate.parse(dto.getStartWarrantyDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setStartWarrantyDate(dto.getStartWarrantyDate()); + device.setStartWarrantyDate(DateTimeUtil.asSystemDate(date)); if (StrUtil.isBlank(dto.getWarrantyMonth())) { sb.append("质保期不能为空;"); } else { @@ -487,8 +487,8 @@ public class DeviceController extends ControllerBase { dto.setAgentName(d.getAgentName()); dto.setAreaName(d.getAreaName()); dto.setAddress(d.getAddress()); - dto.setShipmentDate(d.getShipmentDate()); - dto.setStartWarrantyDate(d.getStartWarrantyDate()); + dto.setShipmentDate(DateTimeUtil.format(d.getShipmentDate(), "yyyy-MM-dd")); + dto.setStartWarrantyDate(DateTimeUtil.format(d.getStartWarrantyDate(), "yyyy-MM-dd")); if (Objects.nonNull(d.getWarrantyMonth())) { dto.setWarrantyMonth(String.valueOf(d.getWarrantyMonth())); } @@ -620,8 +620,8 @@ public class DeviceController extends ControllerBase { } if (StrUtil.isNotBlank(dto.getShipmentDate())) { try { - LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setShipmentDate(dto.getShipmentDate()); + LocalDate date = LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + device.setShipmentDate(DateTimeUtil.asSystemDate(date)); } catch (DateTimeParseException e) { sb.append("发货日期无效;"); } @@ -631,7 +631,7 @@ public class DeviceController extends ControllerBase { if (StrUtil.isNotBlank(dto.getStartWarrantyDate())) { try { LocalDate date = LocalDate.parse(dto.getStartWarrantyDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setStartWarrantyDate(dto.getStartWarrantyDate()); + device.setStartWarrantyDate(DateTimeUtil.asSystemDate(date)); if (StrUtil.isBlank(dto.getWarrantyMonth())) { sb.append("质保期不能为空;"); } else { diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/CmrDeviceResultVO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/CmrDeviceResultVO.java index be2ccb3a..4d16f538 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/CmrDeviceResultVO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/CmrDeviceResultVO.java @@ -1,10 +1,8 @@ package com.nflg.mobilebroken.admin.pojo.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.time.LocalDate; -import java.time.OffsetDateTime; /** * CRM-设备信息 @@ -39,14 +37,12 @@ public class CmrDeviceResultVO { /** * 发货日期 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ") - private OffsetDateTime LastCarDevliverDate__c; + private LocalDate LastCarDevliverDate__c; /** * 质保开始日期 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ") - private OffsetDateTime WarrantyStartDate__c; + private LocalDate WarrantyStartDate__c; /** * 质保期（月） diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java index d3c3b58f..35b5a521 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java @@ -14,14 +14,11 @@ import com.nflg.mobilebroken.admin.pojo.vo.DeviceExcelVO; import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.util.AdminUserUtil; -import com.nflg.mobilebroken.common.util.DateTimeUtil; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.Device; -import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.entity.GongfuDevice; import com.nflg.mobilebroken.repository.entity.TBaseCustomer; import com.nflg.mobilebroken.repository.service.IDeviceService; -import com.nflg.mobilebroken.repository.service.IDictionaryItemService; import com.nflg.mobilebroken.repository.service.IGongfuDeviceService; import com.nflg.mobilebroken.repository.service.ITBaseCustomerService; import lombok.extern.slf4j.Slf4j; @@ -30,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -56,9 +52,6 @@ public class AdminDeviceService { @Resource private ITBaseCustomerService customerService; - @Resource - IDictionaryItemService dictionaryItemService; - @Transactional(rollbackFor = Exception.class) public void add(DeviceDTO deviceDTO) { Device device = Convert.convert(Device.class, deviceDTO); @@ -149,7 +142,6 @@ public class AdminDeviceService { List agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list(); Set deviceNos = new HashSet<>(); - List warrantyStates = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_DEVICE_WARRANTY_STATE); crmDeviceList.forEach(u -> { if (StrUtil.isBlank(u.getProductLine__c()) || StrUtil.isBlank(u.getAssetProductLine3__c()) || StrUtil.isBlank(u.getAssetProductLine4__c())) { log.info("跳过没有产品线或设备类型的设备"); @@ -195,22 +187,9 @@ public class AdminDeviceService { } ent.setSourceFrom(DeviceSourceFromEnum.FROM_CRM.getSourceKey()); ent.setProductLine(u.getProductLine__c()); - if (Objects.nonNull(u.getLastCarDevliverDate__c())) { - ent.setShipmentDate(DateTimeUtil.asSystemDateTime(u.getLastCarDevliverDate__c()).format(DateTimeFormatter.ISO_LOCAL_DATE)); - } + ent.setShipmentDate(u.getLastCarDevliverDate__c()); + ent.setStartWarrantyDate(u.getWarrantyStartDate__c()); ent.setWarrantyMonth(u.getWarrantyPeriod1__c()); - if (Objects.nonNull(u.getWarrantyStartDate__c())) { - LocalDateTime warrantyStartDate=DateTimeUtil.asSystemDateTime(u.getWarrantyStartDate__c()); - ent.setStartWarrantyDate(warrantyStartDate.format(DateTimeFormatter.ISO_LOCAL_DATE)); - LocalDateTime now=LocalDateTime.now(); - if (now.isBefore(warrantyStartDate)){ - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "NotStarted")).findFirst().get().getId()); - }else if (now.isAfter(warrantyStartDate.plusMonths(ent.getWarrantyMonth()))){ - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "OutsideWarranty")).findFirst().get().getId()); - }else { - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "WithinWarranty")).findFirst().get().getId()); - } - } if (Objects.nonNull(u.getAgent__r())) { TBaseCustomer customer = agents.stream() .filter(agent -> agent.getAgencyCompanyCode().equals(u.getAgent__r().getId())) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java index 63321d7b..8fddfd05 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java @@ -2,7 +2,10 @@ package com.nflg.mobilebroken.common.util; import cn.hutool.core.date.DatePattern; -import java.time.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.Objects; @@ -50,14 +53,6 @@ public class DateTimeUtil { .toLocalDateTime(); } - public static LocalDateTime asSystemDateTime(OffsetDateTime datetime) { - if (Objects.isNull(datetime)) { - return null; - } - return datetime.atZoneSameInstant(ZoneId.systemDefault()) - .toLocalDateTime(); - } - public static LocalDate parse(String dateStr) { return LocalDate.parse(dateStr, DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)); } diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java index 98e2fe0f..206886db 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java @@ -393,8 +393,8 @@ public class DeviceController extends ControllerBase { } if (StrUtil.isNotBlank(dto.getShipmentDate())) { try { - LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setShipmentDate(dto.getShipmentDate()); + LocalDate date = LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + device.setShipmentDate(DateTimeUtil.asSystemDate(date)); } catch (DateTimeParseException e) { sb.append("发货日期无效;"); } @@ -402,7 +402,7 @@ public class DeviceController extends ControllerBase { if (StrUtil.isNotBlank(dto.getStartWarrantyDate())) { try { LocalDate date = LocalDate.parse(dto.getStartWarrantyDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setStartWarrantyDate(dto.getStartWarrantyDate()); + device.setStartWarrantyDate(DateTimeUtil.asSystemDate(date)); if (StrUtil.isBlank(dto.getWarrantyMonth())) { sb.append("质保期不能为空;"); } else { @@ -506,8 +506,8 @@ public class DeviceController extends ControllerBase { dto.setCustomerName(d.getCustomerName()); dto.setAgentName(d.getAgentName()); dto.setAreaName(d.getAreaName()); - dto.setShipmentDate(d.getShipmentDate()); - dto.setStartWarrantyDate(d.getStartWarrantyDate()); + dto.setShipmentDate(DateTimeUtil.format(d.getShipmentDate(), "yyyy-MM-dd")); + dto.setStartWarrantyDate(DateTimeUtil.format(d.getStartWarrantyDate(), "yyyy-MM-dd")); if (Objects.nonNull(d.getWarrantyMonth())) { dto.setWarrantyMonth(String.valueOf(d.getWarrantyMonth())); } @@ -648,8 +648,8 @@ public class DeviceController extends ControllerBase { } if (StrUtil.isNotBlank(dto.getShipmentDate())) { try { - LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setShipmentDate(dto.getShipmentDate()); + LocalDate date = LocalDate.parse(dto.getShipmentDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + device.setShipmentDate(DateTimeUtil.asSystemDate(date)); } catch (DateTimeParseException e) { sb.append("发货日期无效;"); } @@ -659,7 +659,7 @@ public class DeviceController extends ControllerBase { if (StrUtil.isNotBlank(dto.getStartWarrantyDate())) { try { LocalDate date = LocalDate.parse(dto.getStartWarrantyDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); - device.setStartWarrantyDate(dto.getStartWarrantyDate()); + device.setStartWarrantyDate(DateTimeUtil.asSystemDate(date)); if (StrUtil.isBlank(dto.getWarrantyMonth())) { sb.append("质保期不能为空;"); } else { diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/vo/CmrDeviceResultVO.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/vo/CmrDeviceResultVO.java index 9c304e8f..823f7477 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/vo/CmrDeviceResultVO.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/vo/CmrDeviceResultVO.java @@ -1,10 +1,8 @@ package com.nflg.mobilebroken.gongfu.pojo.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.time.LocalDate; -import java.time.OffsetDateTime; /** * CRM-设备信息 @@ -39,14 +37,12 @@ public class CmrDeviceResultVO { /** * 发货日期 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ") - private OffsetDateTime LastCarDevliverDate__c; + private LocalDate LastCarDevliverDate__c; /** * 质保开始日期 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ") - private OffsetDateTime WarrantyStartDate__c; + private LocalDate WarrantyStartDate__c; /** * 质保期（月） diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java index ef506a6e..1aad402c 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java @@ -7,21 +7,16 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.google.common.collect.ImmutableList; import com.nflg.mobilebroken.common.constant.Constant; -import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.util.AdminUserUtil; -import com.nflg.mobilebroken.common.util.DateTimeUtil; -import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.gongfu.constant.Constant1; import com.nflg.mobilebroken.gongfu.constant.DeviceSourceFromEnum; import com.nflg.mobilebroken.gongfu.pojo.dto.DeviceDTO; import com.nflg.mobilebroken.gongfu.pojo.dto.SyncFromCrmDTO; import com.nflg.mobilebroken.gongfu.pojo.vo.CmrDeviceResultVO; import com.nflg.mobilebroken.repository.entity.Device; -import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.entity.GongfuDevice; import com.nflg.mobilebroken.repository.entity.TBaseCustomer; import com.nflg.mobilebroken.repository.service.IDeviceService; -import com.nflg.mobilebroken.repository.service.IDictionaryItemService; import com.nflg.mobilebroken.repository.service.IGongfuDeviceService; import com.nflg.mobilebroken.repository.service.ITBaseCustomerService; import lombok.extern.slf4j.Slf4j; @@ -30,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -56,9 +50,6 @@ public class AdminDeviceService { @Resource private ITBaseCustomerService customerService; - @Resource - IDictionaryItemService dictionaryItemService; - @Transactional(rollbackFor = Exception.class) public void add(DeviceDTO deviceDTO) { GongfuDevice device = Convert.convert(GongfuDevice.class, deviceDTO); @@ -157,7 +148,6 @@ public class AdminDeviceService { List agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list(); Set deviceNos = new HashSet<>(); - List warrantyStates = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_DEVICE_WARRANTY_STATE); crmDeviceList.forEach(u -> { if (StrUtil.isBlank(u.getProductLine__c()) || StrUtil.isBlank(u.getAssetProductLine3__c()) || StrUtil.isBlank(u.getAssetProductLine4__c())) { log.info("跳过没有产品线或设备类型的设备"); @@ -204,23 +194,9 @@ public class AdminDeviceService { ent.setSourceFrom(DeviceSourceFromEnum.FROM_CRM.getSourceKey()); ent.setProductLine(u.getProductLine__c()); Constant1.PRODUCT_LINE.add(u.getProductLine__c()); - if (Objects.nonNull(u.getLastCarDevliverDate__c())) { - ent.setShipmentDate(DateTimeUtil.asSystemDateTime(u.getLastCarDevliverDate__c()).format(DateTimeFormatter.ISO_LOCAL_DATE)); - } + ent.setShipmentDate(u.getLastCarDevliverDate__c()); + ent.setStartWarrantyDate(u.getWarrantyStartDate__c()); ent.setWarrantyMonth(u.getWarrantyPeriod1__c()); - if (Objects.nonNull(u.getWarrantyStartDate__c())) { - LocalDateTime warrantyStartDate=DateTimeUtil.asSystemDateTime(u.getWarrantyStartDate__c()); - ent.setStartWarrantyDate(warrantyStartDate.format(DateTimeFormatter.ISO_LOCAL_DATE)); - LocalDateTime now=LocalDateTime.now(); - if (now.isBefore(warrantyStartDate)){ - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "NotStarted")).findFirst().get().getId()); - }else if (now.isAfter(warrantyStartDate.plusMonths(ent.getWarrantyMonth()))){ - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "OutsideWarranty")).findFirst().get().getId()); - }else { - ent.setWarrantyState(warrantyStates.stream().filter(s -> StrUtil.equals(s.getCode(), "WithinWarranty")).findFirst().get().getId()); - } - } -// VUtils.trueThrow(true).throwMessage(STATE.SystemErr,"测试"); if (Objects.nonNull(u.getAgent__r())) { TBaseCustomer customer = agents.stream() .filter(agent -> agent.getAgencyCompanyCode().equals(u.getAgent__r().getId())) diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java index 7d6d3fd1..ee7534e2 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java @@ -124,14 +124,11 @@ public class CrmService { HttpUtils httpUtils = new HttpUtils(); // reBody.put("CrLsDate", startDate); String token = StrUtil.join(" ", "Bearer", getToken()); - String data = JSONUtil.toJsonStr(dateParam); - log.debug("请求地址：" + getDeviceUrl); - log.debug("请求参数：" + data); - String orderResult = httpUtils.doPost(getDeviceUrl, data, token); - log.debug("响应数据：" + orderResult); + String orderResult = httpUtils.doPost(getDeviceUrl, JSONUtil.toJsonStr(dateParam), token); JSONObject jsonObject = JSONUtil.parseObj(orderResult); String code = jsonObject.getStr("code"); if (Objects.equals(code, "0")) { + log.debug("响应数据:" + orderResult); String dataResult = jsonObject.getStr("jsonData"); return JSONUtil.toList(dataResult, CmrDeviceResultVO.class); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java index 55ec8236..44b8e17b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java @@ -91,7 +91,7 @@ public class Device implements Serializable { /** * 发货日期 */ - private String shipmentDate; + private LocalDate shipmentDate; /** * 质保状态-来自字典 @@ -101,7 +101,7 @@ public class Device implements Serializable { /** * 开始质保日期 */ - private String startWarrantyDate; + private LocalDate startWarrantyDate; /** * 质保期（月） diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java index 573262b8..1e82d395 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java @@ -92,7 +92,7 @@ public class GongfuDevice implements Serializable { /** * 发货日期 */ - private String shipmentDate; + private LocalDate shipmentDate; /** * 质保状态-来自字典 @@ -102,7 +102,7 @@ public class GongfuDevice implements Serializable { /** * 开始质保日期 */ - private String startWarrantyDate; + private LocalDate startWarrantyDate; /** * 质保期（月）