diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java index 826284e..fb6a1b8 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java @@ -24,6 +24,9 @@ public class LicensePageReqVO extends PageParam { @Schema(description = "项目ID", example = "2496") private Long projectId; + @Schema(description = "项目名称", example = "2496") + private String projectName; + @Schema(description = "sn") private String serialNo; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java index 9fc77c2..d137abb 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java @@ -110,6 +110,7 @@ public class LicenseTask { Map templateParams = new HashMap<>(); templateParams.put("sn", licenseDO.getSerialNo()); templateParams.put("days", day); + templateParams.put("url", "http://192.168.9.50#/license"); try { templateParams.put("expiryDate", licenseDO.getExpiryDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml index 16b1f4b..9fc1d87 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml @@ -92,6 +92,9 @@ AND l.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]} + + AND p.name LIKE CONCAT('%',#{query.projectName},'%') + ORDER BY l.application_time DESC