From 9d492aac78c25d03a54d1979f4b251513ed2c196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Fri, 21 Jul 2023 11:18:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E2=80=94?= =?UTF-8?q?=E2=80=94=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E6=8C=89=E7=85=A7=E6=9C=80=E6=96=B0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/impl/InvInnerOrderPrintServiceImpl.java | 10 ++++++++-- .../resources/mybatis/mapper/inv/InnerOrderDao.xml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 7fc5421d..6f604570 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -112,9 +112,15 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService filterUdiRelRequest.setId(Long.valueOf(obj.getProductId())); filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode())); System.out.println(filterUdiRelRequest.getPackLevel()); + int a=0; + if (filterUdiRelRequest.getPackLevel()==null){ + a=0; + }else { + a=Integer.parseInt(filterUdiRelRequest.getPackLevel())-1; + } //查询耗材字典信息 - // UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); - UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1); + //UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); + UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a); //查询产品信息 UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml index 7149391f..5bd0e447 100644 --- a/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml @@ -17,6 +17,7 @@ '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d') + ORDER BY inv_inner_order.createTime DESC