From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
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