feat:[资源库管理][仪器管理]共用选择器

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

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

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

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