zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2025-11-28 10:49:08 +08:00
parent 9a4e50b081 7f1c4dd8c4
commit 63fc44a7d1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.business.config.controller.vo; package com.zt.plat.module.qms.business.config.controller.vo;
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
@@ -17,6 +18,7 @@ public class ConfigWarehouseLocationRespVO {
@ExcelProperty("ID") @ExcelProperty("ID")
private Long id; private Long id;
// @Dict(dictTable="t_cfg_wrh_loc",dicCode="id",dicText="name")
@Schema(description = "父ID", example = "31498") @Schema(description = "父ID", example = "31498")
@ExcelProperty("父ID") @ExcelProperty("父ID")
private Long parentId; private Long parentId;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java
View File

@@ -137,7 +137,7 @@ public class DictAspect {
String dictCode = code; String dictCode = code;
if (!StringUtils.isEmpty(table)) { if (!StringUtils.isEmpty(table)) {
//指定table //指定table
dictCode = String.format("%s,%s,%s,%s", table, text, code, keyOrId); dictCode = String.format("%s,%s,%s", table, text, code);
}else{ }else{
dictCode = String.format("%s"+DICT_ANNOTATION_SPLIT+"%s", code, keyOrId); dictCode = String.format("%s"+DICT_ANNOTATION_SPLIT+"%s", code, keyOrId);
} }