feat: [档案管理] 试验档案列表

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

@@ -1,9 +1,6 @@
 package com.hxhq.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -379,6 +376,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPermit(info);
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.dgd.getValue());
+        info.setGdApplyTime(new Date());
         updateById(info);
         sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"申请归档":info.getType().equals(StudyTypeEnum.fsy.getValue())?"申请归档":info.getType().equals(StudyTypeEnum.mjy.getValue())?"申请归档":"");
         sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Apply for Archiving":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Apply for Archiving":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Apply for Archiving":"");
@@ -482,6 +480,7 @@ public class StudyServiceImpl extends ServiceImpl implements
     public List<StudyListDto> queryArchiveList(StudySearchForm form) {
         QueryWrapper<StudyListDto> queryWrapper = new QueryWrapper();
         queryWrapper.eq("s.del_flag","0");
+        queryWrapper.in("s.status",new Integer[]{StudyStatusEnum.dgd.getValue(),StudyStatusEnum.gd.getValue(),StudyStatusEnum.djd.getValue()});
         queryWrapper.eq("s.type",form.getType());
         if(StringUtils.isNoneBlank(form.getName())){
             queryWrapper.like("s.name",form.getName());
@@ -549,7 +548,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         if(!(info.getStatus().equals(StudyStatusEnum.gd.getValue()) && info.getBorrowStatus().equals(StudyBorrowStatusEnum.djy.getValue()))){
             throw new ServiceException("当前状态不能同意/拒绝借阅");
         }
-        info.setBorrowStatus(study.getStatus());
+        info.setBorrowStatus(study.getBorrowStatus());
         info.setBorrowStartDate(sign.getStartDate());
         info.setBorrowEndDate(sign.getEndDate());
         updateById(info);