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 993f105..049cc40 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -1361,8 +1361,10 @@ public class YxfyyyClient extends CommonHttpClient { String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); - wrapper.ge(StrUtil.isNotEmpty(startTime),VInsurNationGoodsPhysic::getSEL_RETN_TIME,startTime+" 00:00:00"); - wrapper.le(StrUtil.isNotEmpty(endTime),VInsurNationGoodsPhysic::getSEL_RETN_TIME,endTime+" 23:59:59"); +// wrapper.ge(StrUtil.isNotEmpty(startTime),VInsurNationGoodsPhysic::getSEL_RETN_TIME,startTime+" 00:00:00"); +// wrapper.le(StrUtil.isNotEmpty(endTime),VInsurNationGoodsPhysic::getSEL_RETN_TIME,endTime+" 23:59:59"); + wrapper.apply(StrUtil.isNotEmpty(startTime)," TO_DATE(SEL_RETN_TIME, 'YYYY-MM-DD HH24:MI:SS') >= TO_DATE({0}, 'YYYY-MM-DD HH24:MI:SS') ",startTime+" 00:00:00"); + wrapper.apply(StrUtil.isNotEmpty(endTime)," TO_DATE(SEL_RETN_TIME, 'YYYY-MM-DD HH24:MI:SS') <= TO_DATE({0}, 'YYYY-MM-DD HH24:MI:SS') ",endTime+" 00:00:00"); String code = udiwmsBasicSkPrescribeRequest.getCode(); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code));