From 092d6c5d22034318482f166f95b2f08629cf8955 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 5 Jan 2026 09:50:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=80=9F=E9=98=85=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hxhq/business/domain/Study.java  | 32 +++++++++++++
 .../hxhq/business/enums/study/StudyTypeEnum.java   | 56 ++++++++++++++++++++++
 .../main/resources/mapper/business/StudyMapper.xml |  2 +-
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyTypeEnum.java

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java
index 8749a85..0b48489 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java
@@ -16,6 +16,9 @@ public class Study extends MpBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 类型1试验，5非试验表单，10麻精药表单 */
+    private Integer type;
+
     /** 试验编号 */
     @Compare(name = "试验编号")
     private String sn;
@@ -36,9 +39,22 @@ public class Study extends MpBaseEntity
     /** 借阅状态1未借阅，5待借阅，10借阅中 */
     private Integer borrowStatus;
 
+    /** 借阅开始日期 */
+    private String borrowStartDate;
+
+    /** 借阅结束日期 */
+    private String borrowEndDate;
+
     @Compare(name = "试验简述")
     private String remark;
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public void setSn(String sn)
     {
@@ -98,6 +114,22 @@ public class Study extends MpBaseEntity
         return borrowStatus;
     }
 
+    public String getBorrowStartDate() {
+        return borrowStartDate;
+    }
+
+    public void setBorrowStartDate(String borrowStartDate) {
+        this.borrowStartDate = borrowStartDate;
+    }
+
+    public String getBorrowEndDate() {
+        return borrowEndDate;
+    }
+
+    public void setBorrowEndDate(String borrowEndDate) {
+        this.borrowEndDate = borrowEndDate;
+    }
+
     @Override
     public String getRemark() {
         return remark;
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyTypeEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyTypeEnum.java
new file mode 100644
index 0000000..2b35acd
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyTypeEnum.java
@@ -0,0 +1,56 @@
+package com.hxhq.business.enums.study;
+
+/**
+ * 试验类型1试验，5非试验表单，10麻精药表单
+ * @author tanfei
+ */
+public enum StudyTypeEnum {
+
+    /**
+     * 1试验
+     */
+    sy(1, "试验"),
+
+    /**
+     * 5非试验表单
+     */
+    fsy(5, "非试验表单"),
+
+    /**
+     * 10麻精药表单
+     */
+    mjy(10, "麻精药表单");
+
+    private int value;
+    private String text;
+
+    StudyTypeEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static StudyTypeEnum getEnumByValue(int type) {
+        for (StudyTypeEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
index 58c4bda..38dbba9 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyListDto">
-        SELECT s.`id`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`status`,s.`borrow_status`,s.`create_time`,s.`create_by` FROM `t_study` s
+        SELECT s.`id`,s.`type`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`status`,s.`borrow_status`,s.`create_time`,s.`create_by` FROM `t_study` s
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}