From 219dc714cc39b315fff191fef467e8e0aab790ac Mon Sep 17 00:00:00 2001
From: limy135302065 <1353020654@qq.com>
Date: Thu, 13 Jan 2022 14:40:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E8=BE=85=E6=96=99=E5=AE=9E?=
 =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2-=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/production/controller/AccessoryLogController.java  | 2 +-
 .../mesnac/production/mapper/AccessoryLogMapper.java          | 2 +-
 .../mesnac/production/service/AccessoryLogService.java        | 2 +-
 .../production/service/impl/AccessoryLogServiceImpl.java      | 2 +-
 production/src/main/resources/mapper/AccessoryLogMapper.xml   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java
index 0afff063..df2609b7 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java
@@ -186,7 +186,7 @@ public class AccessoryLogController {
     @GetMapping("/getItems")
     @ResponseBody
     public R getItems(){
-        List<AccessoryLog> list;
+        List<AccessoryConsumDto> list;
         try {
             list = accessoryLogService.getItems();
         } catch (Exception e) {
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java
index 11b071ef..35709b1b 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java
@@ -24,5 +24,5 @@ public interface AccessoryLogMapper extends BaseMapper<AccessoryLog> {
 
     List<AccessoryConsumDto> selectAccessory(Map<String,Object> map);
 
-    List<AccessoryLog> getItems();
+    List<AccessoryConsumDto> getItems();
 }
\ No newline at end of file
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java
index b5ff6c8d..ab8445b2 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java
@@ -34,5 +34,5 @@ public interface AccessoryLogService extends IService<AccessoryLog> {
 
     List<AccessoryConsumDto> selectAccessory(Map map);
 
-    List<AccessoryLog> getItems();
+    List<AccessoryConsumDto> getItems();
 }
\ No newline at end of file
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java
index 4fa5fcde..cc1bbbd1 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java
@@ -140,7 +140,7 @@ public class AccessoryLogServiceImpl extends ServiceImpl<AccessoryLogMapper, Acc
     }
 
     @Override
-    public List<AccessoryLog> getItems() {
+    public List<AccessoryConsumDto> getItems() {
         return accessoryLogMapper.getItems();
     }
 
diff --git a/production/src/main/resources/mapper/AccessoryLogMapper.xml b/production/src/main/resources/mapper/AccessoryLogMapper.xml
index f89ee800..2151fb27 100644
--- a/production/src/main/resources/mapper/AccessoryLogMapper.xml
+++ b/production/src/main/resources/mapper/AccessoryLogMapper.xml
@@ -514,8 +514,8 @@
          ORDER BY zal.CREATED_DATE_TIME DESC
     </select>
 
-    <select id="getItems" resultMap="BaseResultMap">
-       SELECT ZAL.*,IT.DESCRIPTION FROM Z_ACCESSORY_LOG ZAL
+    <select id="getItems" resultMap="FullResultMap">
+       SELECT DISTINCT(ZAL.ITEM) ACCESSORY_ITEM,IT.DESCRIPTION ACCESSORY_DESCRIPTION FROM Z_ACCESSORY_LOG ZAL
         LEFT JOIN ITEM IM ON ZAL.ITEM = IM.ITEM
         LEFT JOIN ITEM_T IT ON IM.HANDLE=IT.ITEM_BO
     </select>