From 08aa7e3465521c80e7661af1e27a2932ee24cc91 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 29 Jul 2022 10:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/mapper/BaseQiMapper.java  |  3 ++-
 .../com/ruoyi/system/service/IBaseQiService.java    |  3 ++-
 .../system/service/impl/BaseQiServiceImpl.java      |  4 +++-
 .../main/resources/mapper/system/BaseQiMapper.xml   | 13 +++++++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseQiMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseQiMapper.java
index 3d3d4e5..cc51228 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseQiMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseQiMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.BaseQi;
+import com.ruoyi.system.domain.MTKBeen;
 
 /**
  * 月看板-品质提升维护Mapper接口
@@ -59,5 +60,5 @@ public interface BaseQiMapper
      */
     public int deleteBaseQiByIds(String[] ids);
 
-    List<BaseQi> selectBaseQiList1();
+    List<MTKBeen> selectBaseQiList1();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseQiService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseQiService.java
index 4912446..d8c0a68 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseQiService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseQiService.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.BaseQi;
+import com.ruoyi.system.domain.MTKBeen;
 
 /**
  * 月看板-品质提升维护Service接口
@@ -59,5 +60,5 @@ public interface IBaseQiService
      */
     public int deleteBaseQiById(Long id);
 
-    List<BaseQi> selectBaseQiList1();
+    List<MTKBeen> selectBaseQiList1();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseQiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseQiServiceImpl.java
index 48039c8..1465dcf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseQiServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseQiServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.MTKBeen;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BaseQiMapper;
@@ -93,7 +95,7 @@ public class BaseQiServiceImpl implements IBaseQiService
     }
 
     @Override
-    public List<BaseQi> selectBaseQiList1() {
+    public List<MTKBeen> selectBaseQiList1() {
         return baseQiMapper.selectBaseQiList1();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseQiMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseQiMapper.xml
index 09af041..d874b6b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseQiMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseQiMapper.xml
@@ -16,8 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, year_name, rate, type from base_qi
     </sql>
 
-    <select id="selectBaseQiList1"  resultMap="BaseQiResult">
-     select id, year_name, rate, sdd.DICT_LABEL
+    <resultMap id="MTKBeen" type="com.ruoyi.system.domain.MTKBeen">
+        <result column="code" property="code"/>
+        <collection property="list" javaType="java.util.List" resultMap="BoxOutputBeen"/>
+    </resultMap>
+    <resultMap id="BoxOutputBeen" type="com.ruoyi.system.domain.BoxOutput">
+        <result column="name" property="name"/>
+        <result column="qty" property="qty"/>
+        <result column="rate" property="rate"/>
+    </resultMap>
+    <select id="selectBaseQiList1"  resultMap="MTKBeen">
+     select  year_name as name , rate , sdd.DICT_LABEL as code
         from base_qi bq
                  left join SYS_DICT_DATA sdd on TYPE = sdd.DICT_VALUE
                                                     and sdd.DICT_TYPE = 'quality_improvement_name'