From d09cdb1d42930f82da09a7868239e1eccf266c18 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 20 Oct 2021 11:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E7=BB=91=E5=AE=9A=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=92=8C=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandardsInfoServiceImpl.java     | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

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 341c2033..5d5f14fa 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
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sarStandardsInfo.service.impl;
 
 import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.slrs.sarPosition.entity.TsPosition;
+import com.adc.da.slrs.sarPosition.service.ITsPositionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.att.vo.AttFileVo;
 import com.adc.da.common.*;
@@ -69,6 +72,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
+import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.util.PDFTextStripper;
@@ -116,6 +120,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Value("${file.path}")
     private String filePath;//文件存储路径
 
+    @Autowired
+    private ITsPositionService iTsPositionService;
+
     @Autowired
     private SarStandardsInfoDao dao;
 
@@ -482,7 +489,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
                         value = entry.getValue().toString();
                         List<String> valArr = Arrays.asList(value.split(","));
-                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+
+                        switch (name){
+                            //通过id绑定责任工程师名称
+                            case "ZRGCS":{
+                                QueryWrapper<TsUser> tsUserQW = new QueryWrapper<>();
+                                tsUserQW.select("UNAME")
+                                        .in("USID",valArr);
+                                List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
+                                value= String.join(",", stringList);
+                                break;
+                            }
+                            //通过id绑定责任部门师名称
+                            case "ZRBM":{
+                                QueryWrapper<TsPosition> tsPositionQW = new QueryWrapper<>();
+                                tsPositionQW.select("name")
+                                        .in("id",valArr);
+                                List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
+                                value = String.join(",", stringList);
+                                break;
+                            }
+                            default:value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        }
+
+
                         entry.setValue(value);
                     }
                 }