From f0f4daac15a9df1f845023f0d28eb69146c85a1b Mon Sep 17 00:00:00 2001 From: wxr Date: Fri, 24 Oct 2025 08:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/QmsCommonConstant.java | 19 +++--- .../BusinessAssayParameterDataController.java | 14 ++--- .../BusinessAssayProjectDataController.java | 14 ++--- .../BusinessAssayReportDataController.java | 14 ++--- .../admin/BusinessAssayTaskController.java | 14 ++--- .../BusinessAssayTaskDataController.java | 20 +++--- .../BusinessAssayTaskDetailController.java | 16 ++--- .../admin/BusinessBaseSampleController.java | 14 ++--- .../BusinessHandoverRecordSubController.java | 14 ++--- ...QualityControlSampleProjectController.java | 14 ++--- .../BusinessSampleAssayResultController.java | 14 ++--- ...BusinessSampleEntrustDetailController.java | 16 ++--- ...usinessSampleEntrustProjectController.java | 14 ++--- ...ssSampleEntrustRegistrationController.java | 14 ++--- .../BusinessSampleHandoverController.java | 14 ++--- ...usinessSampleHandoverDetailController.java | 14 ++--- .../BusinessStandardSampleController.java | 14 ++--- ...sinessStandardSampleProjectController.java | 14 ++--- ...ssSubParentSampleAssessmentController.java | 14 ++--- .../BusinessSubParentSampleController.java | 14 ++--- ...inessSubSampleAnalysisGroupController.java | 14 ++--- ...BusinessSubSampleAssessmentController.java | 14 ++--- .../admin/BusinessSubSampleController.java | 18 +++--- .../admin/SampleFlowController.java | 63 +++++++++++-------- .../SampleEntrustGenSampleDataCmp.java | 43 ++++++++++++- .../sample/flow/SampleSimpleEncryptCmp.java | 4 +- .../flow/SampleSubProcessUpdateCmp.java | 48 ++++++++++++-- .../admin/BaseSampleController.java | 14 ++--- .../admin/ConfigAssayMethodController.java | 16 ++--- ...ssayMethodProjectAssessmentController.java | 14 ++--- ...sayMethodProjectCoefficientController.java | 14 ++--- .../ConfigAssayMethodProjectController.java | 14 ++--- ...AssayMethodProjectParameterController.java | 14 ++--- ...nfigAssayMethodProjectRangeController.java | 14 ++--- .../admin/ConfigBaseSampleController.java | 14 ++--- .../admin/ConfigEntrustSourceController.java | 16 ++--- .../admin/ConfigProjectController.java | 14 ++--- .../admin/ConfigReportFieldController.java | 14 ++--- .../admin/ConfigReportTemplateController.java | 14 ++--- .../admin/ConfigReportTypeController.java | 14 ++--- .../admin/ConfigRuleController.java | 14 ++--- .../admin/ConfigSampleFlowController.java | 14 ++--- .../admin/ConfigSampleHandoverController.java | 14 ++--- .../admin/ConfigSampleReportController.java | 14 ++--- .../admin/ConfigSimpleFlowCodeController.java | 14 ++--- .../admin/ConfigSimpleFlowRuleController.java | 14 ++--- ...ConfigStandardSampleProjectController.java | 14 ++--- .../ConfigStandardSampleTypeController.java | 14 ++--- .../admin/ConfigSubSampleController.java | 14 ++--- .../ConfigSubSampleMethodController.java | 14 ++--- .../ConfigSubSampleParentController.java | 14 ++--- ...ConfigSubSampleParentMethodController.java | 14 ++--- ...WarehouseLocationInfomationController.java | 14 ++--- .../MaterialAssayStandardController.java | 14 ++--- ...MaterialAssayStandardDetailController.java | 14 ++--- ...ssayStandardForecastProjectController.java | 14 ++--- ...MaterialAssayStandardMethodController.java | 14 ++--- .../dataobject/ConfigSubSampleMethodDO.java | 17 ++++- .../admin/DictionaryParameterController.java | 14 ++--- .../admin/DictionaryProjectController.java | 14 ++--- .../DictionarySampleFlowNodeController.java | 14 ++--- .../admin/DictionarySampleTypeController.java | 14 ++--- .../admin/ReportDocumentDataController.java | 14 ++--- .../admin/ReportDocumentMainController.java | 14 ++--- .../admin/ReportDocumentTypeController.java | 12 ++-- .../qms/core/sampleflow/SampleFlowNode.java | 2 +- .../mapper/BusinessAssayTaskDataMapper.xml | 4 +- 67 files changed, 575 insertions(+), 467 deletions(-) diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java index 3dc7c48..8d26b97 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java @@ -105,23 +105,26 @@ public interface QmsCommonConstant { String ENTRUST_INSPECTION = "entrust_inspection"; /** 中心收样 **/ - String FLOW_NODE_CENTER_RECEIVE = "flw_zx_receive"; + String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive"; /** 中心送样 **/ - String FLOW_NODE_CENTER_SEND = "flw_zx_send"; + String FLOW_NODE_CENTER_SEND = "flw_center_send"; /** 班组收样 **/ - String FLOW_NODE_TEAM_RECEIVE = "flw_bz_receive"; + String FLOW_NODE_TEAM_RECEIVE = "flw_team_receive"; - /** 样品编密 **/ - String FlOW_NODE_SAMPLE_ENCRYPT = "flw_ypbm"; + /** 样品编密(内部简码) **/ + String FlOW_NODE_SAMPLE_ENCRYPT = "flw_sample_encrypt"; /** 分析收样 **/ - String FLOW_NODE_ANALYSIS_RECEIVE = "flw_fx_receive"; + String FLOW_NODE_ANALYSIS_RECEIVE = "flw_analysis_receive"; /** 分析送样 **/ - String FLOW_NODE_ANALYSIS_SEND = "flw_fx_send"; + String FLOW_NODE_ANALYSIS_SEND = "flw_analysis_send"; /** 班组送样 **/ - String FLOW_NODE_TEAM_SEND = "flw_bz_send"; + String FLOW_NODE_TEAM_SEND = "flw_team_send"; + + /** 结束 **/ + String FLOW_NODE_END = "flw_end"; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java index 7cccef5..20e30e1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java @@ -44,14 +44,14 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @PostMapping("/create") @Operation(summary = "创建检测参数数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')") public CommonResult createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) { return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测参数数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')") public CommonResult updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) { businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @DeleteMapping("/delete") @Operation(summary = "删除检测参数数据业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')") public CommonResult deleteBusinessAssayParameterData(@RequestParam("id") Long id) { businessAssayParameterDataService.deleteBusinessAssayParameterData(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测参数数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')") public CommonResult deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) { businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @GetMapping("/get") @Operation(summary = "获得检测参数数据业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')") public CommonResult getBusinessAssayParameterData(@RequestParam("id") Long id) { BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id); return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @GetMapping("/page") @Operation(summary = "获得检测参数数据业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')") public CommonResult> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) { PageResult pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM @GetMapping("/export-excel") @Operation(summary = "导出检测参数数据业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayProjectDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayProjectDataController.java index 22318b6..6cb3769 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayProjectDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayProjectDataController.java @@ -45,14 +45,14 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @PostMapping("/create") @Operation(summary = "创建检测项目数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')") public CommonResult createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) { return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测项目数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')") public CommonResult updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) { businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO); return success(true); @@ -61,7 +61,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @DeleteMapping("/delete") @Operation(summary = "删除检测项目数据业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')") public CommonResult deleteBusinessAssayProjectData(@RequestParam("id") Long id) { businessAssayProjectDataService.deleteBusinessAssayProjectData(id); return success(true); @@ -70,7 +70,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测项目数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')") public CommonResult deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) { businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds()); return success(true); @@ -79,7 +79,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @GetMapping("/get") @Operation(summary = "获得检测项目数据业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')") public CommonResult getBusinessAssayProjectData(@RequestParam("id") Long id) { BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id); return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class)); @@ -87,7 +87,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @GetMapping("/page") @Operation(summary = "获得检测项目数据业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')") public CommonResult> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) { PageResult pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class)); @@ -95,7 +95,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar @GetMapping("/export-excel") @Operation(summary = "导出检测项目数据业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java index a05bcb8..3c9a0a2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java @@ -44,14 +44,14 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @PostMapping("/create") @Operation(summary = "创建检测报表数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')") public CommonResult createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) { return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测报表数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')") public CommonResult updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) { businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @DeleteMapping("/delete") @Operation(summary = "删除检测报表数据业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')") public CommonResult deleteBusinessAssayReportData(@RequestParam("id") Long id) { businessAssayReportDataService.deleteBusinessAssayReportData(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测报表数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')") public CommonResult deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) { businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @GetMapping("/get") @Operation(summary = "获得检测报表数据业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')") public CommonResult getBusinessAssayReportData(@RequestParam("id") Long id) { BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id); return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @GetMapping("/page") @Operation(summary = "获得检测报表数据业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')") public CommonResult> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) { PageResult pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark @GetMapping("/export-excel") @Operation(summary = "导出检测报表数据业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java index 664eb9d..178cda9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java @@ -45,14 +45,14 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检测任务分配业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')") public CommonResult createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) { return success(businessAssayTaskService.createBusinessAssayTask(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测任务分配业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')") public CommonResult updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) { businessAssayTaskService.updateBusinessAssayTask(updateReqVO); return success(true); @@ -61,7 +61,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检测任务分配业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") public CommonResult deleteBusinessAssayTask(@RequestParam("id") Long id) { businessAssayTaskService.deleteBusinessAssayTask(id); return success(true); @@ -70,7 +70,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测任务分配业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") public CommonResult deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) { businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds()); return success(true); @@ -79,7 +79,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检测任务分配业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')") public CommonResult getBusinessAssayTask(@RequestParam("id") Long id) { BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id); return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class)); @@ -87,7 +87,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检测任务分配业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')") public CommonResult> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) { PageResult pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO); return success(pageResult); @@ -95,7 +95,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检测任务分配业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDataController.java index 06de1d3..a14ce69 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDataController.java @@ -42,14 +42,14 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建子样检测任务业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')") public CommonResult createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) { return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样检测任务业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')") public CommonResult updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) { businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除子样检测任务业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')") public CommonResult deleteBusinessAssayTaskData(@RequestParam("id") Long id) { businessAssayTaskDataService.deleteBusinessAssayTaskData(id); return success(true); @@ -67,7 +67,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样检测任务业务") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')") public CommonResult deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) { businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得子样检测任务业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") public CommonResult getBusinessAssayTaskData(@RequestParam("id") Long id) { BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id); return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class)); @@ -84,7 +84,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/getUnAssayTaskGroupList") @Operation(summary = "获得未指派的子样检测任务业务分组列表") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") public CommonResult getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) { List list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO); return success(list); @@ -92,7 +92,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/getUnAuditTaskGroupList") @Operation(summary = "获得未审核的子样检测任务业务分组列表") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") public CommonResult getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) { List list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO); return success(list); @@ -100,7 +100,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/list") @Operation(summary = "获得子样检测任务业务列表") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") public CommonResult> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataReqVO reqVO) { List listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO); return success(listResult); @@ -108,7 +108,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得子样检测任务业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") public CommonResult> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) { PageResult pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO); return success(pageResult); @@ -116,7 +116,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出子样检测任务业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java index 2e93b80..73c9c08 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java @@ -44,14 +44,14 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @PostMapping("/create") @Operation(summary = "创建检测任务分配明细") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')") public CommonResult createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) { return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测任务分配明细") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')") public CommonResult updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) { businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @DeleteMapping("/delete") @Operation(summary = "删除检测任务分配明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')") public CommonResult deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) { businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测任务分配明细") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')") public CommonResult deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) { businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @GetMapping("/get") @Operation(summary = "获得检测任务分配明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") public CommonResult getBusinessAssayTaskDetail(@RequestParam("id") Long id) { BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id); return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @GetMapping("/page") @Operation(summary = "获得检测任务分配明细分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") public CommonResult> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) { PageResult pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @GetMapping("/list") @Operation(summary = "获得检测任务分配明细分页") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") public CommonResult> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) { List resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO); return success(resultList); @@ -102,7 +102,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark @GetMapping("/export-excel") @Operation(summary = "导出检测任务分配明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessBaseSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessBaseSampleController.java index f2545eb..42afdc8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessBaseSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessBaseSampleController.java @@ -44,14 +44,14 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建主样业务") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')") public CommonResult createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) { return success(businessBaseSampleService.createBusinessBaseSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新主样业务") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')") public CommonResult updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) { businessBaseSampleService.updateBusinessBaseSample(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除主样业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") public CommonResult deleteBusinessBaseSample(@RequestParam("id") Long id) { businessBaseSampleService.deleteBusinessBaseSample(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除主样业务") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") public CommonResult deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) { businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得主样业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')") public CommonResult getBusinessBaseSample(@RequestParam("id") Long id) { BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id); return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得主样业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')") public CommonResult> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) { PageResult pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出主样业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessHandoverRecordSubController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessHandoverRecordSubController.java index e6ea237..28908e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessHandoverRecordSubController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessHandoverRecordSubController.java @@ -45,14 +45,14 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @PostMapping("/create") @Operation(summary = "创建子样交接记录业务") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')") public CommonResult createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) { return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样交接记录业务") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')") public CommonResult updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) { businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO); return success(true); @@ -61,7 +61,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @DeleteMapping("/delete") @Operation(summary = "删除子样交接记录业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')") public CommonResult deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) { businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id); return success(true); @@ -70,7 +70,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样交接记录业务") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')") public CommonResult deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) { businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds()); return success(true); @@ -79,7 +79,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @GetMapping("/get") @Operation(summary = "获得子样交接记录业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')") public CommonResult getBusinessHandoverRecordSub(@RequestParam("id") Long id) { BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id); return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class)); @@ -87,7 +87,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @GetMapping("/page") @Operation(summary = "获得子样交接记录业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')") public CommonResult> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) { PageResult pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO); return success(pageResult); @@ -95,7 +95,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa @GetMapping("/export-excel") @Operation(summary = "导出子样交接记录业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java index 62642be..254c548 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java @@ -44,14 +44,14 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @PostMapping("/create") @Operation(summary = "创建质控样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')") public CommonResult createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) { return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新质控样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')") public CommonResult updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) { businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @DeleteMapping("/delete") @Operation(summary = "删除质控样检测项目业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')") public CommonResult deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) { businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除质控样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')") public CommonResult deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) { businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @GetMapping("/get") @Operation(summary = "获得质控样检测项目业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')") public CommonResult getBusinessQualityControlSampleProject(@RequestParam("id") Long id) { BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id); return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @GetMapping("/page") @Operation(summary = "获得质控样检测项目业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')") public CommonResult> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) { PageResult pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo @GetMapping("/export-excel") @Operation(summary = "导出质控样检测项目业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleAssayResultController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleAssayResultController.java index 9ef10f7..5c4c7d0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleAssayResultController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleAssayResultController.java @@ -44,14 +44,14 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @PostMapping("/create") @Operation(summary = "创建委检登记来样品位") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')") public CommonResult createBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO createReqVO) { return success(businessSampleAssayResultService.createBusinessSampleAssayResult(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新委检登记来样品位") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')") public CommonResult updateBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO updateReqVO) { businessSampleAssayResultService.updateBusinessSampleAssayResult(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @DeleteMapping("/delete") @Operation(summary = "删除委检登记来样品位") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')") public CommonResult deleteBusinessSampleAssayResult(@RequestParam("id") Long id) { businessSampleAssayResultService.deleteBusinessSampleAssayResult(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除委检登记来样品位") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')") public CommonResult deleteBusinessSampleAssayResultList(@RequestBody BatchDeleteReqVO req) { businessSampleAssayResultService.deleteBusinessSampleAssayResultListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @GetMapping("/get") @Operation(summary = "获得委检登记来样品位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')") public CommonResult getBusinessSampleAssayResult(@RequestParam("id") Long id) { BusinessSampleAssayResultDO businessSampleAssayResult = businessSampleAssayResultService.getBusinessSampleAssayResult(id); return success(BeanUtils.toBean(businessSampleAssayResult, BusinessSampleAssayResultRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @GetMapping("/page") @Operation(summary = "获得委检登记来样品位分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')") public CommonResult> getBusinessSampleAssayResultPage(@Valid BusinessSampleAssayResultPageReqVO pageReqVO) { PageResult pageResult = businessSampleAssayResultService.getBusinessSampleAssayResultPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSampleAssayResultRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa @GetMapping("/export-excel") @Operation(summary = "导出委检登记来样品位 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleAssayResultExcel(@Valid BusinessSampleAssayResultPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustDetailController.java index 09bea7c..a6d46fd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustDetailController.java @@ -42,14 +42,14 @@ public class BusinessSampleEntrustDetailController implements BusinessController @PostMapping("/create") @Operation(summary = "创建委检登记样品明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')") public CommonResult createBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO createReqVO) { return success(businessSampleEntrustDetailService.createBusinessSampleEntrustDetail(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新委检登记样品明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')") public CommonResult updateBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO updateReqVO) { businessSampleEntrustDetailService.updateBusinessSampleEntrustDetail(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除委检登记样品明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')") public CommonResult deleteBusinessSampleEntrustDetail(@RequestParam("id") Long id) { businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetail(id); return success(true); @@ -67,7 +67,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除委检登记样品明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')") public CommonResult deleteBusinessSampleEntrustDetailList(@RequestBody BatchDeleteReqVO req) { businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetailListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @GetMapping("/get") @Operation(summary = "获得委检登记样品明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") public CommonResult getBusinessSampleEntrustDetail(@RequestParam("id") Long id) { BusinessSampleEntrustDetailDO businessSampleEntrustDetail = businessSampleEntrustDetailService.getBusinessSampleEntrustDetail(id); return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class)); @@ -85,7 +85,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @GetMapping("/list") @Operation(summary = "获得委检登记样品明细列表") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") public CommonResult> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) { List listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO); return success(listResult); @@ -93,7 +93,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @GetMapping("/page") @Operation(summary = "获得委检登记样品明细分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") public CommonResult> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) { PageResult pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO); return success(pageResult); @@ -101,7 +101,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出委检登记样品明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustProjectController.java index c2e8af1..03c5ef2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustProjectController.java @@ -44,14 +44,14 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @PostMapping("/create") @Operation(summary = "创建委检样品检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')") public CommonResult createBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO createReqVO) { return success(businessSampleEntrustProjectService.createBusinessSampleEntrustProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新委检样品检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')") public CommonResult updateBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO updateReqVO) { businessSampleEntrustProjectService.updateBusinessSampleEntrustProject(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @DeleteMapping("/delete") @Operation(summary = "删除委检样品检测项目业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')") public CommonResult deleteBusinessSampleEntrustProject(@RequestParam("id") Long id) { businessSampleEntrustProjectService.deleteBusinessSampleEntrustProject(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除委检样品检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')") public CommonResult deleteBusinessSampleEntrustProjectList(@RequestBody BatchDeleteReqVO req) { businessSampleEntrustProjectService.deleteBusinessSampleEntrustProjectListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @GetMapping("/get") @Operation(summary = "获得委检样品检测项目业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')") public CommonResult getBusinessSampleEntrustProject(@RequestParam("id") Long id) { BusinessSampleEntrustProjectDO businessSampleEntrustProject = businessSampleEntrustProjectService.getBusinessSampleEntrustProject(id); return success(BeanUtils.toBean(businessSampleEntrustProject, BusinessSampleEntrustProjectRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @GetMapping("/page") @Operation(summary = "获得委检样品检测项目业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')") public CommonResult> getBusinessSampleEntrustProjectPage(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO) { PageResult pageResult = businessSampleEntrustProjectService.getBusinessSampleEntrustProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustProjectRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle @GetMapping("/export-excel") @Operation(summary = "导出委检样品检测项目业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleEntrustProjectExcel(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java index cc65ffa..1cd93de 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java @@ -46,14 +46,14 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @PostMapping("/create") @Operation(summary = "创建委检登记业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')") public CommonResult createBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO createReqVO) { return success(businessSampleEntrustRegistrationService.createBusinessSampleEntrustRegistration(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新委检登记业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')") public CommonResult updateBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO updateReqVO) { businessSampleEntrustRegistrationService.updateBusinessSampleEntrustRegistration(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @DeleteMapping("/delete") @Operation(summary = "删除委检登记业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')") public CommonResult deleteBusinessSampleEntrustRegistration(@RequestParam("id") Long id) { businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistration(id); return success(true); @@ -71,7 +71,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除委检登记业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')") public CommonResult deleteBusinessSampleEntrustRegistrationList(@RequestBody BatchDeleteReqVO req) { businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistrationListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @GetMapping("/get") @Operation(summary = "获得委检登记业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')") public CommonResult getBusinessSampleEntrustRegistration(@RequestParam("id") Long id) { BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistration = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistration(id); return success(BeanUtils.toBean(businessSampleEntrustRegistration, BusinessSampleEntrustRegistrationRespVO.class)); @@ -88,7 +88,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @GetMapping("/page") @Operation(summary = "获得委检登记业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')") public CommonResult> getBusinessSampleEntrustRegistrationPage(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) { PageResult pageResult = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistrationPage(pageReqVO); return success(pageResult); @@ -96,7 +96,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @GetMapping("/export-excel") @Operation(summary = "导出委检登记业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleEntrustRegistrationExcel(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java index 8e62b8e..96596b6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java @@ -44,14 +44,14 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @PostMapping("/create") @Operation(summary = "创建样品交接单业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')") public CommonResult createBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO createReqVO) { return success(businessSampleHandoverService.createBusinessSampleHandover(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品交接单业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')") public CommonResult updateBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO updateReqVO) { businessSampleHandoverService.updateBusinessSampleHandover(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @DeleteMapping("/delete") @Operation(summary = "删除样品交接单业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") public CommonResult deleteBusinessSampleHandover(@RequestParam("id") Long id) { businessSampleHandoverService.deleteBusinessSampleHandover(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品交接单业务") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") public CommonResult deleteBusinessSampleHandoverList(@RequestBody BatchDeleteReqVO req) { businessSampleHandoverService.deleteBusinessSampleHandoverListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @GetMapping("/get") @Operation(summary = "获得样品交接单业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')") public CommonResult getBusinessSampleHandover(@RequestParam("id") Long id) { BusinessSampleHandoverDO businessSampleHandover = businessSampleHandoverService.getBusinessSampleHandover(id); return success(BeanUtils.toBean(businessSampleHandover, BusinessSampleHandoverRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @GetMapping("/page") @Operation(summary = "获得样品交接单业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')") public CommonResult> getBusinessSampleHandoverPage(@Valid BusinessSampleHandoverPageReqVO pageReqVO) { PageResult pageResult = businessSampleHandoverService.getBusinessSampleHandoverPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke @GetMapping("/export-excel") @Operation(summary = "导出样品交接单业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleHandoverExcel(@Valid BusinessSampleHandoverPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java index c322284..d95a382 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java @@ -44,14 +44,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @PostMapping("/create") @Operation(summary = "创建样品交接明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')") public CommonResult createBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO createReqVO) { return success(businessSampleHandoverDetailService.createBusinessSampleHandoverDetail(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品交接明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')") public CommonResult updateBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO updateReqVO) { businessSampleHandoverDetailService.updateBusinessSampleHandoverDetail(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @DeleteMapping("/delete") @Operation(summary = "删除样品交接明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')") public CommonResult deleteBusinessSampleHandoverDetail(@RequestParam("id") Long id) { businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetail(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品交接明细") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')") public CommonResult deleteBusinessSampleHandoverDetailList(@RequestBody BatchDeleteReqVO req) { businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetailListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @GetMapping("/get") @Operation(summary = "获得样品交接明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") public CommonResult getBusinessSampleHandoverDetail(@RequestParam("id") Long id) { BusinessSampleHandoverDetailDO businessSampleHandoverDetail = businessSampleHandoverDetailService.getBusinessSampleHandoverDetail(id); return success(BeanUtils.toBean(businessSampleHandoverDetail, BusinessSampleHandoverDetailRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @GetMapping("/page") @Operation(summary = "获得样品交接明细分页") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") public CommonResult> getBusinessSampleHandoverDetailPage(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) { PageResult pageResult = businessSampleHandoverDetailService.getBusinessSampleHandoverDetailPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle @GetMapping("/export-excel") @Operation(summary = "导出样品交接明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSampleHandoverDetailExcel(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java index 92b9a37..45cca5d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java @@ -44,14 +44,14 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @PostMapping("/create") @Operation(summary = "创建标准样业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')") public CommonResult createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) { return success(businessStandardSampleService.createBusinessStandardSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新标准样业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')") public CommonResult updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) { businessStandardSampleService.updateBusinessStandardSample(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @DeleteMapping("/delete") @Operation(summary = "删除标准样业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") public CommonResult deleteBusinessStandardSample(@RequestParam("id") Long id) { businessStandardSampleService.deleteBusinessStandardSample(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除标准样业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") public CommonResult deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) { businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @GetMapping("/get") @Operation(summary = "获得标准样业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')") public CommonResult getBusinessStandardSample(@RequestParam("id") Long id) { BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id); return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @GetMapping("/page") @Operation(summary = "获得标准样业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')") public CommonResult> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) { PageResult pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke @GetMapping("/export-excel") @Operation(summary = "导出标准样业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java index 91942ad..2ab8fc3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java @@ -44,14 +44,14 @@ public class BusinessStandardSampleProjectController implements BusinessControll @PostMapping("/create") @Operation(summary = "创建标准样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')") public CommonResult createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) { return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新标准样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')") public CommonResult updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) { businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll @DeleteMapping("/delete") @Operation(summary = "删除标准样检测项目业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')") public CommonResult deleteBusinessStandardSampleProject(@RequestParam("id") Long id) { businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除标准样检测项目业务") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')") public CommonResult deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) { businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll @GetMapping("/get") @Operation(summary = "获得标准样检测项目业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')") public CommonResult getBusinessStandardSampleProject(@RequestParam("id") Long id) { BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id); return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll @GetMapping("/page") @Operation(summary = "获得标准样检测项目业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')") public CommonResult> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) { PageResult pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll @GetMapping("/export-excel") @Operation(summary = "导出标准样检测项目业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java index 30831b8..3772c1e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java @@ -42,14 +42,14 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @PostMapping("/create") @Operation(summary = "创建班组判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')") public CommonResult createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) { return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新班组判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')") public CommonResult updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) { businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @DeleteMapping("/delete") @Operation(summary = "删除班组判定数据业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')") public CommonResult deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id); return success(true); @@ -67,7 +67,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除班组判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')") public CommonResult deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) { businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @GetMapping("/get") @Operation(summary = "获得班组判定数据业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')") public CommonResult getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id); return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class)); @@ -84,7 +84,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @GetMapping("/page") @Operation(summary = "获得班组判定数据业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')") public CommonResult> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) { PageResult pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class)); @@ -92,7 +92,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont @GetMapping("/export-excel") @Operation(summary = "导出班组判定数据业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleController.java index d0cc766..ebd83b9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleController.java @@ -44,14 +44,14 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @PostMapping("/create") @Operation(summary = "创建分样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')") public CommonResult createBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO createReqVO) { return success(businessSubParentSampleService.createBusinessSubParentSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新分样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')") public CommonResult updateBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO updateReqVO) { businessSubParentSampleService.updateBusinessSubParentSample(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @DeleteMapping("/delete") @Operation(summary = "删除分样业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')") public CommonResult deleteBusinessSubParentSample(@RequestParam("id") Long id) { businessSubParentSampleService.deleteBusinessSubParentSample(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除分样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')") public CommonResult deleteBusinessSubParentSampleList(@RequestBody BatchDeleteReqVO req) { businessSubParentSampleService.deleteBusinessSubParentSampleListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @GetMapping("/get") @Operation(summary = "获得分样业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')") public CommonResult getBusinessSubParentSample(@RequestParam("id") Long id) { BusinessSubParentSampleDO businessSubParentSample = businessSubParentSampleService.getBusinessSubParentSample(id); return success(BeanUtils.toBean(businessSubParentSample, BusinessSubParentSampleRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @GetMapping("/page") @Operation(summary = "获得分样业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')") public CommonResult> getBusinessSubParentSamplePage(@Valid BusinessSubParentSamplePageReqVO pageReqVO) { PageResult pageResult = businessSubParentSampleService.getBusinessSubParentSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark @GetMapping("/export-excel") @Operation(summary = "导出分样业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSubParentSampleExcel(@Valid BusinessSubParentSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java index 37ead9b..cb00de5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java @@ -44,14 +44,14 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @PostMapping("/create") @Operation(summary = "创建子样分析班组业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')") public CommonResult createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) { return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样分析班组业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')") public CommonResult updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) { businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @DeleteMapping("/delete") @Operation(summary = "删除子样分析班组业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')") public CommonResult deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) { businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样分析班组业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')") public CommonResult deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) { businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @GetMapping("/get") @Operation(summary = "获得子样分析班组业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')") public CommonResult getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) { BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id); return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @GetMapping("/page") @Operation(summary = "获得子样分析班组业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')") public CommonResult> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) { PageResult pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl @GetMapping("/export-excel") @Operation(summary = "导出子样分析班组业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java index 41aa806..78e9696 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java @@ -44,14 +44,14 @@ public class BusinessSubSampleAssessmentController implements BusinessController @PostMapping("/create") @Operation(summary = "创建子样判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')") public CommonResult createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) { return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')") public CommonResult updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) { businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除子样判定数据业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')") public CommonResult deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) { businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id); return success(true); @@ -69,7 +69,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样判定数据业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')") public CommonResult deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) { businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController @GetMapping("/get") @Operation(summary = "获得子样判定数据业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')") public CommonResult getBusinessSubSampleAssessment(@RequestParam("id") Long id) { BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id); return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class)); @@ -86,7 +86,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController @GetMapping("/page") @Operation(summary = "获得子样判定数据业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')") public CommonResult> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) { PageResult pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class)); @@ -94,7 +94,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出子样判定数据业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java index 68e392f..f3c4057 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java @@ -47,14 +47,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建子样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')") public CommonResult createBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO createReqVO) { return success(businessSubSampleService.createBusinessSubSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')") public CommonResult updateBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO updateReqVO) { businessSubSampleService.updateBusinessSubSample(updateReqVO); return success(true); @@ -63,7 +63,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除子样业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") public CommonResult deleteBusinessSubSample(@RequestParam("id") Long id) { businessSubSampleService.deleteBusinessSubSample(id); return success(true); @@ -72,7 +72,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样业务") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") public CommonResult deleteBusinessSubSampleList(@RequestBody BatchDeleteReqVO req) { businessSubSampleService.deleteBusinessSubSampleListByIds(req.getIds()); return success(true); @@ -81,7 +81,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得子样业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") public CommonResult getBusinessSubSample(@RequestParam("id") Long id) { BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id); return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class)); @@ -89,7 +89,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @GetMapping("/list") @Operation(summary = "获得子样业务列表") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") public CommonResult getBusinessSubSampleList(@Valid BusinessSubSampleReqVO reqVO) { List listResult = businessSubSampleService.getBusinessSubSampleList(reqVO); return success(listResult); @@ -97,7 +97,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得子样业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") public CommonResult> getBusinessSubSamplePage(@Valid BusinessSubSamplePageReqVO pageReqVO) { PageResult pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO); return success(pageResult); @@ -105,7 +105,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @GetMapping("/page-task") @Operation(summary = "获得子样业务分页") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") public CommonResult> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) { PageResult pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO); List list = pageResult.getList(); @@ -128,7 +128,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出子样业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportBusinessSubSampleExcel(@Valid BusinessSubSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java index 5d2fcab..e1589a8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java @@ -57,42 +57,47 @@ public class SampleFlowController { SampleFlowNode zxr = new SampleFlowNode(); zxr.setNodeName("中心收样"); - zxr.setNodeKey("flw_zx_receive"); + zxr.setNodeKey("flw_center_receive"); zxr.setSort(3100); SampleFlowNode zxs = new SampleFlowNode(); zxs.setNodeName("中心送样"); - zxs.setNodeKey("flw_zx_send"); + zxs.setNodeKey("flw_center_send"); zxs.setSort(3200); SampleFlowNode bzr = new SampleFlowNode(); bzr.setNodeName("班组收样"); - bzr.setNodeKey("flw_bz_receive"); + bzr.setNodeKey("flw_team_receive"); bzr.setSort(3300); SampleFlowNode ypbm = new SampleFlowNode(); ypbm.setNodeName("样品编密"); - ypbm.setNodeKey("flw_ypbm"); + ypbm.setNodeKey("flw_sample_encrypt"); ypbm.setSort(3400); - SampleFlowNode fxr = new SampleFlowNode(); - fxr.setNodeName("分析收样"); - fxr.setNodeKey("flw_fx_receive"); - fxr.setSort(3500); - - SampleFlowNode fxs = new SampleFlowNode(); - fxs.setNodeName("分析送样"); - fxs.setNodeKey("flw_fx_send"); - fxs.setSort(3600); +// SampleFlowNode fxr = new SampleFlowNode(); +// fxr.setNodeName("分析收样"); +// fxr.setNodeKey("flw_analysis_receive"); +// fxr.setSort(3500); +// + SampleFlowNode fx = new SampleFlowNode(); + fx.setNodeName("样品分析"); + fx.setNodeKey("flw_analysis"); + fx.setSort(3550); +// +// SampleFlowNode fxs = new SampleFlowNode(); +// fxs.setNodeName("分析送样"); +// fxs.setNodeKey("flw_analysis_send"); +// fxs.setSort(3600); SampleFlowNode bzs = new SampleFlowNode(); bzs.setNodeName("班组送样"); - bzs.setNodeKey("flw_bz_send"); + bzs.setNodeKey("flw_team_send"); bzs.setSort(3700); SampleFlowNode ypgk = new SampleFlowNode(); ypgk.setNodeName("样品归库"); - ypgk.setNodeKey("flw_ypgk"); + ypgk.setNodeKey("flw_sample_storage"); ypgk.setSort(3800); ypgk.setNextFlowNodeList(null); flowNodeList.add(ypgk); @@ -112,32 +117,36 @@ public class SampleFlowController { flowNodeList.add(zxs); bzr.setNextFlowNodeList(new ArrayList<>() {{ - add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("样品需要编密并且没编密过")); - add(BeanUtils.toBean(fxr,SampleFlowNode.class).setCondition("样品无需编密或样品已编密过")); + add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过 + add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过 }}); flowNodeList.add(bzr); ypbm.setNextFlowNodeList(new ArrayList<>() {{ - add(BeanUtils.toBean(fxr,SampleFlowNode.class).setIsDefault(true)); + add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true)); }}); flowNodeList.add(ypbm); - fxr.setNextFlowNodeList(new ArrayList<>() {{ - add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true)); - }}); - flowNodeList.add(fxr); +// fxr.setNextFlowNodeList(new ArrayList<>() {{ +// add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true)); +// }}); +// flowNodeList.add(fxr); +// +// +// fxs.setNextFlowNodeList(new ArrayList<>() {{ +// add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完")); +// }}); +// flowNodeList.add(fxs); - - fxs.setNextFlowNodeList(new ArrayList<>() {{ + fx.setNextFlowNodeList(new ArrayList<>() {{ add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完")); }}); - flowNodeList.add(fxs); - + flowNodeList.add(fx); bzs.setNextFlowNodeList(new ArrayList<>() {{ - add(BeanUtils.toBean(fxr,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检")); + add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检")); add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报")); add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完")); }}); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java index b450819..eae2876 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java @@ -15,6 +15,7 @@ import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.exception.ServiceException; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleAssayResultDO; @@ -26,6 +27,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnaly import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayReportDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessBaseSampleMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSampleAssayResultMapper; @@ -43,6 +45,7 @@ import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodPr import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigBaseSampleDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSampleFlowDO; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSampleReportDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleMethodDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleParentDO; @@ -53,6 +56,7 @@ import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjec import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectParameterMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigBaseSampleMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSampleFlowMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSampleReportMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMethodMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleParentMapper; @@ -132,6 +136,12 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { @Resource private ConfigSampleFlowMapper configSampleFlowMapper; + + @Resource + private BusinessAssayReportDataMapper businessAssayReportDataMapper; + + @Resource + private ConfigSampleReportMapper configSampleReportMapper; @Override public void process() throws Exception { @@ -154,7 +164,6 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { //样品大类列表 List baseSampleList = baseSampleMapper.selectList(); - //主样配置 List configBaseSampleList = configBaseSampleMapper.selectList(); //分样配置 @@ -169,8 +178,12 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { List configAssayMethodProjectList = configAssayMethodProjectMapper.selectList(); //分析方法检测项目参数配置 List configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectList(); + //检测项目字典 List dictionaryProjectList = dictionaryProjectMapper.selectList(); + //主样报表配置 + List configSampleReportList = configSampleReportMapper.selectList(); + //样品流程配置 List configSampleFlowKeyList = new ArrayList<>(); List configBaseSampleFlowKeyList = configBaseSampleList.stream().map(m -> m.getFlowKey()).distinct().collect(Collectors.toList()); @@ -179,17 +192,29 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { configSampleFlowKeyList.addAll(configSubSampleFlowKeyList); List configSampleFlowList = configSampleFlowMapper.selectLatestConfigSampleFlowListByKeys(configSampleFlowKeyList); + //主样 List businessBaseSampleDOList = new ArrayList<>(); + //分样 List businessSubParentSampleDOList = new ArrayList<>(); + //分样子样 List businessSubSampleDOList = new ArrayList<>(); + //分样子样分析班组 List businessSubSampleAnalysisGroupDOList = new ArrayList<>(); + //子样检测任务 List businessAssayTaskDataDOList = new ArrayList<>(); + //检测任务的分析项目 List businessAssayProjectDataDOList = new ArrayList<>(); + //分析项目对应的分析参数 List businessAssayParameterDataDOList = new ArrayList<>(); + //分析报表数据 + List businessAssayReportDataDOList = new ArrayList<>(); + //子样流转信息列表 List sampleFlowInfoList = new ArrayList<>(); + //委托明细排序 List sampleEntrustDetailListSort = sampleEntrustDetailList.stream().sorted(Comparator.comparingInt(BusinessSampleEntrustDetailDO::getSort)).collect(Collectors.toList()); + //主样 BusinessBaseSampleDO businessBaseSampleDO = null; for (BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO : sampleEntrustDetailListSort) {//委托样品明细 @@ -264,7 +289,18 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { //添加到列表 businessBaseSampleDOList.add(businessBaseSampleDO); - + + //=======================报表========================== + List configSampleReportDOList = configSampleReportList.stream().filter(f -> f.getConfigBaseSampleId().equals(configBaseSampleId)).collect(Collectors.toList()); + for (ConfigSampleReportDO configSampleReport : configSampleReportDOList) { + BusinessAssayReportDataDO businessAssayReportDataDO = new BusinessAssayReportDataDO(); + businessAssayReportDataDO.setBusinessBaseSampleId(configBaseSampleId); + businessAssayReportDataDO.setConfigReportTypeId(configSampleReport.getConfigReportTypeId()); + businessAssayReportDataDO.setConfigSampleReportId(configSampleReport.getId()); + businessAssayReportDataDO.setSampleCode(businessBaseSampleDO.getSampleCode()); + + businessAssayReportDataDOList.add(businessAssayReportDataDO); + } //=====================委托明细====================== //设置主样id businessSampleEntrustDetailDO.setBusinessBaseSampleId(businessBaseSampleDO.getId()); @@ -456,6 +492,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { if (CollUtil.isNotEmpty(businessAssayParameterDataDOList)) { businessAssayParameterDataMapper.insertBatch(businessAssayParameterDataDOList); } + if (CollUtil.isNotEmpty(businessAssayReportDataDOList)) { + businessAssayReportDataMapper.insertBatch(businessAssayReportDataDOList); + } } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSimpleEncryptCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSimpleEncryptCmp.java index 6113865..b476b1d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSimpleEncryptCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSimpleEncryptCmp.java @@ -9,6 +9,8 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleFlowContext; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO; import com.zt.plat.module.qms.core.code.SequenceUtil; +import com.zt.plat.module.qms.enums.QmsCommonConstant; + import jakarta.annotation.Resource; @LiteflowComponent(id = "sampleSimpleEncryptCmp", name = "简码编密") @@ -33,7 +35,7 @@ public class SampleSimpleEncryptCmp extends NodeComponent { @Override public boolean isAccess() { SampleFlowContext sampleFlowContext = this.getContextBean(SampleFlowContext.class); - return "flw_ypbm".equals(sampleFlowContext.getCurrentSampleFlowKey()); + return QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(sampleFlowContext.getCurrentSampleFlowKey()); } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java index 5b56d3d..3e76076 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java @@ -1,25 +1,33 @@ package com.zt.plat.module.qms.business.bus.liteflow.sample.flow; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; + import com.alibaba.fastjson2.JSON; +import com.ql.util.express.DefaultContext; import com.ql.util.express.ExpressRunner; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; - +import com.zt.plat.framework.common.exception.ServiceException; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessHandoverRecordSubDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessHandoverRecordSubMapper; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleFlowContext; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigRuleDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSampleFlowDO; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigRuleMapper; import com.zt.plat.module.qms.business.config.service.ConfigSampleFlowService; //import com.zt.plat.module.qms.business.config.service.ConfigSubSampleService; import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition; import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode; +import com.zt.plat.module.qms.enums.QmsCommonConstant; + import jakarta.annotation.Resource; @LiteflowComponent(id = "sampleSubProcessUpdateCmp", name = "子样流程节点更新") @@ -57,10 +65,42 @@ public class SampleSubProcessUpdateCmp extends NodeComponent { String configSampleFlowContent = configSampleFlow.getContent(); //样品流程定义 SampleFlowDefinition sampleFlowDefinition = JSON.parseObject(configSampleFlowContent, SampleFlowDefinition.class); + //获取流程列表 List flowNodeList = sampleFlowDefinition.getFlowNodeList(); - SampleFlowNode flowNode = flowNodeList.stream().filter(f -> f.getNodeKey().equals(currentSampleFlowKey)).findFirst().orElse(null); - List nextFlowNodeList = flowNode.getNextFlowNodeList(); - SampleFlowNode nextFlowNode = nextFlowNodeList.stream().filter(f -> f.getIsDefault()).findFirst().orElse(null); + //查询当前流程节点 + SampleFlowNode currFlowNode = flowNodeList.stream().filter(f -> f.getNodeKey().equals(currentSampleFlowKey)).findFirst().orElse(null); + //获取下一个流程节点列表 + List nextFlowNodeList = currFlowNode.getNextFlowNodeList(); + //查询默认节点 + SampleFlowNode nextFlowNode = nextFlowNodeList.stream().filter(f -> f.getIsDefault() != null && f.getIsDefault()).findFirst().orElse(null); + //未找到默认节点 + if (nextFlowNode == null) { + //循环下一个流程节点列表，根据条件判断 + for (SampleFlowNode flowNode : nextFlowNodeList) { + ConfigRuleDO conditionRule = configRuleMapper.selectLatestConfigRuleByCode(flowNode.getCondition()); + Boolean isMeetCondition = false; + DefaultContext context = new DefaultContext<>(); + ConfigSubSampleDO configSubSample = sampleFlowContext.getConfigSubSampleById(businessSubSample.getConfigSubSampleId()); + Boolean hasSubSimpleCodeRule = configSubSample != null && StringUtils.isNotBlank(configSubSample.getSimpleCodeRule()); + Boolean hasSubSampleEncrypt = businessHandoverRecordSubDOList.stream().anyMatch(m -> QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(m.getSampleFlowNodeKey())); + + context.put("hasSubSimpleCodeRule", hasSubSimpleCodeRule); + context.put("hasSubSampleEncrypt", hasSubSampleEncrypt); + try { + isMeetCondition = (Boolean) expressRunner.execute(conditionRule.getExpression(), context, null, false, false); + } catch (Exception e) { + e.printStackTrace(); + throw new ServiceException(1_032_100_000, e.getMessage()); + } + //满足条件，赋值下一个流程节点，跳出循环 + if (isMeetCondition) { + nextFlowNode = flowNode; + break; + } + + } + } + businessSubSample.setSampleFlowNodeKey(nextFlowNode.getNodeKey()); businessSubSample.setSampleFlowNodeTime(currentDateTime); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java index dbf5cf8..00e7fc2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java @@ -45,14 +45,14 @@ public class BaseSampleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建样品大类管理") - @PreAuthorize("@ss.hasPermission('qms:base-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:create')") public CommonResult createBaseSample(@Valid @RequestBody BaseSampleSaveReqVO createReqVO) { return success(baseSampleService.createBaseSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品大类管理") - @PreAuthorize("@ss.hasPermission('qms:base-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:update')") public CommonResult updateBaseSample(@Valid @RequestBody BaseSampleSaveReqVO updateReqVO) { baseSampleService.updateBaseSample(updateReqVO); return success(true); @@ -61,7 +61,7 @@ public class BaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除样品大类管理") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") public CommonResult deleteBaseSample(@RequestParam("id") Long id) { baseSampleService.deleteBaseSample(id); return success(true); @@ -70,7 +70,7 @@ public class BaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品大类管理") - @PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") public CommonResult deleteBaseSampleList(@RequestBody BatchDeleteReqVO req) { baseSampleService.deleteBaseSampleListByIds(req.getIds()); return success(true); @@ -79,7 +79,7 @@ public class BaseSampleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得样品大类管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:query')") public CommonResult getBaseSample(@RequestParam("id") Long id) { BaseSampleDO baseSample = baseSampleService.getBaseSample(id); return success(BeanUtils.toBean(baseSample, BaseSampleRespVO.class)); @@ -94,7 +94,7 @@ public class BaseSampleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得样品大类管理分页") - @PreAuthorize("@ss.hasPermission('qms:base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:query')") public CommonResult> getBaseSamplePage(@Valid BaseSamplePageReqVO pageReqVO) { PageResult pageResult = baseSampleService.getBaseSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, BaseSampleRespVO.class)); @@ -102,7 +102,7 @@ public class BaseSampleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出样品大类管理 Excel") - @PreAuthorize("@ss.hasPermission('qms:base-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:base-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportBaseSampleExcel(@Valid BaseSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodController.java index 2868e78..98c088c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodController.java @@ -44,14 +44,14 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:create')") public CommonResult createConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO createReqVO) { return success(configAssayMethodService.createConfigAssayMethod(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:update')") public CommonResult updateConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO updateReqVO) { configAssayMethodService.updateConfigAssayMethod(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检测方法配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") public CommonResult deleteConfigAssayMethod(@RequestParam("id") Long id) { configAssayMethodService.deleteConfigAssayMethod(id); return success(true); @@ -69,7 +69,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") public CommonResult deleteConfigAssayMethodList(@RequestBody BatchDeleteReqVO req) { configAssayMethodService.deleteConfigAssayMethodListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检测方法配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") public CommonResult getConfigAssayMethod(@RequestParam("id") Long id) { ConfigAssayMethodDO configAssayMethod = configAssayMethodService.getConfigAssayMethod(id); return success(BeanUtils.toBean(configAssayMethod, ConfigAssayMethodRespVO.class)); @@ -86,7 +86,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @GetMapping("/list") @Operation(summary = "获得检测方法配置列表") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") public CommonResult> getConfigAssayMethodList(@Valid ConfigAssayMethodReqVO reqVO) { List listResult = configAssayMethodService.getConfigAssayMethodList(reqVO); return success(listResult); @@ -94,7 +94,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检测方法配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") public CommonResult> getConfigAssayMethodPage(@Valid ConfigAssayMethodPageReqVO pageReqVO) { PageResult pageResult = configAssayMethodService.getConfigAssayMethodPage(pageReqVO); return success(pageResult); @@ -102,7 +102,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检测方法配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodExcel(@Valid ConfigAssayMethodPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectAssessmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectAssessmentController.java index 6d513c4..376c3ad 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectAssessmentController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectAssessmentController.java @@ -42,14 +42,14 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @PostMapping("/create") @Operation(summary = "创建检测方法分析项目判定") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:create')") public CommonResult createConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO createReqVO) { return success(configAssayMethodProjectAssessmentService.createConfigAssayMethodProjectAssessment(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法分析项目判定") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:update')") public CommonResult updateConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO updateReqVO) { configAssayMethodProjectAssessmentService.updateConfigAssayMethodProjectAssessment(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @DeleteMapping("/delete") @Operation(summary = "删除检测方法分析项目判定") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')") public CommonResult deleteConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) { configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessment(id); return success(true); @@ -67,7 +67,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法分析项目判定") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')") public CommonResult deleteConfigAssayMethodProjectAssessmentList(@RequestBody BatchDeleteReqVO req) { configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessmentListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @GetMapping("/get") @Operation(summary = "获得检测方法分析项目判定") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')") public CommonResult getConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) { ConfigAssayMethodProjectAssessmentDO configAssayMethodProjectAssessment = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessment(id); return success(BeanUtils.toBean(configAssayMethodProjectAssessment, ConfigAssayMethodProjectAssessmentRespVO.class)); @@ -84,7 +84,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @GetMapping("/page") @Operation(summary = "获得检测方法分析项目判定分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')") public CommonResult> getConfigAssayMethodProjectAssessmentPage(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO) { PageResult pageResult = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessmentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectAssessmentRespVO.class)); @@ -92,7 +92,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon @GetMapping("/export-excel") @Operation(summary = "导出检测方法分析项目判定 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodProjectAssessmentExcel(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectCoefficientController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectCoefficientController.java index 7647dac..6faf4a3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectCoefficientController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectCoefficientController.java @@ -42,14 +42,14 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @PostMapping("/create") @Operation(summary = "创建检测方法分析项目补正系数") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:create')") public CommonResult createConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO createReqVO) { return success(configAssayMethodProjectCoefficientService.createConfigAssayMethodProjectCoefficient(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法分析项目补正系数") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:update')") public CommonResult updateConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO updateReqVO) { configAssayMethodProjectCoefficientService.updateConfigAssayMethodProjectCoefficient(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @DeleteMapping("/delete") @Operation(summary = "删除检测方法分析项目补正系数") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')") public CommonResult deleteConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) { configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficient(id); return success(true); @@ -67,7 +67,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法分析项目补正系数") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')") public CommonResult deleteConfigAssayMethodProjectCoefficientList(@RequestBody BatchDeleteReqVO req) { configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficientListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @GetMapping("/get") @Operation(summary = "获得检测方法分析项目补正系数") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')") public CommonResult getConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) { ConfigAssayMethodProjectCoefficientDO configAssayMethodProjectCoefficient = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficient(id); return success(BeanUtils.toBean(configAssayMethodProjectCoefficient, ConfigAssayMethodProjectCoefficientRespVO.class)); @@ -84,7 +84,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @GetMapping("/page") @Operation(summary = "获得检测方法分析项目补正系数分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')") public CommonResult> getConfigAssayMethodProjectCoefficientPage(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO) { PageResult pageResult = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficientPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectCoefficientRespVO.class)); @@ -92,7 +92,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo @GetMapping("/export-excel") @Operation(summary = "导出检测方法分析项目补正系数 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodProjectCoefficientExcel(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectController.java index 9bebe2b..5fe6fad 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectController.java @@ -46,14 +46,14 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @PostMapping("/create") @Operation(summary = "创建检测方法分析项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:create')") public CommonResult createConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO createReqVO) { return success(configAssayMethodProjectService.createConfigAssayMethodProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法分析项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:update')") public CommonResult updateConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO updateReqVO) { configAssayMethodProjectService.updateConfigAssayMethodProject(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @DeleteMapping("/delete") @Operation(summary = "删除检测方法分析项目配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')") public CommonResult deleteConfigAssayMethodProject(@RequestParam("id") Long id) { configAssayMethodProjectService.deleteConfigAssayMethodProject(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法分析项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')") public CommonResult deleteConfigAssayMethodProjectList(@RequestBody BatchDeleteReqVO req) { configAssayMethodProjectService.deleteConfigAssayMethodProjectListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @GetMapping("/get") @Operation(summary = "获得检测方法分析项目配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')") public CommonResult getConfigAssayMethodProject(@RequestParam("id") Long id) { ConfigAssayMethodProjectDO configAssayMethodProject = configAssayMethodProjectService.getConfigAssayMethodProject(id); return success(BeanUtils.toBean(configAssayMethodProject, ConfigAssayMethodProjectRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @GetMapping("/page") @Operation(summary = "获得检测方法分析项目配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')") public CommonResult> getConfigAssayMethodProjectPage(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO) { PageResult pageResult = configAssayMethodProjectService.getConfigAssayMethodProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar @GetMapping("/export-excel") @Operation(summary = "导出检测方法分析项目配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodProjectExcel(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectParameterController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectParameterController.java index c358421..e8bd392 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectParameterController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectParameterController.java @@ -46,14 +46,14 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @PostMapping("/create") @Operation(summary = "创建检测方法分析项目参数配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:create')") public CommonResult createConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO createReqVO) { return success(configAssayMethodProjectParameterService.createConfigAssayMethodProjectParameter(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法分析项目参数配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:update')") public CommonResult updateConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO updateReqVO) { configAssayMethodProjectParameterService.updateConfigAssayMethodProjectParameter(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @DeleteMapping("/delete") @Operation(summary = "删除检测方法分析项目参数配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')") public CommonResult deleteConfigAssayMethodProjectParameter(@RequestParam("id") Long id) { configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameter(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法分析项目参数配置") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')") public CommonResult deleteConfigAssayMethodProjectParameterList(@RequestBody BatchDeleteReqVO req) { configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameterListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @GetMapping("/get") @Operation(summary = "获得检测方法分析项目参数配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')") public CommonResult getConfigAssayMethodProjectParameter(@RequestParam("id") Long id) { ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameter = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameter(id); return success(BeanUtils.toBean(configAssayMethodProjectParameter, ConfigAssayMethodProjectParameterRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @GetMapping("/page") @Operation(summary = "获得检测方法分析项目参数配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')") public CommonResult> getConfigAssayMethodProjectParameterPage(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO) { PageResult pageResult = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectParameterRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont @GetMapping("/export-excel") @Operation(summary = "导出检测方法分析项目参数配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodProjectParameterExcel(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectRangeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectRangeController.java index 6ce041e..ce4f804 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectRangeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectRangeController.java @@ -44,14 +44,14 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @PostMapping("/create") @Operation(summary = "创建检测方法分析项目区间") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:create')") public CommonResult createConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO createReqVO) { return success(configAssayMethodProjectRangeService.createConfigAssayMethodProjectRange(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测方法分析项目区间") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:update')") public CommonResult updateConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO updateReqVO) { configAssayMethodProjectRangeService.updateConfigAssayMethodProjectRange(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @DeleteMapping("/delete") @Operation(summary = "删除检测方法分析项目区间") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')") public CommonResult deleteConfigAssayMethodProjectRange(@RequestParam("id") Long id) { configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRange(id); return success(true); @@ -69,7 +69,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测方法分析项目区间") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')") public CommonResult deleteConfigAssayMethodProjectRangeList(@RequestBody BatchDeleteReqVO req) { configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRangeListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @GetMapping("/get") @Operation(summary = "获得检测方法分析项目区间") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')") public CommonResult getConfigAssayMethodProjectRange(@RequestParam("id") Long id) { ConfigAssayMethodProjectRangeDO configAssayMethodProjectRange = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRange(id); return success(BeanUtils.toBean(configAssayMethodProjectRange, ConfigAssayMethodProjectRangeRespVO.class)); @@ -86,7 +86,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @GetMapping("/page") @Operation(summary = "获得检测方法分析项目区间分页") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')") public CommonResult> getConfigAssayMethodProjectRangePage(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO) { PageResult pageResult = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRangePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRangeRespVO.class)); @@ -94,7 +94,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll @GetMapping("/export-excel") @Operation(summary = "导出检测方法分析项目区间 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigAssayMethodProjectRangeExcel(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigBaseSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigBaseSampleController.java index ec603d9..1f83fb2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigBaseSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigBaseSampleController.java @@ -46,14 +46,14 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建主样配置") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:create')") public CommonResult createConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO createReqVO) { return success(configBaseSampleService.createConfigBaseSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新主样配置") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:update')") public CommonResult updateConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO updateReqVO) { configBaseSampleService.updateConfigBaseSample(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除主样配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") public CommonResult deleteConfigBaseSample(@RequestParam("id") Long id) { configBaseSampleService.deleteConfigBaseSample(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除主样配置") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") public CommonResult deleteConfigBaseSampleList(@RequestBody BatchDeleteReqVO req) { configBaseSampleService.deleteConfigBaseSampleListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得主样配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')") public CommonResult getConfigBaseSample(@RequestParam("id") Long id) { ConfigBaseSampleDO configBaseSample = configBaseSampleService.getConfigBaseSample(id); return success(BeanUtils.toBean(configBaseSample, ConfigBaseSampleRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得主样配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')") public CommonResult> getConfigBaseSamplePage(@Valid ConfigBaseSamplePageReqVO pageReqVO) { PageResult pageResult = configBaseSampleService.getConfigBaseSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigBaseSampleRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出主样配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-base-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigBaseSampleExcel(@Valid ConfigBaseSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceController.java index 8b14c96..3913f0c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceController.java @@ -47,14 +47,14 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检验委托来源配置") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:create')") public CommonResult createConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO createReqVO) { return success(configEntrustSourceService.createConfigEntrustSource(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检验委托来源配置") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:update')") public CommonResult updateConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO updateReqVO) { configEntrustSourceService.updateConfigEntrustSource(updateReqVO); return success(true); @@ -63,7 +63,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检验委托来源配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") public CommonResult deleteConfigEntrustSource(@RequestParam("id") Long id) { configEntrustSourceService.deleteConfigEntrustSource(id); return success(true); @@ -72,7 +72,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检验委托来源配置") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") public CommonResult deleteConfigEntrustSourceList(@RequestBody BatchDeleteReqVO req) { configEntrustSourceService.deleteConfigEntrustSourceListByIds(req.getIds()); return success(true); @@ -81,7 +81,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检验委托来源配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") public CommonResult getConfigEntrustSource(@RequestParam("id") Long id) { ConfigEntrustSourceDO configEntrustSource = configEntrustSourceService.getConfigEntrustSource(id); return success(BeanUtils.toBean(configEntrustSource, ConfigEntrustSourceRespVO.class)); @@ -89,7 +89,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检验委托来源配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") public CommonResult> getConfigEntrustSourcePage(@Valid ConfigEntrustSourcePageReqVO pageReqVO) { PageResult pageResult = configEntrustSourceService.getConfigEntrustSourcePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigEntrustSourceRespVO.class)); @@ -97,7 +97,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @GetMapping("/list") @Operation(summary = "获得检验委托来源配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") public CommonResult> getConfigEntrustSourceList(@Valid ConfigEntrustSourceReqVO reqVO) { List listResult = configEntrustSourceService.getConfigEntrustSourceList(reqVO); return success(BeanUtils.toBean(listResult, ConfigEntrustSourceRespVO.class)); @@ -106,7 +106,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检验委托来源配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-entrust-source:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigEntrustSourceExcel(@Valid ConfigEntrustSourcePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigProjectController.java index 22cee8d..e251e92 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigProjectController.java @@ -46,14 +46,14 @@ public class ConfigProjectController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:create')") public CommonResult createConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO createReqVO) { return success(configProjectService.createConfigProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:update')") public CommonResult updateConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO updateReqVO) { configProjectService.updateConfigProject(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigProjectController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检测项目配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:delete')") public CommonResult deleteConfigProject(@RequestParam("id") Long id) { configProjectService.deleteConfigProject(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigProjectController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:delete')") public CommonResult deleteConfigProjectList(@RequestBody BatchDeleteReqVO req) { configProjectService.deleteConfigProjectListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigProjectController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检测项目配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:query')") public CommonResult getConfigProject(@RequestParam("id") Long id) { ConfigProjectDO configProject = configProjectService.getConfigProject(id); return success(BeanUtils.toBean(configProject, ConfigProjectRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigProjectController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检测项目配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:query')") public CommonResult> getConfigProjectPage(@Valid ConfigProjectPageReqVO pageReqVO) { PageResult pageResult = configProjectService.getConfigProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigProjectRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigProjectController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检测项目配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigProjectExcel(@Valid ConfigProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportFieldController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportFieldController.java index 8dd6b5a..c755fbb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportFieldController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportFieldController.java @@ -46,14 +46,14 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建报表字段配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:create')") public CommonResult createConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO createReqVO) { return success(configReportFieldService.createConfigReportField(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新报表字段配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:update')") public CommonResult updateConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO updateReqVO) { configReportFieldService.updateConfigReportField(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除报表字段配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") public CommonResult deleteConfigReportField(@RequestParam("id") Long id) { configReportFieldService.deleteConfigReportField(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除报表字段配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") public CommonResult deleteConfigReportFieldList(@RequestBody BatchDeleteReqVO req) { configReportFieldService.deleteConfigReportFieldListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得报表字段配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:query')") public CommonResult getConfigReportField(@RequestParam("id") Long id) { ConfigReportFieldDO configReportField = configReportFieldService.getConfigReportField(id); return success(BeanUtils.toBean(configReportField, ConfigReportFieldRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得报表字段配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:query')") public CommonResult> getConfigReportFieldPage(@Valid ConfigReportFieldPageReqVO pageReqVO) { PageResult pageResult = configReportFieldService.getConfigReportFieldPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigReportFieldRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出报表字段配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-report-field:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-field:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigReportFieldExcel(@Valid ConfigReportFieldPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java index 67641ee..b8cb2bc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java @@ -109,14 +109,14 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建报表模版配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:create')") public CommonResult createConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO createReqVO) { return success(configReportTemplateService.createConfigReportTemplate(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新报表模版配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:update')") public CommonResult updateConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO updateReqVO) { configReportTemplateService.updateConfigReportTemplate(updateReqVO); return success(true); @@ -125,7 +125,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除报表模版配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") public CommonResult deleteConfigReportTemplate(@RequestParam("id") Long id) { configReportTemplateService.deleteConfigReportTemplate(id); return success(true); @@ -134,7 +134,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除报表模版配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") public CommonResult deleteConfigReportTemplateList(@RequestParam("ids") List ids) { configReportTemplateService.deleteConfigReportTemplateListByIds(ids); return success(true); @@ -143,7 +143,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得报表模版配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')") public CommonResult getConfigReportTemplate(@RequestParam("id") Long id) { ConfigReportTemplateDO configReportTemplate = configReportTemplateService.getConfigReportTemplate(id); return success(BeanUtils.toBean(configReportTemplate, ConfigReportTemplateRespVO.class)); @@ -151,7 +151,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得报表模版配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')") public CommonResult> getConfigReportTemplatePage(@Valid ConfigReportTemplatePageReqVO pageReqVO) { PageResult pageResult = configReportTemplateService.getConfigReportTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigReportTemplateRespVO.class)); @@ -159,7 +159,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出报表模版配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-report-template:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-template:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigReportTemplateExcel(@Valid ConfigReportTemplatePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTypeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTypeController.java index d089f0b..e6284ef 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTypeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTypeController.java @@ -46,14 +46,14 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建报表类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:create')") public CommonResult createConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO createReqVO) { return success(configReportTypeService.createConfigReportType(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新报表类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:update')") public CommonResult updateConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO updateReqVO) { configReportTypeService.updateConfigReportType(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除报表类型配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") public CommonResult deleteConfigReportType(@RequestParam("id") Long id) { configReportTypeService.deleteConfigReportType(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除报表类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") public CommonResult deleteConfigReportTypeList(@RequestBody BatchDeleteReqVO req) { configReportTypeService.deleteConfigReportTypeListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得报表类型配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:query')") public CommonResult getConfigReportType(@RequestParam("id") Long id) { ConfigReportTypeDO configReportType = configReportTypeService.getConfigReportType(id); return success(BeanUtils.toBean(configReportType, ConfigReportTypeRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得报表类型配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:query')") public CommonResult> getConfigReportTypePage(@Valid ConfigReportTypePageReqVO pageReqVO) { PageResult pageResult = configReportTypeService.getConfigReportTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigReportTypeRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出报表类型配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-report-type:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-report-type:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigReportTypeExcel(@Valid ConfigReportTypePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigRuleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigRuleController.java index d882e64..08667d8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigRuleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigRuleController.java @@ -42,14 +42,14 @@ public class ConfigRuleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-rule:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:create')") public CommonResult createConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO createReqVO) { return success(configRuleService.createConfigRule(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-rule:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:update')") public CommonResult updateConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO updateReqVO) { configRuleService.updateConfigRule(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class ConfigRuleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除规则配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") public CommonResult deleteConfigRule(@RequestParam("id") Long id) { configRuleService.deleteConfigRule(id); return success(true); @@ -67,7 +67,7 @@ public class ConfigRuleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") public CommonResult deleteConfigRuleList(@RequestBody BatchDeleteReqVO req) { configRuleService.deleteConfigRuleListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class ConfigRuleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得规则配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-rule:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:query')") public CommonResult getConfigRule(@RequestParam("id") Long id) { ConfigRuleDO configRule = configRuleService.getConfigRule(id); return success(BeanUtils.toBean(configRule, ConfigRuleRespVO.class)); @@ -84,7 +84,7 @@ public class ConfigRuleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得规则配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-rule:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:query')") public CommonResult> getConfigRulePage(@Valid ConfigRulePageReqVO pageReqVO) { PageResult pageResult = configRuleService.getConfigRulePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigRuleRespVO.class)); @@ -92,7 +92,7 @@ public class ConfigRuleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出规则配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-rule:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-rule:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigRuleExcel(@Valid ConfigRulePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleFlowController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleFlowController.java index 7da7134..51aa002 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleFlowController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleFlowController.java @@ -46,14 +46,14 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建样品流程配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:create')") public CommonResult createConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO createReqVO) { return success(configSampleFlowService.createConfigSampleFlow(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品流程配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:update')") public CommonResult updateConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO updateReqVO) { configSampleFlowService.updateConfigSampleFlow(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除样品流程配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") public CommonResult deleteConfigSampleFlow(@RequestParam("id") Long id) { configSampleFlowService.deleteConfigSampleFlow(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品流程配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") public CommonResult deleteConfigSampleFlowList(@RequestBody BatchDeleteReqVO req) { configSampleFlowService.deleteConfigSampleFlowListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得样品流程配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')") public CommonResult getConfigSampleFlow(@RequestParam("id") Long id) { ConfigSampleFlowDO configSampleFlow = configSampleFlowService.getConfigSampleFlow(id); return success(BeanUtils.toBean(configSampleFlow, ConfigSampleFlowRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得样品流程配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')") public CommonResult> getConfigSampleFlowPage(@Valid ConfigSampleFlowPageReqVO pageReqVO) { PageResult pageResult = configSampleFlowService.getConfigSampleFlowPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSampleFlowRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出样品流程配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sample-flow:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSampleFlowExcel(@Valid ConfigSampleFlowPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleHandoverController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleHandoverController.java index b171be9..c4205e5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleHandoverController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleHandoverController.java @@ -44,14 +44,14 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建样品交接配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:create')") public CommonResult createConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO createReqVO) { return success(configSampleHandoverService.createConfigSampleHandover(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品交接配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:update')") public CommonResult updateConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO updateReqVO) { configSampleHandoverService.updateConfigSampleHandover(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除样品交接配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") public CommonResult deleteConfigSampleHandover(@RequestParam("id") Long id) { configSampleHandoverService.deleteConfigSampleHandover(id); return success(true); @@ -69,7 +69,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品交接配置") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") public CommonResult deleteConfigSampleHandoverList(@RequestBody BatchDeleteReqVO req) { configSampleHandoverService.deleteConfigSampleHandoverListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得样品交接配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')") public CommonResult getConfigSampleHandover(@RequestParam("id") Long id) { ConfigSampleHandoverDO configSampleHandover = configSampleHandoverService.getConfigSampleHandover(id); return success(BeanUtils.toBean(configSampleHandover, ConfigSampleHandoverRespVO.class)); @@ -86,7 +86,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得样品交接配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')") public CommonResult> getConfigSampleHandoverPage(@Valid ConfigSampleHandoverPageReqVO pageReqVO) { PageResult pageResult = configSampleHandoverService.getConfigSampleHandoverPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSampleHandoverRespVO.class)); @@ -94,7 +94,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出样品交接配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sample-handover:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSampleHandoverExcel(@Valid ConfigSampleHandoverPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleReportController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleReportController.java index 3fa6cb1..4451939 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleReportController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleReportController.java @@ -46,14 +46,14 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建样品报表关系") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:create')") public CommonResult createConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO createReqVO) { return success(configSampleReportService.createConfigSampleReport(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品报表关系") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:update')") public CommonResult updateConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO updateReqVO) { configSampleReportService.updateConfigSampleReport(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除样品报表关系") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") public CommonResult deleteConfigSampleReport(@RequestParam("id") Long id) { configSampleReportService.deleteConfigSampleReport(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品报表关系") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") public CommonResult deleteConfigSampleReportList(@RequestBody BatchDeleteReqVO req) { configSampleReportService.deleteConfigSampleReportListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得样品报表关系") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')") public CommonResult getConfigSampleReport(@RequestParam("id") Long id) { ConfigSampleReportDO configSampleReport = configSampleReportService.getConfigSampleReport(id); return success(BeanUtils.toBean(configSampleReport, ConfigSampleReportRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得样品报表关系分页") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')") public CommonResult> getConfigSampleReportPage(@Valid ConfigSampleReportPageReqVO pageReqVO) { PageResult pageResult = configSampleReportService.getConfigSampleReportPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSampleReportRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出样品报表关系 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sample-report:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSampleReportExcel(@Valid ConfigSampleReportPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowCodeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowCodeController.java index 4284b95..dcb867a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowCodeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowCodeController.java @@ -43,14 +43,14 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建LiteFlow脚本配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:create')") public CommonResult createConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO createReqVO) { return success(configSimpleFlowCodeService.createConfigSimpleFlowCode(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新LiteFlow脚本配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:update')") public CommonResult updateConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO updateReqVO) { configSimpleFlowCodeService.updateConfigSimpleFlowCode(updateReqVO); return success(true); @@ -59,7 +59,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除LiteFlow脚本配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')") public CommonResult deleteConfigSimpleFlowCode(@RequestParam("id") Long id) { configSimpleFlowCodeService.deleteConfigSimpleFlowCode(id); return success(true); @@ -68,7 +68,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除LiteFlow脚本配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')") public CommonResult deleteConfigSimpleFlowCodeList(@RequestBody BatchDeleteReqVO req) { configSimpleFlowCodeService.deleteConfigSimpleFlowCodeListByIds(req.getIds()); return success(true); @@ -77,7 +77,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得LiteFlow脚本配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')") public CommonResult getConfigSimpleFlowCode(@RequestParam("id") Long id) { ConfigSimpleFlowCodeDO configSimpleFlowCode = configSimpleFlowCodeService.getConfigSimpleFlowCode(id); return success(BeanUtils.toBean(configSimpleFlowCode, ConfigSimpleFlowCodeRespVO.class)); @@ -85,7 +85,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得LiteFlow脚本配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')") public CommonResult> getConfigSimpleFlowCodePage(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO) { PageResult pageResult = configSimpleFlowCodeService.getConfigSimpleFlowCodePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowCodeRespVO.class)); @@ -93,7 +93,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出LiteFlow脚本配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSimpleFlowCodeExcel(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowRuleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowRuleController.java index 8fc0f79..012700c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowRuleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowRuleController.java @@ -46,14 +46,14 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建LiteFlow规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:create')") public CommonResult createConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO createReqVO) { return success(configSimpleFlowRuleService.createConfigSimpleFlowRule(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新LiteFlow规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:update')") public CommonResult updateConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO updateReqVO) { configSimpleFlowRuleService.updateConfigSimpleFlowRule(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除LiteFlow规则配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')") public CommonResult deleteConfigSimpleFlowRule(@RequestParam("id") Long id) { configSimpleFlowRuleService.deleteConfigSimpleFlowRule(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除LiteFlow规则配置") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')") public CommonResult deleteConfigSimpleFlowRuleList(@RequestBody BatchDeleteReqVO req) { configSimpleFlowRuleService.deleteConfigSimpleFlowRuleListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得LiteFlow规则配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')") public CommonResult getConfigSimpleFlowRule(@RequestParam("id") Long id) { ConfigSimpleFlowRuleDO configSimpleFlowRule = configSimpleFlowRuleService.getConfigSimpleFlowRule(id); return success(BeanUtils.toBean(configSimpleFlowRule, ConfigSimpleFlowRuleRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得LiteFlow规则配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')") public CommonResult> getConfigSimpleFlowRulePage(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO) { PageResult pageResult = configSimpleFlowRuleService.getConfigSimpleFlowRulePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowRuleRespVO.class)); @@ -108,7 +108,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出LiteFlow规则配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSimpleFlowRuleExcel(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleProjectController.java index 3cad9d2..4ead6ba 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleProjectController.java @@ -46,14 +46,14 @@ public class ConfigStandardSampleProjectController implements BusinessController @PostMapping("/create") @Operation(summary = "创建标准样检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:create')") public CommonResult createConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO createReqVO) { return success(configStandardSampleProjectService.createConfigStandardSampleProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新标准样检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:update')") public CommonResult updateConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO updateReqVO) { configStandardSampleProjectService.updateConfigStandardSampleProject(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigStandardSampleProjectController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除标准样检测项目配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')") public CommonResult deleteConfigStandardSampleProject(@RequestParam("id") Long id) { configStandardSampleProjectService.deleteConfigStandardSampleProject(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigStandardSampleProjectController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除标准样检测项目配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')") public CommonResult deleteConfigStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) { configStandardSampleProjectService.deleteConfigStandardSampleProjectListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigStandardSampleProjectController implements BusinessController @GetMapping("/get") @Operation(summary = "获得标准样检测项目配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')") public CommonResult getConfigStandardSampleProject(@RequestParam("id") Long id) { ConfigStandardSampleProjectDO configStandardSampleProject = configStandardSampleProjectService.getConfigStandardSampleProject(id); return success(BeanUtils.toBean(configStandardSampleProject, ConfigStandardSampleProjectRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigStandardSampleProjectController implements BusinessController @GetMapping("/page") @Operation(summary = "获得标准样检测项目配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')") public CommonResult> getConfigStandardSampleProjectPage(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO) { PageResult pageResult = configStandardSampleProjectService.getConfigStandardSampleProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigStandardSampleProjectRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigStandardSampleProjectController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出标准样检测项目配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigStandardSampleProjectExcel(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleTypeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleTypeController.java index 5c78f3f..7ab0a5d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleTypeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleTypeController.java @@ -46,14 +46,14 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @PostMapping("/create") @Operation(summary = "创建标准样类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:create')") public CommonResult createConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO createReqVO) { return success(configStandardSampleTypeService.createConfigStandardSampleType(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新标准样类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:update')") public CommonResult updateConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO updateReqVO) { configStandardSampleTypeService.updateConfigStandardSampleType(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @DeleteMapping("/delete") @Operation(summary = "删除标准样类型配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')") public CommonResult deleteConfigStandardSampleType(@RequestParam("id") Long id) { configStandardSampleTypeService.deleteConfigStandardSampleType(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除标准样类型配置") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')") public CommonResult deleteConfigStandardSampleTypeList(@RequestBody BatchDeleteReqVO req) { configStandardSampleTypeService.deleteConfigStandardSampleTypeListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @GetMapping("/get") @Operation(summary = "获得标准样类型配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')") public CommonResult getConfigStandardSampleType(@RequestParam("id") Long id) { ConfigStandardSampleTypeDO configStandardSampleType = configStandardSampleTypeService.getConfigStandardSampleType(id); return success(BeanUtils.toBean(configStandardSampleType, ConfigStandardSampleTypeRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @GetMapping("/page") @Operation(summary = "获得标准样类型配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')") public CommonResult> getConfigStandardSampleTypePage(@Valid ConfigStandardSampleTypePageReqVO pageReqVO) { PageResult pageResult = configStandardSampleTypeService.getConfigStandardSampleTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigStandardSampleTypeRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar @GetMapping("/export-excel") @Operation(summary = "导出标准样类型配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigStandardSampleTypeExcel(@Valid ConfigStandardSampleTypePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleController.java index 7e99226..69af5fd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleController.java @@ -46,14 +46,14 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建子样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:create')") public CommonResult createConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO createReqVO) { return success(configSubSampleService.createConfigSubSample(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:update')") public CommonResult updateConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO updateReqVO) { configSubSampleService.updateConfigSubSample(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除子样配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") public CommonResult deleteConfigSubSample(@RequestParam("id") Long id) { configSubSampleService.deleteConfigSubSample(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") public CommonResult deleteConfigSubSampleList(@RequestBody BatchDeleteReqVO req) { configSubSampleService.deleteConfigSubSampleListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得子样配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')") public CommonResult getConfigSubSample(@RequestParam("id") Long id) { ConfigSubSampleDO configSubSample = configSubSampleService.getConfigSubSample(id); return success(BeanUtils.toBean(configSubSample, ConfigSubSampleRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得子样配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')") public CommonResult> getConfigSubSamplePage(@Valid ConfigSubSamplePageReqVO pageReqVO) { PageResult pageResult = configSubSampleService.getConfigSubSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSubSampleRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出子样配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSubSampleExcel(@Valid ConfigSubSamplePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleMethodController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleMethodController.java index 729bc1b..6bbe270 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleMethodController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleMethodController.java @@ -46,14 +46,14 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建子样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:create')") public CommonResult createConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO createReqVO) { return success(configSubSampleMethodService.createConfigSubSampleMethod(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新子样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:update')") public CommonResult updateConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO updateReqVO) { configSubSampleMethodService.updateConfigSubSampleMethod(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除子样与检测方法配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')") public CommonResult deleteConfigSubSampleMethod(@RequestParam("id") Long id) { configSubSampleMethodService.deleteConfigSubSampleMethod(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除子样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')") public CommonResult deleteConfigSubSampleMethodList(@RequestBody BatchDeleteReqVO req) { configSubSampleMethodService.deleteConfigSubSampleMethodListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得子样与检测方法配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')") public CommonResult getConfigSubSampleMethod(@RequestParam("id") Long id) { ConfigSubSampleMethodDO configSubSampleMethod = configSubSampleMethodService.getConfigSubSampleMethod(id); return success(BeanUtils.toBean(configSubSampleMethod, ConfigSubSampleMethodRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得子样与检测方法配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')") public CommonResult> getConfigSubSampleMethodPage(@Valid ConfigSubSampleMethodPageReqVO pageReqVO) { PageResult pageResult = configSubSampleMethodService.getConfigSubSampleMethodPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSubSampleMethodRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出子样与检测方法配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSubSampleMethodExcel(@Valid ConfigSubSampleMethodPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentController.java index 13113c0..042d3d6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentController.java @@ -46,14 +46,14 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建分样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:create')") public CommonResult createConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO createReqVO) { return success(configSubSampleParentService.createConfigSubSampleParent(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新分样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:update')") public CommonResult updateConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO updateReqVO) { configSubSampleParentService.updateConfigSubSampleParent(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除分样配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')") public CommonResult deleteConfigSubSampleParent(@RequestParam("id") Long id) { configSubSampleParentService.deleteConfigSubSampleParent(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除分样配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')") public CommonResult deleteConfigSubSampleParentList(@RequestBody BatchDeleteReqVO req) { configSubSampleParentService.deleteConfigSubSampleParentListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得分样配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')") public CommonResult getConfigSubSampleParent(@RequestParam("id") Long id) { ConfigSubSampleParentDO configSubSampleParent = configSubSampleParentService.getConfigSubSampleParent(id); return success(BeanUtils.toBean(configSubSampleParent, ConfigSubSampleParentRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得分样配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')") public CommonResult> getConfigSubSampleParentPage(@Valid ConfigSubSampleParentPageReqVO pageReqVO) { PageResult pageResult = configSubSampleParentService.getConfigSubSampleParentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出分样配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSubSampleParentExcel(@Valid ConfigSubSampleParentPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentMethodController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentMethodController.java index 9048104..34bef7d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentMethodController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentMethodController.java @@ -42,14 +42,14 @@ public class ConfigSubSampleParentMethodController implements BusinessController @PostMapping("/create") @Operation(summary = "创建分样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:create')") public CommonResult createConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO createReqVO) { return success(configSubSampleParentMethodService.createConfigSubSampleParentMethod(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新分样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:update')") public CommonResult updateConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO updateReqVO) { configSubSampleParentMethodService.updateConfigSubSampleParentMethod(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除分样与检测方法配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')") public CommonResult deleteConfigSubSampleParentMethod(@RequestParam("id") Long id) { configSubSampleParentMethodService.deleteConfigSubSampleParentMethod(id); return success(true); @@ -67,7 +67,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除分样与检测方法配置") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')") public CommonResult deleteConfigSubSampleParentMethodList(@RequestBody BatchDeleteReqVO req) { configSubSampleParentMethodService.deleteConfigSubSampleParentMethodListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController @GetMapping("/get") @Operation(summary = "获得分样与检测方法配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')") public CommonResult getConfigSubSampleParentMethod(@RequestParam("id") Long id) { ConfigSubSampleParentMethodDO configSubSampleParentMethod = configSubSampleParentMethodService.getConfigSubSampleParentMethod(id); return success(BeanUtils.toBean(configSubSampleParentMethod, ConfigSubSampleParentMethodRespVO.class)); @@ -84,7 +84,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController @GetMapping("/page") @Operation(summary = "获得分样与检测方法配置分页") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')") public CommonResult> getConfigSubSampleParentMethodPage(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO) { PageResult pageResult = configSubSampleParentMethodService.getConfigSubSampleParentMethodPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentMethodRespVO.class)); @@ -92,7 +92,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出分样与检测方法配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigSubSampleParentMethodExcel(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationInfomationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationInfomationController.java index 5911f9a..0d508a7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationInfomationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationInfomationController.java @@ -46,14 +46,14 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @PostMapping("/create") @Operation(summary = "创建样品库位信息") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:create')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:create')") public CommonResult createConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO createReqVO) { return success(configWarehouseLocationInfomationService.createConfigWarehouseLocationInfomation(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品库位信息") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:update')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:update')") public CommonResult updateConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO updateReqVO) { configWarehouseLocationInfomationService.updateConfigWarehouseLocationInfomation(updateReqVO); return success(true); @@ -62,7 +62,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @DeleteMapping("/delete") @Operation(summary = "删除样品库位信息") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')") public CommonResult deleteConfigWarehouseLocationInfomation(@RequestParam("id") Long id) { configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomation(id); return success(true); @@ -71,7 +71,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品库位信息") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')") public CommonResult deleteConfigWarehouseLocationInfomationList(@RequestBody BatchDeleteReqVO req) { configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomationListByIds(req.getIds()); return success(true); @@ -80,7 +80,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @GetMapping("/get") @Operation(summary = "获得样品库位信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')") public CommonResult getConfigWarehouseLocationInfomation(@RequestParam("id") Long id) { ConfigWarehouseLocationInfomationDO configWarehouseLocationInfomation = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomation(id); return success(BeanUtils.toBean(configWarehouseLocationInfomation, ConfigWarehouseLocationInfomationRespVO.class)); @@ -88,7 +88,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @GetMapping("/page") @Operation(summary = "获得样品库位信息分页") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')") public CommonResult> getConfigWarehouseLocationInfomationPage(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO) { PageResult pageResult = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ConfigWarehouseLocationInfomationRespVO.class)); @@ -96,7 +96,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont @GetMapping("/export-excel") @Operation(summary = "导出样品库位信息 Excel") - @PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:export')") + //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:export')") @ApiAccessLog(operateType = EXPORT) public void exportConfigWarehouseLocationInfomationExcel(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java index c70b3a7..b4d9fc4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java @@ -49,7 +49,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @PostMapping("/createTempData") @Operation(summary = "创建检测标准临时数据") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") public CommonResult createTempData() { MaterialAssayStandardSaveReqVO vo = new MaterialAssayStandardSaveReqVO(); vo.setRemark(MaterialAssayStandardMapper.tempDataKey); @@ -61,14 +61,14 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建检测标准") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") public CommonResult createMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO createReqVO) { return success(materialAssayStandardService.createMaterialAssayStandard(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测标准") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:update')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:update')") public CommonResult updateMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO updateReqVO) { materialAssayStandardService.updateMaterialAssayStandard(updateReqVO); return success(true); @@ -77,7 +77,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除检测标准") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") public CommonResult deleteMaterialAssayStandard(@RequestParam("id") Long id) { materialAssayStandardService.deleteMaterialAssayStandard(id); return success(true); @@ -86,7 +86,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测标准") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") public CommonResult deleteMaterialAssayStandardList(@RequestBody BatchDeleteReqVO req) { materialAssayStandardService.deleteMaterialAssayStandardListByIds(req.getIds()); return success(true); @@ -95,7 +95,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得检测标准") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:query')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:query')") public CommonResult getMaterialAssayStandard(@RequestParam("id") Long id) { MaterialAssayStandardDO materialAssayStandard = materialAssayStandardService.getMaterialAssayStandard(id); return success(BeanUtils.toBean(materialAssayStandard, MaterialAssayStandardRespVO.class)); @@ -132,7 +132,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出检测标准 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard:export')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialAssayStandardExcel(@Valid MaterialAssayStandardPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java index 91dd233..4e326f8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java @@ -76,14 +76,14 @@ public class MaterialAssayStandardDetailController implements BusinessController @PostMapping("/create") @Operation(summary = "创建物料检测标准检测项目") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:create')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:create')") public CommonResult createMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO createReqVO) { return success(materialAssayStandardDetailService.createMaterialAssayStandardDetail(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料检测标准检测项目") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:update')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:update')") public CommonResult updateMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO updateReqVO) { materialAssayStandardDetailService.updateMaterialAssayStandardDetail(updateReqVO); return success(true); @@ -92,7 +92,7 @@ public class MaterialAssayStandardDetailController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除物料检测标准检测项目") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')") public CommonResult deleteMaterialAssayStandardDetail(@RequestParam("id") Long id) { materialAssayStandardDetailService.deleteMaterialAssayStandardDetail(id); return success(true); @@ -101,7 +101,7 @@ public class MaterialAssayStandardDetailController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物料检测标准检测项目") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')") public CommonResult deleteMaterialAssayStandardDetailList(@RequestBody BatchDeleteReqVO req) { materialAssayStandardDetailService.deleteMaterialAssayStandardDetailListByIds(req.getIds()); return success(true); @@ -110,7 +110,7 @@ public class MaterialAssayStandardDetailController implements BusinessController @GetMapping("/get") @Operation(summary = "获得物料检测标准检测项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") public CommonResult getMaterialAssayStandardDetail(@RequestParam("id") Long id) { MaterialAssayStandardDetailDO materialAssayStandardDetail = materialAssayStandardDetailService.getMaterialAssayStandardDetail(id); return success(BeanUtils.toBean(materialAssayStandardDetail, MaterialAssayStandardDetailRespVO.class)); @@ -118,7 +118,7 @@ public class MaterialAssayStandardDetailController implements BusinessController @GetMapping("/page") @Operation(summary = "获得物料检测标准检测项目分页") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") public CommonResult> getMaterialAssayStandardDetailPage(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO) { PageResult pageResult = materialAssayStandardDetailService.getMaterialAssayStandardDetailPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardDetailRespVO.class)); @@ -126,7 +126,7 @@ public class MaterialAssayStandardDetailController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出物料检测标准检测项目 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:export')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialAssayStandardDetailExcel(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardForecastProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardForecastProjectController.java index 389a8e4..aaf4964 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardForecastProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardForecastProjectController.java @@ -44,14 +44,14 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @PostMapping("/create") @Operation(summary = "创建物料检测标准来样品位配置") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:create')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:create')") public CommonResult createMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO createReqVO) { return success(materialAssayStandardForecastProjectService.createMaterialAssayStandardForecastProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料检测标准来样品位配置") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:update')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:update')") public CommonResult updateMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO updateReqVO) { materialAssayStandardForecastProjectService.updateMaterialAssayStandardForecastProject(updateReqVO); return success(true); @@ -60,7 +60,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @DeleteMapping("/delete") @Operation(summary = "删除物料检测标准来样品位配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')") public CommonResult deleteMaterialAssayStandardForecastProject(@RequestParam("id") Long id) { materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProject(id); return success(true); @@ -69,7 +69,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物料检测标准来样品位配置") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')") public CommonResult deleteMaterialAssayStandardForecastProjectList(@RequestBody BatchDeleteReqVO req) { materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProjectListByIds(req.getIds()); return success(true); @@ -78,7 +78,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @GetMapping("/get") @Operation(summary = "获得物料检测标准来样品位配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')") public CommonResult getMaterialAssayStandardForecastProject(@RequestParam("id") Long id) { MaterialAssayStandardForecastProjectDO materialAssayStandardForecastProject = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProject(id); return success(BeanUtils.toBean(materialAssayStandardForecastProject, MaterialAssayStandardForecastProjectRespVO.class)); @@ -86,7 +86,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @GetMapping("/page") @Operation(summary = "获得物料检测标准来样品位配置分页") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')") public CommonResult> getMaterialAssayStandardForecastProjectPage(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO) { PageResult pageResult = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardForecastProjectRespVO.class)); @@ -94,7 +94,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC @GetMapping("/export-excel") @Operation(summary = "导出物料检测标准来样品位配置 Excel") - @PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:export')") + //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialAssayStandardForecastProjectExcel(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardMethodController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardMethodController.java index 1b04b04..1cdeb1b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardMethodController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardMethodController.java @@ -45,14 +45,14 @@ public class MaterialAssayStandardMethodController implements BusinessController @PostMapping("/create") @Operation(summary = "创建物料检测标准与方法") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:create')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:create')") public CommonResult createMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO createReqVO) { return success(materialAssayStandardMethodService.createMaterialAssayStandardMethod(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料检测标准与方法") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:update')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:update')") public CommonResult updateMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO updateReqVO) { materialAssayStandardMethodService.updateMaterialAssayStandardMethod(updateReqVO); return success(true); @@ -61,7 +61,7 @@ public class MaterialAssayStandardMethodController implements BusinessController @DeleteMapping("/delete") @Operation(summary = "删除物料检测标准与方法") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')") public CommonResult deleteMaterialAssayStandardMethod(@RequestParam("id") Long id) { materialAssayStandardMethodService.deleteMaterialAssayStandardMethod(id); return success(true); @@ -70,7 +70,7 @@ public class MaterialAssayStandardMethodController implements BusinessController @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物料检测标准与方法") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')") public CommonResult deleteMaterialAssayStandardMethodList(@RequestBody BatchDeleteReqVO req) { materialAssayStandardMethodService.deleteMaterialAssayStandardMethodListByIds(req.getIds()); return success(true); @@ -79,7 +79,7 @@ public class MaterialAssayStandardMethodController implements BusinessController @GetMapping("/get") @Operation(summary = "获得物料检测标准与方法") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')") public CommonResult getMaterialAssayStandardMethod(@RequestParam("id") Long id) { MaterialAssayStandardMethodDO materialAssayStandardMethod = materialAssayStandardMethodService.getMaterialAssayStandardMethod(id); return success(BeanUtils.toBean(materialAssayStandardMethod, MaterialAssayStandardMethodRespVO.class)); @@ -87,7 +87,7 @@ public class MaterialAssayStandardMethodController implements BusinessController @GetMapping("/page") @Operation(summary = "获得物料检测标准与方法分页") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')") public CommonResult> getMaterialAssayStandardMethodPage(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO) { PageResult pageResult = materialAssayStandardMethodService.getMaterialAssayStandardMethodPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardMethodRespVO.class)); @@ -95,7 +95,7 @@ public class MaterialAssayStandardMethodController implements BusinessController @GetMapping("/export-excel") @Operation(summary = "导出物料检测标准与方法 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:export')") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialAssayStandardMethodExcel(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java index a1997a2..d37c158 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java @@ -42,7 +42,7 @@ public class ConfigSubSampleMethodDO extends BusinessBaseDO { @TableField("CFG_ASY_MTHD_ID") private Long configAssayMethodId; /** - * 是否默认使用,1-启用，0-不启用 + * 是否默认使用,1-是，0-否 */ @TableField("IS_DFT_USE") private Integer isDefaultUse; @@ -52,6 +52,21 @@ public class ConfigSubSampleMethodDO extends BusinessBaseDO { @TableField("TSK_CNT") private Integer taskCount; /** + * 结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改 + */ + @TableField("RSLT_TMT_WY") + private String resultTreatmentWay; + /** + * 判定方法,default-默认，other-其他（扩展） + */ + @TableField("ASMT_MTHD") + private String assessmentMethod; + /** + * 计算方法,calculateAverageValue-平均值，来自T_CFG_RUL的编码 + */ + @TableField("CALT_MTHD") + private String calculateMethod; + /** * 所属部门 */ @TableField("SYS_DEPT_CD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryParameterController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryParameterController.java index 83e2afa..0355fa7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryParameterController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryParameterController.java @@ -41,14 +41,14 @@ public class DictionaryParameterController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检测参数字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:create')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:create')") public CommonResult createDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO createReqVO) { return success(dictionaryParameterService.createDictionaryParameter(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测参数字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:update')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:update')") public CommonResult updateDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO updateReqVO) { dictionaryParameterService.updateDictionaryParameter(updateReqVO); return success(true); @@ -57,7 +57,7 @@ public class DictionaryParameterController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检测参数字典") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") public CommonResult deleteDictionaryParameter(@RequestParam("id") Long id) { dictionaryParameterService.deleteDictionaryParameter(id); return success(true); @@ -66,7 +66,7 @@ public class DictionaryParameterController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测参数字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") public CommonResult deleteDictionaryParameterList(@RequestBody BatchDeleteReqVO req) { dictionaryParameterService.deleteDictionaryParameterListByIds(req.getIds()); return success(true); @@ -75,7 +75,7 @@ public class DictionaryParameterController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检测参数字典") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") public CommonResult getDictionaryParameter(@RequestParam("id") Long id) { DictionaryParameterDO dictionaryParameter = dictionaryParameterService.getDictionaryParameter(id); return success(BeanUtils.toBean(dictionaryParameter, DictionaryParameterRespVO.class)); @@ -83,7 +83,7 @@ public class DictionaryParameterController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检测参数字典分页") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") public CommonResult> getDictionaryParameterPage(@Valid DictionaryParameterPageReqVO pageReqVO) { PageResult pageResult = dictionaryParameterService.getDictionaryParameterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictionaryParameterRespVO.class)); @@ -91,7 +91,7 @@ public class DictionaryParameterController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检测参数字典 Excel") - @PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:export')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:export')") @ApiAccessLog(operateType = EXPORT) public void exportDictionaryParameterExcel(@Valid DictionaryParameterPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryProjectController.java index 7fe6297..0688e2c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryProjectController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryProjectController.java @@ -41,14 +41,14 @@ public class DictionaryProjectController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建检测项目字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:create')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:create')") public CommonResult createDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO createReqVO) { return success(dictionaryProjectService.createDictionaryProject(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测项目字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:update')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:update')") public CommonResult updateDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO updateReqVO) { dictionaryProjectService.updateDictionaryProject(updateReqVO); return success(true); @@ -57,7 +57,7 @@ public class DictionaryProjectController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除检测项目字典") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") public CommonResult deleteDictionaryProject(@RequestParam("id") Long id) { dictionaryProjectService.deleteDictionaryProject(id); return success(true); @@ -66,7 +66,7 @@ public class DictionaryProjectController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测项目字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") public CommonResult deleteDictionaryProjectList(@RequestBody BatchDeleteReqVO req) { dictionaryProjectService.deleteDictionaryProjectListByIds(req.getIds()); return success(true); @@ -75,7 +75,7 @@ public class DictionaryProjectController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得检测项目字典") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") public CommonResult getDictionaryProject(@RequestParam("id") Long id) { DictionaryProjectDO dictionaryProject = dictionaryProjectService.getDictionaryProject(id); return success(BeanUtils.toBean(dictionaryProject, DictionaryProjectRespVO.class)); @@ -83,7 +83,7 @@ public class DictionaryProjectController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得检测项目字典分页") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") public CommonResult> getDictionaryProjectPage(@Valid DictionaryProjectPageReqVO pageReqVO) { PageResult pageResult = dictionaryProjectService.getDictionaryProjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictionaryProjectRespVO.class)); @@ -91,7 +91,7 @@ public class DictionaryProjectController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出检测项目字典 Excel") - @PreAuthorize("@ss.hasPermission('qms:dictionary-project:export')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:export')") @ApiAccessLog(operateType = EXPORT) public void exportDictionaryProjectExcel(@Valid DictionaryProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleFlowNodeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleFlowNodeController.java index ab23de1..07d5fbd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleFlowNodeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleFlowNodeController.java @@ -41,14 +41,14 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @PostMapping("/create") @Operation(summary = "创建样品流程节点字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:create')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:create')") public CommonResult createDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO createReqVO) { return success(dictionarySampleFlowNodeService.createDictionarySampleFlowNode(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品流程节点字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:update')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:update')") public CommonResult updateDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO updateReqVO) { dictionarySampleFlowNodeService.updateDictionarySampleFlowNode(updateReqVO); return success(true); @@ -57,7 +57,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @DeleteMapping("/delete") @Operation(summary = "删除样品流程节点字典") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')") public CommonResult deleteDictionarySampleFlowNode(@RequestParam("id") Long id) { dictionarySampleFlowNodeService.deleteDictionarySampleFlowNode(id); return success(true); @@ -66,7 +66,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品流程节点字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')") public CommonResult deleteDictionarySampleFlowNodeList(@RequestBody BatchDeleteReqVO req) { dictionarySampleFlowNodeService.deleteDictionarySampleFlowNodeListByIds(req.getIds()); return success(true); @@ -75,7 +75,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @GetMapping("/get") @Operation(summary = "获得样品流程节点字典") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')") public CommonResult getDictionarySampleFlowNode(@RequestParam("id") Long id) { DictionarySampleFlowNodeDO dictionarySampleFlowNode = dictionarySampleFlowNodeService.getDictionarySampleFlowNode(id); return success(BeanUtils.toBean(dictionarySampleFlowNode, DictionarySampleFlowNodeRespVO.class)); @@ -83,7 +83,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @GetMapping("/page") @Operation(summary = "获得样品流程节点字典分页") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')") public CommonResult> getDictionarySampleFlowNodePage(@Valid DictionarySampleFlowNodePageReqVO pageReqVO) { PageResult pageResult = dictionarySampleFlowNodeService.getDictionarySampleFlowNodePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictionarySampleFlowNodeRespVO.class)); @@ -91,7 +91,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar @GetMapping("/export-excel") @Operation(summary = "导出样品流程节点字典 Excel") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:export')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:export')") @ApiAccessLog(operateType = EXPORT) public void exportDictionarySampleFlowNodeExcel(@Valid DictionarySampleFlowNodePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleTypeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleTypeController.java index 7c3e88e..97fa218 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleTypeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleTypeController.java @@ -41,14 +41,14 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建样品类型字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:create')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:create')") public CommonResult createDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO createReqVO) { return success(dictionarySampleTypeService.createDictionarySampleType(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新样品类型字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:update')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:update')") public CommonResult updateDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO updateReqVO) { dictionarySampleTypeService.updateDictionarySampleType(updateReqVO); return success(true); @@ -57,7 +57,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除样品类型字典") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") public CommonResult deleteDictionarySampleType(@RequestParam("id") Long id) { dictionarySampleTypeService.deleteDictionarySampleType(id); return success(true); @@ -66,7 +66,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除样品类型字典") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") public CommonResult deleteDictionarySampleTypeList(@RequestBody BatchDeleteReqVO req) { dictionarySampleTypeService.deleteDictionarySampleTypeListByIds(req.getIds()); return success(true); @@ -75,7 +75,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得样品类型字典") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')") public CommonResult getDictionarySampleType(@RequestParam("id") Long id) { DictionarySampleTypeDO dictionarySampleType = dictionarySampleTypeService.getDictionarySampleType(id); return success(BeanUtils.toBean(dictionarySampleType, DictionarySampleTypeRespVO.class)); @@ -83,7 +83,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得样品类型字典分页") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')") public CommonResult> getDictionarySampleTypePage(@Valid DictionarySampleTypePageReqVO pageReqVO) { PageResult pageResult = dictionarySampleTypeService.getDictionarySampleTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictionarySampleTypeRespVO.class)); @@ -91,7 +91,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker @GetMapping("/export-excel") @Operation(summary = "导出样品类型字典 Excel") - @PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:export')") + //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:export')") @ApiAccessLog(operateType = EXPORT) public void exportDictionarySampleTypeExcel(@Valid DictionarySampleTypePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java index e2593f5..4d145ec 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java @@ -75,14 +75,14 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @PostMapping("/create") @Operation(summary = "创建检测报告明细") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") public CommonResult createReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO createReqVO) { return success(reportDocumentDataService.createReportDocumentData(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新检测报告明细") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:update')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:update')") public CommonResult updateReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO updateReqVO) { reportDocumentDataService.updateReportDocumentData(updateReqVO); return success(true); @@ -91,7 +91,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @DeleteMapping("/delete") @Operation(summary = "删除检测报告明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") public CommonResult deleteReportDocumentData(@RequestParam("id") Long id) { reportDocumentDataService.deleteReportDocumentData(id); return success(true); @@ -100,7 +100,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测报告明细") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") public CommonResult deleteReportDocumentDataList(@RequestBody BatchDeleteReqVO req) { reportDocumentDataService.deleteReportDocumentDataListByIds(req.getIds()); return success(true); @@ -109,7 +109,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @GetMapping("/get") @Operation(summary = "获得检测报告明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:query')") public CommonResult getReportDocumentData(@RequestParam("id") Long id) { ReportDocumentDataDO reportDocumentData = reportDocumentDataService.getReportDocumentData(id); return success(BeanUtils.toBean(reportDocumentData, ReportDocumentDataRespVO.class)); @@ -117,7 +117,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @GetMapping("/page") @Operation(summary = "获得检测报告明细分页") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:query')") public CommonResult> getReportDocumentDataPage(@Valid ReportDocumentDataPageReqVO pageReqVO) { PageResult pageResult = reportDocumentDataService.getReportDocumentDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ReportDocumentDataRespVO.class)); @@ -125,7 +125,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @GetMapping("/export-excel") @Operation(summary = "导出检测报告明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:report-document-data:export')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-data:export')") @ApiAccessLog(operateType = EXPORT) public void exportReportDocumentDataExcel(@Valid ReportDocumentDataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java index ca6d450..2a4d8ff 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java @@ -54,7 +54,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @PostMapping("/create") @Operation(summary = "创建检测报告") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:create')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:create')") public CommonResult createReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO createReqVO) { return success(reportDocumentMainService.createReportDocumentMain(createReqVO)); } @@ -99,7 +99,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @PutMapping("/update") @Operation(summary = "更新检测报告业务") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:update')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')") public CommonResult updateReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) { updateReqVO.setCancelFlag("0"); reportDocumentMainService.updateReportDocumentMain(updateReqVO); @@ -109,7 +109,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @DeleteMapping("/delete") @Operation(summary = "删除检测报告业务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") public CommonResult deleteReportDocumentMain(@RequestParam("id") Long id) { reportDocumentMainService.deleteReportDocumentMain(id); return success(true); @@ -118,7 +118,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除检测报告业务") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") public CommonResult deleteReportDocumentMainList(@RequestBody BatchDeleteReqVO req) { reportDocumentMainService.deleteReportDocumentMainListByIds(req.getIds()); return success(true); @@ -127,7 +127,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @GetMapping("/get") @Operation(summary = "获得检测报告业务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')") public CommonResult getReportDocumentMain(@RequestParam("id") Long id) { ReportDocumentMainDO reportDocumentMain = reportDocumentMainService.getReportDocumentMain(id); return success(BeanUtils.toBean(reportDocumentMain, ReportDocumentMainRespVO.class)); @@ -135,7 +135,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @GetMapping("/page") @Operation(summary = "获得检测报告业务分页") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')") public CommonResult> getReportDocumentMainPage(@Valid ReportDocumentMainPageReqVO pageReqVO) { PageResult pageResult = reportDocumentMainService.getReportDocumentMainPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ReportDocumentMainRespVO.class)); @@ -143,7 +143,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i @GetMapping("/export-excel") @Operation(summary = "导出检测报告业务 Excel") - @PreAuthorize("@ss.hasPermission('qms:report-document-main:export')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-main:export')") @ApiAccessLog(operateType = EXPORT) public void exportReportDocumentMainExcel(@Valid ReportDocumentMainPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentTypeController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentTypeController.java index 948286c..087818a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentTypeController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentTypeController.java @@ -39,7 +39,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @PostMapping("/save") @Operation(summary = "更新报告类型配置") - @PreAuthorize("@ss.hasPermission('qms:report-document-type:update')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:update')") public CommonResult updateReportDocumentType(@Valid @RequestBody ReportDocumentTypeSaveReqVO updateReqVO) { return reportDocumentTypeService.save(updateReqVO); } @@ -47,7 +47,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除报告类型配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") public CommonResult deleteReportDocumentType(@RequestParam("id") Long id) { reportDocumentTypeService.deleteReportDocumentType(id); return success(true); @@ -56,7 +56,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除报告类型配置") - @PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") public CommonResult deleteReportDocumentTypeList(@RequestBody BatchDeleteReqVO req) { reportDocumentTypeService.deleteReportDocumentTypeListByIds(req.getIds()); return success(true); @@ -65,7 +65,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得报告类型配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:report-document-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:query')") public CommonResult getReportDocumentType(@RequestParam("id") Long id) { ReportDocumentTypeDO reportDocumentType = reportDocumentTypeService.getReportDocumentType(id); return success(BeanUtils.toBean(reportDocumentType, ReportDocumentTypeRespVO.class)); @@ -73,7 +73,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得报告类型配置分页") - @PreAuthorize("@ss.hasPermission('qms:report-document-type:query')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:query')") public CommonResult> getReportDocumentTypePage(@Valid ReportDocumentTypePageReqVO pageReqVO) { PageResult pageResult = reportDocumentTypeService.getReportDocumentTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ReportDocumentTypeRespVO.class)); @@ -81,7 +81,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出报告类型配置 Excel") - @PreAuthorize("@ss.hasPermission('qms:report-document-type:export')") + //@PreAuthorize("@ss.hasPermission('qms:report-document-type:export')") @ApiAccessLog(operateType = EXPORT) public void exportReportDocumentTypeExcel(@Valid ReportDocumentTypePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/sampleflow/SampleFlowNode.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/sampleflow/SampleFlowNode.java index c5a6edf..e69ec8d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/sampleflow/SampleFlowNode.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/sampleflow/SampleFlowNode.java @@ -20,7 +20,7 @@ public class SampleFlowNode implements Serializable { private String nodeName; /** 是否默认流程 **/ - private Boolean isDefault; + private Boolean isDefault = false; /** 条件 **/ private String condition; diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml index fea3294..d97b438 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml @@ -44,7 +44,7 @@ LEFT JOIN T_CFG_ASY_MTHD tcam ON tbatd.CFG_ASY_MTHD_ID = tcam.ID WHERE - tbatd.SMP_FLW_NDE_KY = 'flw_fx_receive' + tbatd.SMP_FLW_NDE_KY = 'flw_analysis' AND tbatd.DELETED = 0 GROUP BY tbatd.CFG_ASY_MTHD_ID, @@ -71,7 +71,7 @@ LEFT JOIN T_BSN_SB_SMP tbss ON tbatd.BSN_SB_SMP_ID = tbss.ID WHERE tbatd.IS_ASN_TSKD = 0 - AND tbatd.SMP_FLW_NDE_KY = 'flw_fx_receive' + AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis' GROUP BY tbss.ID , tbss.SMP_NAME , tbss.SMP_CD ,