diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java index 9f95720..eac8b58 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java +++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java @@ -46,8 +46,8 @@ public class ZycxServiceImpl implements ZycxService { public List getSQDInfo(QuerySqdVO querySqdVO) { Web_getBarcode webGetBarcode = new Web_getBarcode(); webGetBarcode.setKsdh(querySqdVO.getDept()); - webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt(),"yyyy-MM-dd HH:mm:ss")); - webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt(),"yyyy-MM-dd HH:mm:ss")); + webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt() + " 00:00:00","yyyy-MM-dd HH:mm:ss")); + webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt() + " 23:59:59","yyyy-MM-dd HH:mm:ss")); webGetBarcode.setYljg(querySqdVO.getYljg()); webGetBarcode.setBrly("3"); webGetBarcode.setQueryType(querySqdVO.getQueryType()); diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index ab19aca..6d3e0c1 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.sqh = #{sqh} and a.zt = #{zt} - and a.ksdh = #{ksdh} + and (a.ksdh = #{ksdh} or a.bz2 = #{ksdh}) and a.brly = #{brly} and a.yljg = #{yljg}