From e2dba648a958d3f9181b0556c941f14d07477a64 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 17:34:49 +0800
Subject: [PATCH] 辅助工时单位字段修改和不合格品bug修改
---
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
index 0b84598..4cc2726 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -26,14 +26,12 @@
Map<String, String> soundVo = new HashMap<>();
boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
- if (bool) {
- int order;
- if (bool2){
- order = field.getAnnotation(ValueTableShow.class).value();
- }else{
- continue;
+ if (bool2) {
+ int order = field.getAnnotation(ValueTableShow.class).value();
+ String value = field.getAnnotation(ValueTableShow.class).name();
+ if (bool){
+ value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
}
- String value = field.getAnnotation(ApiModelProperty.class).value();
soundVo.put("label", field.getName());
soundVo.put("value", value);
soundVo.put("order", order + "");
--
Gitblit v1.9.3