From 840b426adc1b54a3a70530e59be7bb3e547c5404 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 27 Dec 2021 15:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6=E8=BF=9E?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/esStandRelation/entity/EsStandRelation.java   | 4 ++++
 .../mybatis/mapper/esStandRelation/EsStandRelationMapper.xml  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
index e71f029a..01922222 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
@@ -40,6 +40,10 @@ public class EsStandRelation extends BaseEntity {
     @TableField("use_level")
     private String useLevel;
 
+    @ApiModelProperty(value = "采用程度名称")
+    @TableField(exist = false)
+    private String useLevelName;
+
     @ApiModelProperty(value = "简述技术指标依据")
     @TableField("technologic")
     private String technologic;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
index 870a74ae..5a2b1c6e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
@@ -5,9 +5,10 @@
     <select id="getDatas" resultType="com.adc.da.slrs.esStandRelation.entity.EsStandRelation">
         select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_standards_info.STAND_NAME as standName,
         concat(sar_standards_info.STAND_SORT,concat(' ',concat(concat(sar_standards_info.STAND_NUMBER,concat('-',sar_standards_info.STAND_YEAR))))) as standNumber,
-        es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel
+        es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel,ts_dictype.DIC_TYPE_NAME as useLevelName
         from es_stand_relation
         left join sar_standards_info on es_stand_relation.stand_id = sar_standards_info.ID
+        left join ts_dictype on es_stand_relation.use_level = ts_dictype.DIC_TYPE_CODE
         where es_stand_relation.es_id=#{id}
         union all
         select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_bussioness_stand.STAND_NAME as standName,