From 2fac8e1b210dcea0faa559c2f96d5fe5cfcde001 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Mon, 17 Nov 2025 17:38:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czlis/zycx/controller/ZycxController.java | 7 ++++--- .../java/com/czlis/zycx/pojo/QuerySqdVO.java | 19 +++++++++++++++++++ .../com/czlis/zycx/pojo/Web_getBarcode.java | 4 ++++ .../com/czlis/zycx/service/ZycxService.java | 3 ++- .../zycx/service/impl/ZycxServiceImpl.java | 13 ++++++++----- zycx/src/main/resources/mapper/ZycxMapper.xml | 3 +++ 6 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 zycx/src/main/java/com/czlis/zycx/pojo/QuerySqdVO.java diff --git a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java index f149ee3..8c9f8ce 100644 --- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java +++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.lis.LabReqmain; import com.czlis.common.core.domain.entity.lis.LabReqpack; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.interfaceCommon.utils.PackBarcodeUtil; +import com.czlis.zycx.pojo.QuerySqdVO; import com.czlis.zycx.pojo.Web_getBarcode; import com.czlis.zycx.service.ZycxService; import io.swagger.annotations.Api; @@ -34,9 +35,9 @@ public class ZycxController extends BaseController { @ApiOperation("获取申请单") @GetMapping("/query") //@PreAuthorize("@ss.hasPermi('zycx:interface:query')") - public Result getSQDInfo(String dept,String userid,String st,String et,String yljg){ - log.info("查询申请单，zyreq/query：{},{},{},{},{}",dept,userid,st,et,yljg); - List sqdInfoList = zycxService.getSQDInfo(dept,userid,st,et,yljg); + public Result getSQDInfo(QuerySqdVO querySqdVO){ + log.info("查询申请单，zyreq/query：{},",querySqdVO.toString()); + List sqdInfoList = zycxService.getSQDInfo(querySqdVO); return new Result("0","查询成功！",sqdInfoList); } diff --git a/zycx/src/main/java/com/czlis/zycx/pojo/QuerySqdVO.java b/zycx/src/main/java/com/czlis/zycx/pojo/QuerySqdVO.java new file mode 100644 index 0000000..44c9901 --- /dev/null +++ b/zycx/src/main/java/com/czlis/zycx/pojo/QuerySqdVO.java @@ -0,0 +1,19 @@ +package com.czlis.zycx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class QuerySqdVO { + private String dept; + private String userid; + private String st; + private String et; + private String yljg; + private String queryType; //1.brdh,2.ch,3.brxm + private String queryValue; + +} diff --git a/zycx/src/main/java/com/czlis/zycx/pojo/Web_getBarcode.java b/zycx/src/main/java/com/czlis/zycx/pojo/Web_getBarcode.java index 05cc816..f5b87a6 100644 --- a/zycx/src/main/java/com/czlis/zycx/pojo/Web_getBarcode.java +++ b/zycx/src/main/java/com/czlis/zycx/pojo/Web_getBarcode.java @@ -73,4 +73,8 @@ public class Web_getBarcode { private Date st; private Date et; private String jymd; + + private String queryType; + private String queryValue; + } diff --git a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java index 6397f07..cbcb2aa 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java +++ b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java @@ -2,12 +2,13 @@ package com.czlis.zycx.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabReqmain; +import com.czlis.zycx.pojo.QuerySqdVO; import com.czlis.zycx.pojo.Web_getBarcode; import java.util.List; public interface ZycxService { - List getSQDInfo(String dept, String userid, String st, String et, String yljg); + List getSQDInfo(QuerySqdVO querySqdVO); Result createSQD(String dept, String userid, String st, String et, String yljg); 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 210a92c..45e5d4c 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 @@ -13,6 +13,7 @@ import com.czlis.interfaceCommon.utils.LisInterfaceUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.zycx.mapper.ZycxMapper; +import com.czlis.zycx.pojo.QuerySqdVO; import com.czlis.zycx.pojo.Web_getBarcode; import com.czlis.zycx.service.ZycxService; import lombok.extern.slf4j.Slf4j; @@ -43,13 +44,15 @@ public class ZycxServiceImpl implements ZycxService { @Override - public List getSQDInfo(String dept, String userid, String st, String et, String yljg) { + public List getSQDInfo(QuerySqdVO querySqdVO) { Web_getBarcode webGetBarcode = new Web_getBarcode(); - webGetBarcode.setKsdh(dept); - webGetBarcode.setSt(DateUtil.parse(st,"yyyy-MM-dd HH:mm:ss")); - webGetBarcode.setEt(DateUtil.parse(et,"yyyy-MM-dd HH:mm:ss")); - webGetBarcode.setYljg(yljg); + 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.setYljg(querySqdVO.getYljg()); webGetBarcode.setBrly("3"); + webGetBarcode.setQueryType(querySqdVO.getQueryType()); + webGetBarcode.setQueryValue(querySqdVO.getQueryValue()); return zycxMapper.getSQDInfo(webGetBarcode); } diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index 8db5122..77cdf51 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.sqsj <= CONVERT(varchar(100), #{et}, 120) + and brdh = #{queryValue} + and ch = #{queryValue} + and brxm = #{queryValue}