diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java index 8a400a8..522c2a4 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java @@ -132,6 +132,7 @@ public class LicenseController { List results = new ArrayList<>(); for (LicenseRespVO license : voList) { + license.setExpiryDateExt(license.getExpiryDate().toLocalDate()); List neCodeList = license.getNeCodeList(); if (CollUtil.isEmpty(neCodeList)) { results.add(license); diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java index b2ec102..0fb0802 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java @@ -47,8 +47,11 @@ public class LicenseRespVO implements VO { private String serialNo; @Schema(description = "到期时间") + private LocalDateTime expiryDate; + + @Schema(description = "到期时间导出") @ExcelProperty("到期时间") - private LocalDate expiryDate; + private LocalDate expiryDateExt; @Schema(description = "网元") @ExcelProperty("网元") diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java index 8106fa6..2d36c8e 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java @@ -28,7 +28,7 @@ public interface LicenseMapper extends BaseMapperX { .eqIfPresent(LicenseDO::getStatus, reqVO.getStatus()) .eqIfPresent(LicenseDO::getRemark, reqVO.getRemark()) .betweenIfPresent(LicenseDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LicenseDO::getId)); + .orderByDesc(LicenseDO::getApplicationTime)); } default LicenseDO selectBySn(String sn) { diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java index 63c6a6f..45186ad 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java @@ -49,7 +49,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import static org.agt.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -505,15 +504,9 @@ public class LicenseServiceImpl implements LicenseService { } if (i < details.size()) { - if (!(i < oldDetails.size() && Objects.equals(oldDetails.get(i).getActivationCode(), details.get(i).getActivationCode()))) { - activationCodeMap.put("new", details.get(i).getActivationCode()); - } - if (!(i < oldDetails.size() && Objects.equals(oldDetails.get(i).getNeList(), details.get(i).getNeList()))) { - neListMap.put("new", details.get(i).getNeList()); - } - if (!(i < oldDetails.size() && Objects.equals(oldDetails.get(i).getFileUrlList(), details.get(i).getFileUrlList()))) { - fileUrlListMap.put("new", null); - } + activationCodeMap.put("new", details.get(i).getActivationCode()); + neListMap.put("new", details.get(i).getNeList()); + fileUrlListMap.put("new", null); } mergeDetail.setActivationCodeMap(activationCodeMap); mergeDetail.setNeListMap(neListMap); @@ -539,10 +532,12 @@ public class LicenseServiceImpl implements LicenseService { Map activationCodeMap = new HashMap<>(); activationCodeMap.put("old", detail.getActivationCode()); + activationCodeMap.put("new", detail.getActivationCode()); detail.setActivationCodeMap(activationCodeMap); Map> neListMap = new HashMap<>(); neListMap.put("old", detail.getNeList()); + neListMap.put("new", detail.getNeList()); detail.setNeListMap(neListMap); Map> fileUrlListMap = new HashMap<>();