From 138286b2afe47671278aefd9b3e900d964cc01e8 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 7 Apr 2025 18:35:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BD=8F=E9=99=A2=E5=A4=84=E6=96=B9?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BB=93=E7=AE=97=E5=90=8E=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E6=96=B9=202=E3=80=81=E6=91=86=E8=8D=AF=E4=BA=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20=E5=8F=91=E8=8D=AF=E4=BA=BA=E4=BA=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AD=98=E5=82=A8=E5=88=B0=E5=8D=95=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E9=87=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 3 + .../mipsdl/entity/ctqyy/VYpzsPresInfo.java | 3 + .../thirddao/ctqyy/VYpzsPresInfoMapper.java | 1 - .../other/ctqyy/VYpzsPresInfoMapper.xml | 77 +++---------------- 4 files changed, 15 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index f78ae05..5867391 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1859,6 +1859,9 @@ public class CtqyyClient extends CommonHttpClient { ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getPRESCRIBE_NUMBER()); ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); + ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getCONFECT_MAN()); + ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getTAKE_OPERATOR()); + // ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME()); // ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO()); ioCollectOrder.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java index 60cc3fe..69d244b 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java @@ -76,4 +76,7 @@ public class VYpzsPresInfo implements Serializable { @TableField(exist = false) private String QUERY_CODE; private static final long serialVersionUID = 1L; + + @TableField(value = "TAKE_OPERATOR") + private String TAKE_OPERATOR; } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java index 1dcb905..5390765 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java @@ -14,7 +14,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface VYpzsPresInfoMapper extends BaseMapper { IPage selectGroupedWithPagination(Page vYpzsPresInfoPage,@Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); - IPage selectGroupedWithPaginationNew(Page vYpzsPresInfoPage,@Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml index 3ab8670..ddf3e43 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml @@ -48,6 +48,15 @@ SELECT PRESCRIBE_NUMBER,LAY_TIME, ${udiwmsBasicSkPrescribeRequest.queryCode} AS QUERY_CODE FROM v_ypzs_pres_info + + + AND STOOUT_NO = ( + SELECT STOOUT_NO + FROM v_insur_nation_goods_physic t + WHERE t.STOOUT_NO = v_ypzs_pres_info.STOOUT_NO + group by STOOUT_NO + ) + -