update

辅料实用查询-返回值类型修改

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) {

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();
 }

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();
 }

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();
     }
 

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>