feat: [试验管理] 归档+借阅

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java

@@ -164,27 +164,6 @@ public class StudyController extends BaseController
     }
 
     /**
-     * 归档
-     * @param form
-     * @return
-     */
-    @RequiresPermissions({"business:study:gd"})
-    @PostMapping("/gd")
-    public AjaxResult gd(@RequestBody StudySaveForm form)
-    {
-        Study study = form.getStudy();
-        SignForm sign = form.getSign();
-        if(study==null || sign==null){
-            return AjaxResult.error("参数有误");
-        }
-        if(study.getId()==null || study.getId().longValue()<=0){
-            return AjaxResult.error("参数有误");
-        }
-        studyService.gd(form);
-        return AjaxResult.success();
-    }
-
-    /**
      * 检查锁定
      * @param form
      * @return
@@ -247,6 +226,27 @@ public class StudyController extends BaseController
     }
 
     /**
+     * 归档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions({"business:study:gd"})
+    @PostMapping("/gd")
+    public AjaxResult gd(@RequestBody StudySaveForm form)
+    {
+        Study study = form.getStudy();
+        SignForm sign = form.getSign();
+        if(study==null || sign==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(study.getId()==null || study.getId().longValue()<=0){
+            return AjaxResult.error("参数有误");
+        }
+        studyService.gd(form);
+        return AjaxResult.success();
+    }
+
+    /**
      * 解档
      * @param form
      * @return

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyBorrowStatusEnum.java

@@ -0,0 +1,56 @@
+package com.hxhq.business.enums.study;
+
+/**
+ * 试验借阅状态1未借阅，5待借阅，10借阅中
+ * @author tanfei
+ */
+public enum StudyBorrowStatusEnum {
+
+    /**
+     * 1未借阅
+     */
+    wjy(1, "未借阅"),
+
+    /**
+     * 5待借阅
+     */
+    djy(5, "待借阅"),
+
+    /**
+     * 10借阅中
+     */
+    jyz(10, "借阅中");
+
+    private int value;
+    private String text;
+
+    StudyBorrowStatusEnum(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 StudyBorrowStatusEnum getEnumByValue(int type) {
+        for (StudyBorrowStatusEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.business.domain.StudyJcgj;
 import com.hxhq.business.dto.study.StudyListDto;
+import com.hxhq.business.enums.study.StudyBorrowStatusEnum;
 import com.hxhq.business.enums.study.StudyStatusEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
@@ -199,12 +200,6 @@ public class StudyServiceImpl extends ServiceImpl implements
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void gd(StudySaveForm form) {
-
-    }
-
-    @Override
     public void checkSd(Study study) {
         if(study==null){
             throw new ServiceException("信息不存在");
@@ -247,19 +242,68 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPermit(info);
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.syz.getValue());
+        updateById(info);
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void gd(StudySaveForm form) {
+        Study study = form.getStudy();
+        SignForm sign = form.getSign();
+
+        Study info = getById(study.getId());
+        if(info==null){
+            throw new ServiceException("信息不存在");
+        }
+        if(!info.getStatus().equals(StudyStatusEnum.ysd.getValue())){
+            throw new ServiceException("当前状态不能申请归档");
+        }
+        checkPermit(info);
+        checkPassword(sign);
+        info.setStatus(StudyStatusEnum.dgd.getValue());
+        updateById(info);
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void jd(StudySaveForm form) {
+        Study study = form.getStudy();
+        SignForm sign = form.getSign();
 
+        Study info = getById(study.getId());
+        if(info==null){
+            throw new ServiceException("信息不存在");
+        }
+        if(!(info.getStatus().equals(StudyStatusEnum.gd.getValue()) && info.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue()))){
+            throw new ServiceException("当前状态不能申请解档");
+        }
+        checkPermit(info);
+        checkPassword(sign);
+        info.setStatus(StudyStatusEnum.djd.getValue());
+        updateById(info);
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(StudySaveForm form) {
+        Study study = form.getStudy();
+        SignForm sign = form.getSign();
 
+        Study info = getById(study.getId());
+        if(info==null){
+            throw new ServiceException("信息不存在");
+        }
+        if(!(info.getStatus().equals(StudyStatusEnum.gd.getValue()) && info.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue()))){
+            throw new ServiceException("当前状态不能申请借阅");
+        }
+        checkPermit(info);
+        checkPassword(sign);
+        info.setBorrowStatus(StudyBorrowStatusEnum.djy.getValue());
+        updateById(info);
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override