Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/constant/RecordConstants.java

@@ -51,7 +51,7 @@ public class RecordConstants {
         /**
          * 查看申请
          */
-        public static final String VIEW_APPLY = "文件查看申请";
+        public static final String VIEW_APPLY = "文件查看";
         /**
          * 作废
          */
@@ -67,7 +67,7 @@ public class RecordConstants {
         /**
          * 文件提交
          * */
-        public static final String RECORD_UPDATE = "文件修改申请";
+        public static final String RECORD_UPDATE = "文件更改";
     }
 
     /**

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

@@ -114,13 +114,13 @@ public class RecordCategoryController extends AbstractFileUploadController imple
 
 
     // 文件评审，获取满足当前账户权限的记录列表
-    @GetMapping("/getReviewRecordList")
-    @Operation(summary = "获得文件记录分类")
-    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
-    public CommonResult<List<RecordCategoryRespVO>> getReviewRecordList() {
-        List<RecordCategoryRespVO>  recordRecords = recordCategoryService.getReviewRecordList();
-        return success(recordRecords);
-    }
+//    @GetMapping("/getReviewRecordList")
+//    @Operation(summary = "获得文件记录分类")
+//    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+//    public CommonResult<List<RecordCategoryRespVO>> getReviewRecordList() {
+//        List<RecordCategoryRespVO>  recordRecords = recordCategoryService.getReviewRecordList();
+//        return success(recordRecords);
+//    }
 
 
     @GetMapping("/getRecordCategoryTree")

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

@@ -136,4 +136,13 @@ public class RecordPermissionController extends AbstractFileUploadController imp
                         BeanUtils.toBean(list, RecordPermissionRespVO.class));
     }
 
+
+    @GetMapping("/test")
+    @Operation(summary = "导出记录权限 Excel")
+    //@PreAuthorize("@ss.hasPermission('qms:record-permission:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void test() {
+        recordPermissionService.test();
+    }
+
 }

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

@@ -140,17 +140,16 @@ public class RecordRecordController extends AbstractFileUploadController impleme
         return success(BeanUtils.toBean(matchedPermissionList, RecordPermissionRespVO.class));
     }
 
-//    @GetMapping("/export-excel")
-//    @Operation(summary = "导出文件、模板、记录 Excel")
-//    //@PreAuthorize("@ss.hasPermission('qms:record-record:export')")
-//    @ApiAccessLog(operateType = EXPORT)
-//    public void exportRecordRecordExcel(@Valid RecordRecordPageReqVO pageReqVO,
-//              HttpServletResponse response) throws IOException {
-//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-//        List<RecordRecordDO> list = recordRecordService.getRecordRecordPage(pageReqVO).getList();
-//        // 导出 Excel
-//        ExcelUtils.write(response, "文件、模板、记录.xls", "数据", RecordRecordRespVO.class,
-//                        BeanUtils.toBean(list, RecordRecordRespVO.class));
-//    }
+
+    // 流程--查询记录列表
+    @GetMapping("/getRecordList")
+    @Operation(summary = "获得文件、模板、记录分页")
+    //@PreAuthorize("@ss.hasPermission('qms:record-record:query')")
+    public CommonResult<List<RecordRecordRespVO>> getRecordList(RecordRecordPageReqVO pageReqVO) {
+
+        List<RecordRecordRespVO> result = recordRecordService.getRecordList(pageReqVO);
+        return success(BeanUtils.toBean(result, RecordRecordRespVO.class));
+    }
+
 
 }

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

@@ -91,5 +91,6 @@ public interface RecordRecordMapper extends BaseMapperX<RecordRecordDO> {
                                                      @Param("userId") Long userId,
                                                      @Param("userDepts") List<Long> userDepts);
 
-    List<RecordRecordDO> selectViewApplyRecordList(@Param("pageReqVO") RecordRecordPageReqVO pageReqVO);
+    // 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/recordpermission/RecordPermissionService.java

@@ -100,4 +100,6 @@ public interface RecordPermissionService {
      * @return
      */
     List<Long> getParentDepts();
+
+    void test();
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordpermission/RecordPermissionServiceImpl.java

@@ -13,6 +13,7 @@ import com.zt.plat.module.qms.resource.record.controller.admin.recordpermission.
 import com.zt.plat.module.qms.resource.record.dal.dataobject.recordcategory.RecordCategoryDO;
 import com.zt.plat.module.system.api.dept.DeptApi;
 import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
+import com.zt.plat.module.system.api.dept.dto.DeptSimpleRespDTO;
 import com.zt.plat.module.system.api.permission.PermissionApi;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -55,6 +56,17 @@ public class RecordPermissionServiceImpl implements RecordPermissionService {
 
     private Set<Long> roles = new HashSet<>();
 
+    @Override
+    public void test(){
+        CommonResult<List<DeptSimpleRespDTO>> allCompanyList = deptApi.getAllCompanyList();
+        log.info("allCompanyList:{}",allCompanyList);
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        Long visitDeptId = loginUser.getVisitDeptId();
+        if (ObjectUtils.isEmpty(visitDeptId)) CommonResult.error(RECORD_APPLY_NOT_EXISTS.getCode(), RECORD_APPLY_NOT_EXISTS.getMsg());
+        CommonResult<List<DeptRespDTO>> childDeptList = deptApi.getChildDeptList(visitDeptId);
+        log.info("booleanCommonResult:{}",childDeptList);
+    }
+
     /**
      * 通过分类Id 获取满足当前用户的权限列表
      * @param categoryId

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

@@ -88,8 +88,10 @@ public interface RecordRecordService {
 
     void updateRecordRecordListByIds(List<RecordRecordDO> recordRecordDOS);
 
+    List<RecordRecordRespVO> getRecordList(RecordRecordPageReqVO pageReqVO);
+
     /**
      * 文件更改申请流程-- 查询文件记录数据
      */
-    List<RecordRecordDO> selectViewApplyRecordList(RecordRecordPageReqVO pageReqVO);
+//    List<RecordRecordDO> selectViewApplyRecordList(RecordRecordPageReqVO pageReqVO);
 }