feat: [档案管理] 拒绝归档

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSONObject;
 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.study.StudyTypeEnum;
 import com.hxhq.business.form.common.SignForm;
@@ -289,5 +290,107 @@ public class StudyController extends BaseController
         return table;
     }
 
+    /**
+     * 同意/拒绝归档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:trial:tygd","business:archive:trial:jjgd"},logical = Logical.OR)
+    @PostMapping("/doGd")
+    public AjaxResult doGd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doGd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝解档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:trial:tyjd","business:archive:trial:jjjd"},logical = Logical.OR)
+    @PostMapping("/doJd")
+    public AjaxResult doJd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.gd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:trial:tyjy","business:archive:trial:jjjy"},logical = Logical.OR)
+    @PostMapping("/doJy")
+    public AjaxResult doJy(@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 || study.getBorrowStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getBorrowStatus().equals(StudyBorrowStatusEnum.jyz.getValue()) && !study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJy(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions("business:archive:trial:qrgh")
+    @PostMapping("/gh")
+    public AjaxResult gh(@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.gh(form);
+        return AjaxResult.success();
+    }
+
     //endregion
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.hxhq.business.domain.Study;
 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.study.StudyTypeEnum;
 import com.hxhq.business.form.common.SignForm;
@@ -288,5 +289,107 @@ public class StudyDrugController extends BaseController
         return table;
     }
 
+    /**
+     * 同意/拒绝归档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:drugConfig:tygd","business:archive:drugConfig:jjgd"},logical = Logical.OR)
+    @PostMapping("/doGd")
+    public AjaxResult doGd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doGd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝解档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:drugConfig:tyjd","business:archive:drugConfig:jjjd"},logical = Logical.OR)
+    @PostMapping("/doJd")
+    public AjaxResult doJd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.gd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:drugConfig:tyjy","business:archive:drugConfig:jjjy"},logical = Logical.OR)
+    @PostMapping("/doJy")
+    public AjaxResult doJy(@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 || study.getBorrowStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getBorrowStatus().equals(StudyBorrowStatusEnum.jyz.getValue()) && !study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJy(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions("business:archive:drugConfig:qrgh")
+    @PostMapping("/gh")
+    public AjaxResult gh(@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.gh(form);
+        return AjaxResult.success();
+    }
+
     //endregion
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.hxhq.business.domain.Study;
 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.study.StudyTypeEnum;
 import com.hxhq.business.form.common.SignForm;
@@ -287,5 +288,107 @@ public class StudyNonTrialController extends BaseController
         return table;
     }
 
+    /**
+     * 同意/拒绝归档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:nonTrial:tygd","business:archive:nonTrial:jjgd"},logical = Logical.OR)
+    @PostMapping("/doGd")
+    public AjaxResult doGd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doGd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝解档
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:nonTrial:tyjd","business:archive:nonTrial:jjjd"},logical = Logical.OR)
+    @PostMapping("/doJd")
+    public AjaxResult doJd(@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 || study.getStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getStatus().equals(StudyStatusEnum.ysd.getValue()) && !study.getStatus().equals(StudyStatusEnum.gd.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getStatus().equals(StudyStatusEnum.gd.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJd(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions(value = {"business:archive:nonTrial:tyjy","business:archive:nonTrial:jjjy"},logical = Logical.OR)
+    @PostMapping("/doJy")
+    public AjaxResult doJy(@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 || study.getBorrowStatus()==null){
+            return AjaxResult.error("参数有误");
+        }
+        if(!study.getBorrowStatus().equals(StudyBorrowStatusEnum.jyz.getValue()) && !study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())){
+            return AjaxResult.error("状态有误");
+        }
+        if(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue()) && StringUtils.isBlank(sign.getRemark())){
+            return AjaxResult.error("原因不能为空");
+        }
+        studyService.doJy(form);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同意/拒绝借阅
+     * @param form
+     * @return
+     */
+    @RequiresPermissions("business:archive:nonTrial:qrgh")
+    @PostMapping("/gh")
+    public AjaxResult gh(@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.gh(form);
+        return AjaxResult.success();
+    }
+
     //endregion
 }

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

@@ -124,6 +124,30 @@ public interface IStudyService extends IService
      */
     List<StudyListDto> queryArchiveList(StudySearchForm form);
 
+    /**
+     * 同意拒绝归档
+     * @param form
+     */
+    void doGd(StudySaveForm form);
+
+    /**
+     * 同意拒绝解档
+     * @param form
+     */
+    void doJd(StudySaveForm form);
+
+    /**
+     * 同意拒绝借阅
+     * @param form
+     */
+    void doJy(StudySaveForm form);
+
+    /**
+     * 归还
+     * @param form
+     */
+    void gh(StudySaveForm form);
+
     // endregion
 
 }

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

@@ -497,5 +497,86 @@ public class StudyServiceImpl extends ServiceImpl implements
         return baseMapper.queryArchiveList(queryWrapper);
     }
 
+    @Override
+    public void doGd(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.dgd.getValue())){
+            throw new ServiceException("当前状态不能同意/拒绝归档");
+        }
+        checkPassword(sign);
+        info.setStatus(study.getStatus());
+        updateById(info);
+        sign.setQmyy(study.getStatus().equals(StudyStatusEnum.ysd.getValue())?"拒绝归档":"同意归档");
+        sign.setQmyyEn(study.getStatus().equals(StudyStatusEnum.ysd.getValue())?"Reject Archiving":"Approve Archiving");
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.ysd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
+    }
+
+    @Override
+    public void doJd(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.djd.getValue())){
+            throw new ServiceException("当前状态不能同意/拒绝解档");
+        }
+        checkPassword(sign);
+        info.setStatus(study.getStatus());
+        updateById(info);
+        sign.setQmyy(study.getStatus().equals(StudyStatusEnum.gd.getValue())?"拒绝解档":"同意解档");
+        sign.setQmyyEn(study.getStatus().equals(StudyStatusEnum.gd.getValue())?"Reject De-archiving":"Approve De-archiving");
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.gd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
+    }
+
+    @Override
+    public void doJy(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.djy.getValue()))){
+            throw new ServiceException("当前状态不能同意/拒绝借阅");
+        }
+        info.setBorrowStatus(study.getStatus());
+        info.setBorrowStartDate(sign.getStartDate());
+        info.setBorrowEndDate(sign.getEndDate());
+        updateById(info);
+        sign.setQmyy(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?"拒绝借阅":"同意借阅");
+        sign.setQmyyEn(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?"Reject Check-out":"Approve Check-out");
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
+    }
+
+    @Override
+    public void gh(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.jyz.getValue()))){
+            throw new ServiceException("当前状态不能确认归还");
+        }
+        checkPassword(sign);
+        info.setBorrowStatus(StudyBorrowStatusEnum.wjy.getValue());
+        updateById(info);
+        sign.setQmyy("确认归还");
+        sign.setQmyyEn("Confirm Check-in");
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign);
+    }
+
     //endregion
 }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml

@@ -66,7 +66,7 @@
 
     <!--    档案相关-->
     <select id="queryArchiveList" resultType="com.hxhq.business.dto.study.StudyListDto">
-        SELECT s.`id`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`leader_name_en`,s.`status`,s.`borrow_status`,s.`gd_apply_time`
+        SELECT s.`id`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`leader_name_en`,s.`status`,s.`borrow_status`,s.`gd_apply_time`,s.borrow_start_date,s.borrow_end_date
         FROM `t_study` s
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>