From b44c37f308dcf00dc0b99546be79f645e57cd307 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 15 Jul 2022 15:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=20?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=20=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandardsInfoServiceImpl.java     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index e02eeee6..f2c1a0fc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -810,6 +810,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         String fieldInfo = InitStandAttrUtil.queryField;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
         row.setCollectId(collectId);
+        List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
+        Map<String, String> dicMap = dicInfo.stream()
+                .filter(item -> !item.getDicTypeCode().isEmpty())
+                .collect(Collectors.toMap(DicTypeEO::getDicTypeCode, DicTypeEO::getDicTypeName, (value1, value2) -> value2));
         // 查询属性表数据
         if (StringUtils.isNotBlank(fieldInfo)) {
             Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
@@ -848,6 +852,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
 
             if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                if (null!=getAttrMap.get("QCDW")){
+                    String qcdw= String.valueOf(getAttrMap.get("QCDW"));
+                    if (qcdw.contains(",")){
+                        List<String> qc=new ArrayList<>(Arrays.asList(qcdw.split(",")));
+                        List<String> res=new ArrayList<>();
+                        for (String q:qc) {
+                            if (null!=dicMap.get(q)) {
+                                res.add(dicMap.get(q));
+                            }else {
+                                res.add(q);
+                            }
+                        }
+                        getAttrMap.put("QCDW",StringUtils.join(res,","));
+                    }else {
+                        if (null!=dicMap.get(qcdw)) {
+                            getAttrMap.put("QCDW", dicMap.get(qcdw));
+                        }
+                    }
+                }
                 row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
             }