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 list; + List 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 { List selectAccessory(Map map); - List getItems(); + List 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 { List selectAccessory(Map map); - List getItems(); + List 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 getItems() { + public List 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 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