jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2026-01-19 17:21:09 +08:00
commit 683f98875c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
View File

@ -46,8 +46,8 @@ public class ZycxServiceImpl implements ZycxService {
public List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO) { public List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO) {
Web_getBarcode webGetBarcode = new Web_getBarcode(); Web_getBarcode webGetBarcode = new Web_getBarcode();
webGetBarcode.setKsdh(querySqdVO.getDept()); webGetBarcode.setKsdh(querySqdVO.getDept());
webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt(),"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(),"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.setYljg(querySqdVO.getYljg());
webGetBarcode.setBrly("3"); webGetBarcode.setBrly("3");
webGetBarcode.setQueryType(querySqdVO.getQueryType()); webGetBarcode.setQueryType(querySqdVO.getQueryType());

2
zycx/src/main/resources/mapper/ZycxMapper.xml
View File

@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="sqh != null and sqh != ''"> and a.sqh = #{sqh}</if> <if test="sqh != null and sqh != ''"> and a.sqh = #{sqh}</if>
<if test="zt != null and zt != ''"> and a.zt = #{zt}</if> <if test="zt != null and zt != ''"> and a.zt = #{zt}</if>
<if test="ksdh != null and ksdh != ''"> and a.ksdh = #{ksdh}</if> <if test="ksdh != null and ksdh != ''"> and (a.ksdh = #{ksdh} or a.bz2 = #{ksdh})</if>
<if test="brly != null and brly != ''"> and a.brly = #{brly}</if> <if test="brly != null and brly != ''"> and a.brly = #{brly}</if>
<if test="yljg != null and yljg != ''"> and a.yljg = #{yljg}</if> <if test="yljg != null and yljg != ''"> and a.yljg = #{yljg}</if>
<if test="st != null"><!-- 开始时间检索 --> <if test="st != null"><!-- 开始时间检索 -->