1.完成单据详情相关表的基础查询接口代码

2 years ago · 2baff77c00
parent 8fe7d604e0
commit 2baff77c00
8 changed files with 81 additions and 10 deletions
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@ -2,22 +2,23 @@ package com.glxp.api.controller.inout;


 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.AddBizProductReqeust;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
@ -119,5 +120,17 @@ public class IoOrderDetailBizController extends BaseController {
        return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败");
    }

+    /**
+     * 查询单据业务详情列表
+     *
+     * @param orderDetailBizRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/order/filterList")
+    public BaseResponse filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }

 }
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@ -1,13 +1,37 @@
 package com.glxp.api.controller.inout;

+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.service.inout.IoOrderDetailResultService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

+import javax.annotation.Resource;
+import java.util.List;
+
 /**
 * 单据扫码明细查询接口
 */
@RestController
 public class IoOrderDetailResultController {

+    @Resource
+    private IoOrderDetailResultService orderDetailResultService;

+    /**
+     * 查询单据扫码明细列表
+     *
+     * @param orderDetailResultRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/order/filterList")
+    public BaseResponse filterList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        List<IoOrderDetailResultResponse> list = orderDetailResultService.filterList(orderDetailResultRequest);
+        PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }

 }
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java
@ -1,12 +1,13 @@
 package com.glxp.api.req.inout;

+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;

 /**
 * 单据业务详情查询参数
 */
@Data
-public class FilterOrderDetailBizRequest {
+public class FilterOrderDetailBizRequest extends ListPageRequest {

    /**
     * 耗材字典产品ID
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@ -1,12 +1,13 @@
 package com.glxp.api.req.inout;

+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;

 /**
 * 单据扫码明细查询参数
 */
@Data
-public class FilterOrderDetailResultRequest {
+public class FilterOrderDetailResultRequest extends ListPageRequest {

    /**
     * 单据号
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
@ -1,6 +1,8 @@
 package com.glxp.api.service.inout;

 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;

 import java.util.List;

@ -15,4 +17,6 @@ public interface IoOrderDetailBizService {
    int deleteById(Integer id);

    boolean isExit(Long relId, String bacthNo,Integer ignoreId);
+
+    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
 }
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
@ -1,8 +1,8 @@
 package com.glxp.api.service.inout;

-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;

 import java.util.List;

@ -13,4 +13,7 @@ public interface IoOrderDetailResultService {
    int insert(IoOrderDetailResultEntity orderDetailResultEntity);

    int update(IoOrderDetailResultEntity orderDetailResultEntity);
+
+    List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest);
+
 }
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
@ -1,12 +1,16 @@
 package com.glxp.api.service.inout.impl;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;

@Service
@ -41,5 +45,15 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
        return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("bindRlFk", relId).eq("batchNo", bacthNo).ne("id", ignoreId));
    }

+    @Override
+    public List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        if (null == orderDetailBizRequest) {
+            return Collections.emptyList();
+        }
+        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
+    }

 }
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
@ -1,16 +1,16 @@
 package com.glxp.api.service.inout.impl;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.glxp.api.dao.inout.IoOrderDetailBizDao;
-import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailResultDao;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.inout.IoOrderDetailResultService;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;

@Service
@ -33,4 +33,15 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
    public int update(IoOrderDetailResultEntity orderDetailResultEntity) {
        return orderDetailResultDao.updateById(orderDetailResultEntity);
    }
+
+    @Override
+    public List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        if (null == orderDetailResultRequest) {
+            return Collections.emptyList();
+        }
+        if (null == orderDetailResultRequest.getPage() && null == orderDetailResultRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
+        }
+        return orderDetailResultDao.filterList(orderDetailResultRequest);
+    }
 }