fix: license管理项目名称搜索和提醒添加url跳转
This commit is contained in:
@@ -24,6 +24,9 @@ public class LicensePageReqVO extends PageParam {
|
|||||||
@Schema(description = "项目ID", example = "2496")
|
@Schema(description = "项目ID", example = "2496")
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
|
||||||
|
@Schema(description = "项目名称", example = "2496")
|
||||||
|
private String projectName;
|
||||||
|
|
||||||
@Schema(description = "sn")
|
@Schema(description = "sn")
|
||||||
private String serialNo;
|
private String serialNo;
|
||||||
|
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ public class LicenseTask {
|
|||||||
Map<String, Object> templateParams = new HashMap<>();
|
Map<String, Object> templateParams = new HashMap<>();
|
||||||
templateParams.put("sn", licenseDO.getSerialNo());
|
templateParams.put("sn", licenseDO.getSerialNo());
|
||||||
templateParams.put("days", day);
|
templateParams.put("days", day);
|
||||||
|
templateParams.put("url", "http://192.168.9.50#/license");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
templateParams.put("expiryDate", licenseDO.getExpiryDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
templateParams.put("expiryDate", licenseDO.getExpiryDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||||
|
|||||||
@@ -92,6 +92,9 @@
|
|||||||
<if test="query.createTime != null and query.createTime.length > 1">
|
<if test="query.createTime != null and query.createTime.length > 1">
|
||||||
AND l.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]}
|
AND l.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="query.projectName != null and query.projectName != ''">
|
||||||
|
AND p.name LIKE CONCAT('%',#{query.projectName},'%')
|
||||||
|
</if>
|
||||||
ORDER BY
|
ORDER BY
|
||||||
l.application_time DESC
|
l.application_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user