diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index f04728c84..745d232ce 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -120,7 +120,7 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/delectList") public BaseResponse delectList(IoOrderRelRequest ioOrderRelRequest) { - List list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest); + List list = ioCodeRelServicec.selectIoCodeRelDetailList(ioOrderRelRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java index 24eb14cf0..5391e6618 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java @@ -14,4 +14,6 @@ import java.util.List; public interface IoCodeRelMapper extends BaseMapper { List selectIoCodeRelList(IoOrderRelRequest ioOrderRelRequest); + + List selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest); } diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java index 0a8f3839c..e7909c889 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java @@ -25,6 +25,7 @@ public class IoCodeRelResponse { private Date updateTime; private String cpmctymc; private String ggxh; - + private String measname; + private String manufactory; } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java index a61ecbff2..c9215b341 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java @@ -19,5 +19,7 @@ public interface IoCodeRelService { int delIoCodeRel(String code,String parentCode); + List selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest); + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java index 51401ac1f..a7178316b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java @@ -75,6 +75,16 @@ public class IoCodeRelServiceImpl implements IoCodeRelService { int count=ioCodeRelMapper.delete(ew); return count; } - + @Override + public List selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest) { + if (ioOrderRelRequest == null) { + return Collections.emptyList(); + } + if (ioOrderRelRequest.getPage() != null) { + int offset = (ioOrderRelRequest.getPage() - 1) * ioOrderRelRequest.getLimit(); + PageHelper.offsetPage(offset, ioOrderRelRequest.getLimit()); + } + return ioCodeRelMapper.selectIoCodeRelDetailList(ioOrderRelRequest); + } } diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml index 82c3881dd..9fde655be 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml @@ -4,7 +4,39 @@ + +