From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
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