feat: [试验管理] 借阅操作

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

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

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java

@@ -131,6 +131,7 @@ public class StudyServiceImpl extends ServiceImpl 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 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());
     }