From ce0d312ea9aa6480cecbf238e4b24403017a85fc Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 7 Apr 2025 20:22:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B1=87=E6=80=BB=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 24 ++++++-- .../api/entity/collect/IoCollectOrder.java | 3 + .../entity/collect/IoCollectOrderBackup.java | 4 ++ .../entity/collect/IoCollectOrderOrigin.java | 4 ++ .../req/collect/CollectOrderBizRequest.java | 8 +++ .../res/collect/IoCollectOrderResponse.java | 5 ++ .../api/service/collect/DownloadFactory.java | 3 +- .../collect/IoCollectOrderBizMapper.xml | 56 ++++++++++++------- .../mapper/collect/IoCollectOrderMapper.xml | 1 + 9 files changed, 80 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index a2590cea0..f36b528bb 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -213,12 +213,24 @@ public class IoCollectOrderController extends BaseController { if (collectOrder == null) { return ResultVOUtils.error(500, "未找到单据"); } - List list = collectOrderBizService.filterList(collectOrderBizRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(list); - return ResultVOUtils.success(pageSimpleResponse); + //如果是 处理单据页面来的 有汇总单号 要走汇总单号 + if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())){ + collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo()); + List list = collectOrderBizService.filterList(collectOrderBizRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + }else { + List list = collectOrderBizService.filterList(collectOrderBizRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + } @Resource diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index cb4ddb51c..0f1e6c7ff 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -288,6 +288,9 @@ public class IoCollectOrder implements Serializable { @ApiModelProperty(value = "关联预验收入库单号") private String preInBillNo; + @TableField(value = "summaryNo") + @ApiModelProperty(value = "汇总单号") + private String summaryNo; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java index d6d816707..e580fa931 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java @@ -283,4 +283,8 @@ public class IoCollectOrderBackup implements Serializable { @ApiModelProperty(value = "上传医保时间") private Date uploadYbTime; private static final long serialVersionUID = 1L; + + @TableField(value = "summaryNo") + @ApiModelProperty(value = "汇总单号") + private String summaryNo; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java index e1c87a275..9fbc4707b 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java @@ -337,4 +337,8 @@ public class IoCollectOrderOrigin implements Serializable { @TableField(value = "preInBillNo") @ApiModelProperty(value = "关联预验收入库单号") private String preInBillNo; + + @TableField(value = "summaryNo") + @ApiModelProperty(value = "汇总单号") + private String summaryNo; } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java index bd013e985..dab8bf66f 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java @@ -1,6 +1,8 @@ package com.glxp.api.req.collect; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -129,4 +131,10 @@ public class CollectOrderBizRequest extends ListPageRequest { * 如果不为null 就是单据审核页面不需要槽位 */ private Integer isOrderCheck; + + private Boolean summaryNoFlag; + + @TableField(value = "summaryNo") + @ApiModelProperty(value = "汇总单号") + private String summaryNo; } diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 17e97891c..f423ac5e5 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -200,6 +200,11 @@ public class IoCollectOrderResponse { */ private Integer codingStatus; + + @TableField(value = "summaryNo") + @ApiModelProperty(value = "汇总单号") + private String summaryNo; + @TableField(value = "uploadYbTime") @ApiModelProperty(value = "上传医保时间") private Date uploadYbTime; diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index 9d10459be..193f3acb3 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -75,7 +75,7 @@ public class DownloadFactory { int limit = 100; int maxPages = 1000; // 设置最大页数限制，防止死循环 StringBuilder errorMsgAll = new StringBuilder(); - + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); getSickPrescribeRequest.setLimit(limit); getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); @@ -204,6 +204,7 @@ public class DownloadFactory { ioCollectOrder.setSplitStatus(0); ioCollectOrder.setTagStatus(0); ioCollectOrder.setBackupOrderRemark1(thrOrder.getBackupOrderRemark1()); + ioCollectOrder.setSummaryNo(thrOrder.getSummaryNo()); List bizList = new ArrayList<>(); for (IoCollectOrderBiz entity : thrOrder.getBizList()) { diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml index a811176f0..21b0a7d5f 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml @@ -17,6 +17,7 @@ sys_workplace_queue.name queueName FROM io_collect_order_biz icob + left join io_collect_order ico on ico.billNo = icob.orderIdFk left join basic_udirel bu on icob.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid left join sys_workplace_queue on sys_workplace_queue.relId = bu.id @@ -24,27 +25,40 @@ left join sys_workplace_freight swf on swf.code = sys_workplace_queue.freightCode left join sys_workplace_region swr on swr.regionCode = swf.freightRow - - AND icob.thrCode LIKE concat('%', #{thrCode}, '%') - - - AND icob.orderIdFk = #{orderIdFk} - - - AND icob.relId = #{relId} - - - AND icob.cpmctymc LIKE concat('%', #{cpmctymc}, '%') - - - and ( - bp.nameCode LIKE concat( #{unionCode}, '%') - or bp.ybbm LIKE concat( #{unionCode}, '%') - or bp.sptm LIKE concat(#{unionCode}, '%')) - - - AND ggxh LIKE concat( #{ggxh}, '%') - + + + + AND ico.summaryNo = #{summaryNo} + + + + + + AND icob.thrCode LIKE CONCAT('%', #{thrCode}, '%') + + + AND icob.orderIdFk = #{orderIdFk} + + + AND icob.relId = #{relId} + + + AND icob.cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%') + + + + AND ( + bp.nameCode LIKE CONCAT(#{unionCode}, '%') + OR bp.ybbm LIKE CONCAT(#{unionCode}, '%') + OR bp.sptm LIKE CONCAT(#{unionCode}, '%') + ) + + + AND ggxh LIKE CONCAT(#{ggxh}, '%') + + + + group by icob.id ORDER BY icob.getConfirm, icob.id desc diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index baf83f845..ddcb079d7 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -32,6 +32,7 @@ ico.uploadError, sol.ledNum, ico.errorMsg, + ico.summaryNo, row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence