diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 088511d..99045bf 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -36,6 +36,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; import java.util.List; @Slf4j @@ -309,4 +314,23 @@ public abstract class CommonHttpClient implements BaseHttpClient { public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) { return null; } + + @Resource + private DataSource dataSource; + + public String getDataSourceType(){ + Connection conn = null; + DatabaseMetaData metaData = null; + String databaseProductName = ""; + try { + conn = dataSource.getConnection(); + metaData = conn.getMetaData(); + databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle + } catch (SQLException throwables) { + throwables.printStackTrace(); + } + + return databaseProductName; + + } } 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 a66e144..bf73786 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1390,6 +1390,9 @@ public class CtqyyClient extends CommonHttpClient { .or().like(VInsurNationGoodsPhysic::getPSN_NO, key) ); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); + + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + // 拉取处方时，改成拉取v_ypzs_pres_info IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); @@ -1413,6 +1416,10 @@ public class CtqyyClient extends CommonHttpClient { ); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code)); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsReturn::getPSN_NAME, fromCorpName)); + + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + + //拉取处方退货时，改成拉取v_ypzs_pres_info_return IPage page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); @@ -1445,7 +1452,7 @@ public class CtqyyClient extends CommonHttpClient { wrapper.and(StrUtil.isNotEmpty(keywords), t -> t.like(VYpzsPlanInfo::getCGDBH, keywords)//单据号 ); wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getFromCorpName()), VYpzsPlanInfo::getSCQYMC, udiwmsThrOrderRequest.getFromCorpName()); - + udiwmsThrOrderRequest.setDatabaseProductName(getDataSourceType()); Page page = vYpzsPlanInfoMapper.selectGroupedWithPagination( new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest); @@ -1525,6 +1532,8 @@ public class CtqyyClient extends CommonHttpClient { .or().like(VYpzsIoInfo::getIO_SORT, keywords)//收货方 ); + udiwmsThrOrderRequest.setDatabaseProductName(getDataSourceType()); + Page page = vYpzsIoInfoMapper.selectGroupedWithPagination(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest); List ioInfos = page.getRecords(); diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java index 3991ccf..23e2f22 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -131,5 +131,8 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest { private String key; private String busType; private String keyWords; + + + private String databaseProductName; } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java index cd93763..94af41e 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java @@ -202,5 +202,7 @@ public class UdiwmsThrOrderRequest extends ListPageRequest { private String shipperName; private String keyWords;//模糊 单据号、三方单据类型、发货方、收货方、单据时间，来源系统 + + private String databaseProductName; } diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml index 4e4b2d3..2fc8306 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml @@ -36,18 +36,32 @@ SELECT RECEIPT_NUMBER FROM v_ypzs_io_info - + = TO_DATE(#{udiwmsThrOrderRequest.startTime} , 'YYYY-MM-DD HH24:MI:SS') ]]> - + + + = #{udiwmsThrOrderRequest.startTime} + ]]> + + + + and (CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%' or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%') diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml index 7caae64..b83d64d 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml @@ -34,18 +34,34 @@ SELECT PRESCRIBE_NUMBER FROM v_ypzs_pres_info - + = TO_DATE(#{udiwmsBasicSkPrescribeRequest.startTime} , 'YYYY-MM-DD HH24:MI:SS') ]]> - + + + + = #{udiwmsBasicSkPrescribeRequest.startTime} + ]]> + + + + + and ( STOOUT_NO = #{udiwmsBasicSkPrescribeRequest.code} or PHYSIC_CODE = #{udiwmsBasicSkPrescribeRequest.code} diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml index f247c3e..d31732f 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml @@ -33,18 +33,36 @@ SELECT APPLY_NO FROM v_ypzs_pres_info_return - + = TO_DATE(#{udiwmsBasicSkPrescribeRequest.startTime} , 'YYYY-MM-DD HH24:MI:SS') ]]> - + + + + + = #{udiwmsBasicSkPrescribeRequest.startTime} + ]]> + + + + + + and (APPLY_NO = #{udiwmsBasicSkPrescribeRequest.code})