From 94d9315822ed088618f64a6d7086662d32022724 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 5 Jan 2026 11:51:51 +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=80=9F=E9=98=85=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/controller/StudyController.java  |  2 +-
 .../com/hxhq/business/form/common/SignForm.java    | 26 ++++++++++++++++++++++
 .../business/service/impl/StudyServiceImpl.java    |  3 +++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java
index aeda384..963b5a7 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java
@@ -281,7 +281,7 @@ public class StudyController extends BaseController
         if(study==null || sign==null){
             return AjaxResult.error("参数有误");
         }
-        if(study.getId()==null || study.getId().longValue()<=0){
+        if(study.getId()==null || study.getId().longValue()<=0 || StringUtils.isBlank(sign.getStartDate()) || StringUtils.isBlank(sign.getEndDate())){
             return AjaxResult.error("参数有误");
         }
         studyService.jy(form);
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java
index 06f13e2..30fb0ca 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java
@@ -26,6 +26,16 @@ public class SignForm {
      */
     private String qmrmm;
 
+    /**
+     * 开始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
     public String getQmyy() {
         return qmyy;
     }
@@ -65,4 +75,20 @@ public class SignForm {
     public void setQmrmm(String qmrmm) {
         this.qmrmm = qmrmm;
     }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
index cf1195c..3500e2f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
@@ -131,6 +131,7 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
             if(!old.getStatus().equals(StudyStatusEnum.cg.getValue()) && !old.getStatus().equals(StudyStatusEnum.syz.getValue())){
                 throw new ServiceException("当前状态不允许修改");
             }
+            checkPermit(old);
 
             //修改字段的稽查轨迹
             List<StudyJcgj> jcgjList = new ArrayList<>();
@@ -302,6 +303,8 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
         checkPermit(info);
         checkPassword(sign);
         info.setBorrowStatus(StudyBorrowStatusEnum.djy.getValue());
+        info.setBorrowStartDate(sign.getStartDate());
+        info.setBorrowEndDate(sign.getEndDate());
         updateById(info);
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }