From e80832fd6c5c52f04e239fa610db09a11255b54c Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 17 Dec 2024 18:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=EF=BC=9A=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8F=B7=E5=8F=98=E6=88=90=E6=B5=81=E6=B0=B4=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A4=84=E6=96=B9=E5=8D=95=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=20=E4=BA=91=E9=9C=84=E5=A6=87?= =?UTF-8?q?=E5=B9=BC=EF=BC=9A=E5=8D=95=E6=8D=AE=E5=8F=B7=E5=8F=98=E6=88=90?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/CommonHttpClient.java | 27 ++++--------------- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 16 ++++++----- .../mipsdl/client/yxfuyy/YxfyyyClient.java | 2 +- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 2fa72ca..df654dd 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -34,6 +34,7 @@ import com.glxp.mipsdl.util.ResultVOUtils; import com.glxp.mipsdl.util.SubmitOrderUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,7 +49,8 @@ import java.util.Map; @Slf4j @Service public abstract class CommonHttpClient implements BaseHttpClient { - + @Value("${DSF_XML_SQL_TYPE:Mysql}") + private String defXmlSqlType; @Autowired private HttpClient httpClient; @Autowired @@ -327,27 +329,8 @@ public abstract class CommonHttpClient implements BaseHttpClient { 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(); - } finally { - // 释放连接资源 - if (conn != null) { - try { - conn.close(); - } catch (SQLException e) { - e.printStackTrace(); - } - } - } - log.info("数据库类型为：" + databaseProductName); - return databaseProductName; + + return defXmlSqlType; } 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 2550033..575b86d 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.enums.SqlLike; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -1405,21 +1406,22 @@ public class CtqyyClient extends CommonHttpClient { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { + log.info("udiwmsBasicSkPrescribeRequest11111"+udiwmsBasicSkPrescribeRequest); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); - wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime); - wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime); + wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, DateUtil.parseDate(startTime)); + wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, DateUtil.parseDate(endTime)); String code = udiwmsBasicSkPrescribeRequest.getCode(); String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName(); String key = udiwmsBasicSkPrescribeRequest.getKey(); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); - wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, key) - .or().like(VInsurNationGoodsPhysic::getRXNO, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NAME, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NO, key) + wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, "%"+key+"%") + .or().like(VInsurNationGoodsPhysic::getRXNO, "%"+key+"%") + .or().like(VInsurNationGoodsPhysic::getPSN_NAME, "%"+key+"%") + .or().like(VInsurNationGoodsPhysic::getPSN_NO, "%"+key+"%") ); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); if (udiwmsBasicSkPrescribeRequest.getBusType().equals("YPCF003")) { @@ -1764,7 +1766,7 @@ public class CtqyyClient extends CommonHttpClient { ioCollectOrder.setBusType("YPCF002"); } - ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER()); + ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO()); ioCollectOrder.setFromType("HIS系统"); ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index f565ba5..4e22c81 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -1656,7 +1656,7 @@ public class YxfyyyClient extends CommonHttpClient { VYpzsPresInfo presInfoEntity = value.get(0); StringBuilder errorMsg = new StringBuilder(); IoCollectOrder ioCollectOrder = new IoCollectOrder(); - ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER()); + ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO()); ioCollectOrder.setFromType("HIS系统"); ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());