From 24c9f6e53dcdc5d8d6b34669920aef09913c24fb Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Mon, 26 Jan 2026 10:53:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86]=E5=85=B1?=
 =?UTF-8?q?=E7=94=A8=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hxhq/business/controller/PublicController.java | 13 +++++++++++++
 .../src/main/java/com/hxhq/business/form/gsp/GspJyForm.java |  1 +
 .../main/java/com/hxhq/business/form/yq/YqSearchForm.java   | 11 +++++++++++
 .../java/com/hxhq/business/service/impl/YqServiceImpl.java  |  5 +++++
 4 files changed, 30 insertions(+)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
index 9d357d3..5ef03cf 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
@@ -13,6 +13,7 @@ import com.hxhq.business.form.common.SignForm;
 import com.hxhq.business.form.sj.SjSearchListForm;
 import com.hxhq.business.form.study.StudyFormPreSearchForm;
 import com.hxhq.business.form.study.StudySearchForm;
+import com.hxhq.business.form.yq.YqSearchForm;
 import com.hxhq.business.form.zcg.ZcgSearchForm;
 import com.hxhq.business.service.*;
 import com.hxhq.common.core.constant.CacheConstants;
@@ -67,6 +68,8 @@ public class PublicController extends BaseController {
     public ISysUserService sysUserService;
     @Autowired
     public ISjService sjService;
+    @Autowired
+    public IYqService yqService;
 
     /**
      * 获取编号
@@ -198,5 +201,15 @@ public class PublicController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询试剂列表
+     */
+    @GetMapping("/yqList")
+    public TableDataInfo list(YqSearchForm form)
+    {
+        startPage();
+        List<Yq> list = yqService.queryList(form);
+        return getDataTable(list);
+    }
 
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java
index 37958ae..5472a54 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java
@@ -36,6 +36,7 @@ public class GspJyForm {
     @NotNull(message = "请选择借阅日期")
     private Date endDate;
 
+
     public Long getId() {
         return id;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqSearchForm.java
index 095c2ce..8826d2c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqSearchForm.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqSearchForm.java
@@ -10,12 +10,23 @@ public class YqSearchForm {
     /** 编号 */
     private String bh;
 
+    /** 来源 */
+    private String ly;
+
     /** 失效日期开始 */
     private String startDate;
 
     /** 失效日期结束 */
     private String endDate;
 
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
     public String getMc() {
         return mc;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java
index 9f7a153..62eeb52 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java
@@ -17,6 +17,7 @@ import com.hxhq.business.form.yq.YqForm;
 import com.hxhq.business.form.yq.YqSearchForm;
 import com.hxhq.business.service.IYqJcgjService;
 import com.hxhq.business.utils.ObjectCompareUtil;
+import com.hxhq.common.core.domain.MpBaseEntity;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.domain.SysUser;
@@ -59,12 +60,16 @@ public class YqServiceImpl extends ServiceImpl<YqMapper, Yq> implements IYqServi
         if(StringUtils.isNotEmpty(form.getBh())) {
             queryWrapper.like(Yq::getBh, form.getBh());
         }
+        if(StringUtils.isNotEmpty(form.getLy())) {
+            queryWrapper.like(Yq::getLy, form.getLy());
+        }
         if(StringUtils.isNotEmpty(form.getStartDate())) {
             queryWrapper.ge(Yq::getJzrq, form.getStartDate());
         }
         if(StringUtils.isNotEmpty(form.getEndDate())) {
             queryWrapper.le(Yq::getJzrq, form.getEndDate());
         }
+        queryWrapper.orderByDesc(MpBaseEntity::getId);
         return this.list(queryWrapper);
     }