文件记录-流程申请-查询文件记录

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java

@@ -43,7 +43,7 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.RECORD_PERMISSION_
 @Validated
 //@DeptDataPermissionIgnore(enable = "true")
 @FileUploadController(source = "qms.recordrecord", codeKey = "data.fileUploadBusinessCode")
-public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker{
+public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker {
 
     static {
         FileUploadController annotation = RecordRecordController.class.getAnnotation(FileUploadController.class);
@@ -150,13 +150,29 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         PageResult<RecordRecordDO> pageResult;
         Integer isQueryHistory = pageReqVO.getIsQueryHistory();
         if (isQueryHistory != null && isQueryHistory == 1) { // 查询历史分页
-            pageResult=recordRecordService.getRecordHistoryPage(pageReqVO);
+            pageResult = recordRecordService.getRecordHistoryPage(pageReqVO);
-        }else {
+        } else {
             pageResult = recordRecordService.getRecordRecordPage(pageReqVO);
         }
         return success(BeanUtils.toBean(pageResult, RecordRecordRespVO.class));
     }
 
+    /**
+     * 查询有效和即将生效的文件记录
+     * 分发、作废、更改
+     *
+     * @param pageReqVO
+     * @return
+     */
+    @GetMapping("/getEffectiveRecordPage")
+    @Operation(summary = "获得文件、模板、记录分页")
+    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+    public CommonResult<PageResult<RecordRecordRespVO>> getEffectiveRecordPage(@Valid RecordRecordPageReqVO pageReqVO) {
+        PageResult<RecordRecordDO> pageResult;
+        pageResult = recordRecordService.getEffectiveRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, RecordRecordRespVO.class));
+    }
+
     // TODO
     @GetMapping("/getMatchedPermissionList")
     @Operation(summary = "获得记录权限列表")
@@ -169,7 +185,7 @@ public class RecordRecordController extends AbstractFileUploadController impleme
     }
 
 
-    // 流程--查询记录列表
+    // 流程-评审--查询记录列表
     @GetMapping("/getRecordList")
     @Operation(summary = "获得文件、模板、记录分页")
     //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
@@ -179,6 +195,19 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
     }
 
+    /**
+     * 流程-查看申请--查询记录列表
+     *  参数：
+     *      categoryId
+     */
+    @GetMapping("/getLookRecordList")
+    @Operation(summary = "获得文件、模板、记录分页")
+    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+    public CommonResult<PageResult<RecordRecordRespVO>> getLookRecordList(RecordRecordPageReqVO pageReqVO) {
+        PageResult<RecordRecordRespVO> result = recordRecordService.getLookRecordList(pageReqVO);
+        return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
+    }
+
     // 已由 XXL-Job 定时任务（updateRecordStatusJob）驱动，此接口保留用于手动触发/测试
     @GetMapping("/timing-updateRecordStatus")
     @Operation(summary = "定时更新文件、模板、记录状态")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordRecordMapper.java

@@ -93,12 +93,17 @@ public interface RecordRecordMapper extends BaseMapperX<RecordRecordDO> {
 
     /**
      * 通过 idPath 模糊查询 关联的文件记录
+     *
      * @param pathList
      * @return
      */
-    List<RecordRecordDO> selectRecordByIdPathLike(@Param("reqVO") RecordRecordPageReqVO reqVO,
+    IPage<RecordRecordDO> selectRecordByIdPathLike(Page<RecordRecordSaveReqVO> page,
+                                                  @Param("reqVO") RecordRecordPageReqVO reqVO,
                                                   @Param("pathList") List<String> pathList);
 
+    IPage<RecordRecordDO> getEffectiveRecordPage(Page<RecordRecordSaveReqVO> page,
+                                                 RecordRecordPageReqVO reqVO);
+
     // TODO
 //    List<RecordRecordDO> selectViewApplyRecordList(@Param("pageReqVO") RecordRecordPageReqVO pageReqVO);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordapply/RecordApplyServiceImpl.java

@@ -758,9 +758,9 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn
             if (now.isAfter(effectiveDate) || now.isEqual(effectiveDate)) {
                 entity.setRecordStatus(1); // 已生效
             }
-//            else {
+            else {
-//                entity.setRecordStatus(0); // 待生效
+                entity.setRecordStatus(3); // 待生效
-//            }
+            }
         } else {
             entity.setRecordStatus(1); // 默认已生效
         }
@@ -810,11 +810,15 @@ public class RecordApplyServiceImpl implements RecordApplyService, BMPCallbackIn
         queryWrapper.in(RecordPermissionDO::getSourceId,list); // 记录id
         List<RecordPermissionDO> recordPermissionDOS = recordPermissionService.selectList(queryWrapper);
         List<RecordPermissionDO> recordPermissionDOList = new ArrayList<>();
+        List<Long> permissionIds = new ArrayList<>();
         for (RecordPermissionDO recordPermissionDO : recordPermissionDOS) {
             recordPermissionDO.setCancelFlag("1");
+//            recordPermissionDO.setDeleted(true);
             recordPermissionDOList.add(recordPermissionDO);
         }
         recordPermissionService.updateRecordPermissionBatch(recordPermissionDOList);
+        // 回收权限
+        recordPermissionService.deleteRecordPermissionListByIds(permissionIds);
     }
 
     /**

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryService.java

@@ -73,5 +73,5 @@ public interface RecordCategoryService {
 
     List<RecordCategoryRespVO> getReviewRecordList();
 
-    List<RecordCategoryDO> selectCategoryAppraisalList(String appraisalFlag);
+    List<RecordCategoryDO> selectCategoryAppraisalList(String appraisalFlag,Long categoryRootId);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java

@@ -187,9 +187,10 @@ public class RecordCategoryServiceImpl implements RecordCategoryService {
     }
 
     @Override
-    public List<RecordCategoryDO> selectCategoryAppraisalList(String appraisalFlag) {
+    public List<RecordCategoryDO> selectCategoryAppraisalList(String appraisalFlag,Long categoryRootId) {
         LambdaQueryWrapper<RecordCategoryDO> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(RecordCategoryDO::getCustomConfig,"%" + appraisalFlag + "%");
+        if (categoryRootId != null) queryWrapper.eq(RecordCategoryDO::getId, categoryRootId);
         return recordCategoryMapper.selectList(queryWrapper);
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordService.java

@@ -1,18 +1,13 @@
 package com.zt.plat.module.qms.resource.record.service.recordrecord;
 
-import java.util.*;
+import com.zt.plat.framework.common.pojo.PageResult;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplyRespVO;
-import com.zt.plat.module.qms.resource.record.controller.admin.recordapply.vo.RecordApplySaveReqVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordRespVO;
 import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordSaveReqVO;
-import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.RecordPermissionDO;
-import jakarta.validation.*;
 import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.RecordRecordDO;
-import com.zt.plat.framework.common.pojo.PageResult;
+import jakarta.validation.Valid;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 文件、模板、记录 Service 接口
@@ -97,6 +92,10 @@ public interface RecordRecordService {
      */
     Integer updateRecordStatus();
 
+    PageResult<RecordRecordDO> getEffectiveRecordPage(RecordRecordPageReqVO pageReqVO);
+
+    PageResult<RecordRecordRespVO> getLookRecordList(RecordRecordPageReqVO pageReqVO);
+
     /**
      * 文件更改申请流程-- 查询文件记录数据
      */