Merge remote-tracking branch 'origin/master'

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){
+    public Result getSQDInfo(QuerySqdVO querySqdVO){
-        log.info("查询申请单，zyreq/query：{},{},{},{},{}",dept,userid,st,et,yljg);
+        log.info("查询申请单，zyreq/query：{},",querySqdVO.toString());
-        List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(dept,userid,st,et,yljg);
+        List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(querySqdVO);
         return new Result("0","查询成功！",sqdInfoList);
     }
 

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;
+
+}

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;
+
 }

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<Web_getBarcode> getSQDInfo(String dept, String userid, String st, String et, String yljg);
+    List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO);
 
     Result createSQD(String dept, String userid, String st, String et, String yljg);
 

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<Web_getBarcode> getSQDInfo(String dept, String userid, String st, String et, String yljg) {
+    public List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO) {
         Web_getBarcode webGetBarcode = new Web_getBarcode();
-        webGetBarcode.setKsdh(dept);
+        webGetBarcode.setKsdh(querySqdVO.getDept());
-        webGetBarcode.setSt(DateUtil.parse(st,"yyyy-MM-dd HH:mm:ss"));
+        webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt(),"yyyy-MM-dd HH:mm:ss"));
-        webGetBarcode.setEt(DateUtil.parse(et,"yyyy-MM-dd HH:mm:ss"));
+        webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt(),"yyyy-MM-dd HH:mm:ss"));
-        webGetBarcode.setYljg(yljg);
+        webGetBarcode.setYljg(querySqdVO.getYljg());
         webGetBarcode.setBrly("3");
+        webGetBarcode.setQueryType(querySqdVO.getQueryType());
+        webGetBarcode.setQueryValue(querySqdVO.getQueryValue());
         return zycxMapper.getSQDInfo(webGetBarcode);
     }
 

zycx/src/main/resources/mapper/ZycxMapper.xml

@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="et != null"><!-- 结束时间检索 -->
             AND a.sqsj &lt;= CONVERT(varchar(100), #{et}, 120)
         </if>
+         <if test="queryType == 'brdh'"> and a.brdh = #{queryValue}</if>
+         <if test="queryType == 'ch'"> and a.ch = #{queryValue}</if>
+         <if test="queryType == 'brxm'"> and a.brxm like  '%'+#{queryValue}+'%' </if>
     </select>
 
     <select id="createSQD" parameterType="map" statementType="CALLABLE" useCache="false">