From 3acec3660921f22b58bdaa85d61a2fcfba8e6c98 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 六月 2023 10:11:31 +0800
Subject: [PATCH] 问卷列表

---
 smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
index 76b5c12..9466aff 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
@@ -1,7 +1,13 @@
 package com.smartor.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.SvyLibTitleReq;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartor.mapper.SvyLibTitleMapper;
@@ -10,87 +16,96 @@
 
 /**
  * 闂嵎Service涓氬姟灞傚鐞�
- * 
+ *
  * @author ruoyi
  * @date 2023-03-02
  */
 @Service
-public class SvyLibTitleServiceImpl implements ISvyLibTitleService 
-{
+public class SvyLibTitleServiceImpl implements ISvyLibTitleService {
     @Autowired
     private SvyLibTitleMapper svyLibTitleMapper;
 
     /**
      * 鏌ヨ闂嵎
-     * 
+     *
      * @param svyid 闂嵎涓婚敭
      * @return 闂嵎
      */
     @Override
-    public SvyLibTitle selectSvyLibTitleBySvyid(Long svyid)
-    {
+    public SvyLibTitle selectSvyLibTitleBySvyid(Long svyid) {
         return svyLibTitleMapper.selectSvyLibTitleBySvyid(svyid);
     }
 
     /**
      * 鏌ヨ闂嵎鍒楄〃
-     * 
-     * @param svyLibTitle 闂嵎
+     *
+     * @param svyLibTitleReq 闂嵎
      * @return 闂嵎
      */
     @Override
-    public List<SvyLibTitle> selectSvyLibTitleList(SvyLibTitle svyLibTitle)
-    {
-        return svyLibTitleMapper.selectSvyLibTitleList(svyLibTitle);
+    public List<SvyLibTitle> selectSvyLibTitleList(SvyLibTitleReq svyLibTitleReq) {
+        List<SvyLibTitle> svyLibTitles = svyLibTitleMapper.selectSvyLibTitleList(svyLibTitleReq);
+        //鍏堝皢鐩稿悓鐨刬d鐨刬cdname,鏁寸悊鍒颁竴鍧�
+        List<SvyLibTitle> libTitles = svyLibTitles.stream().collect(Collectors.groupingBy(SvyLibTitle::getSvyid, Collectors.mapping(SvyLibTitle::getIcdname, Collectors.joining(", ")))).entrySet().stream().map(entry -> new SvyLibTitle(entry.getKey(), entry.getValue())).collect(Collectors.toList());
+        //涓存椂鍙橀噺锛岀敤鏉ヤ繚瀛樼柧鐥呭悕绉�
+        String icdname = null;
+        for (int i = 0; i < libTitles.size(); i++) {
+            for (int j = 0; j < svyLibTitles.size(); j++) {
+                if (ObjectUtils.isNotEmpty(libTitles.get(i).getSvyid()) && libTitles.get(i).getSvyid() == svyLibTitles.get(j).getSvyid()) {
+                    icdname = libTitles.get(i).getIcdname();
+                    // 灏嗗師鏁版嵁鎷疯礉鍒版暣鐞嗙殑濂界殑瀵硅薄涓�
+                    BeanUtils.copyProperties(svyLibTitles.get(j), libTitles.get(i));
+                    //鍐嶅皢鏁寸悊濂界殑鈥滅柧鐥呭悕绉扳�濇浛鎹�
+                    libTitles.get(i).setIcdname(icdname);
+                }
+            }
+        }
+        return libTitles;
     }
 
     /**
      * 鏂板闂嵎
-     * 
+     *
      * @param svyLibTitle 闂嵎
      * @return 缁撴灉
      */
     @Override
-    public int insertSvyLibTitle(SvyLibTitle svyLibTitle)
-    {
+    public int insertSvyLibTitle(SvyLibTitle svyLibTitle) {
         svyLibTitle.setCreateTime(DateUtils.getNowDate());
         return svyLibTitleMapper.insertSvyLibTitle(svyLibTitle);
     }
 
     /**
      * 淇敼闂嵎
-     * 
+     *
      * @param svyLibTitle 闂嵎
      * @return 缁撴灉
      */
     @Override
-    public int updateSvyLibTitle(SvyLibTitle svyLibTitle)
-    {
+    public int updateSvyLibTitle(SvyLibTitle svyLibTitle) {
         svyLibTitle.setUpdateTime(DateUtils.getNowDate());
         return svyLibTitleMapper.updateSvyLibTitle(svyLibTitle);
     }
 
     /**
      * 鎵归噺鍒犻櫎闂嵎
-     * 
+     *
      * @param svyids 闇�瑕佸垹闄ょ殑闂嵎涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteSvyLibTitleBySvyids(Long[] svyids)
-    {
+    public int deleteSvyLibTitleBySvyids(Long[] svyids) {
         return svyLibTitleMapper.deleteSvyLibTitleBySvyids(svyids);
     }
 
     /**
      * 鍒犻櫎闂嵎淇℃伅
-     * 
+     *
      * @param svyid 闂嵎涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteSvyLibTitleBySvyid(Long svyid)
-    {
+    public int deleteSvyLibTitleBySvyid(Long svyid) {
         return svyLibTitleMapper.deleteSvyLibTitleBySvyid(svyid);
     }
 }

--
Gitblit v1.9.3