zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流程修改

Browse Source
This commit is contained in:
王兴荣
2025-10-24 08:32:29 +08:00
parent 565b545968
commit f0f4daac15
67 changed files with 575 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
View File

@@ -105,23 +105,26 @@ public interface QmsCommonConstant {
String ENTRUST_INSPECTION = "entrust_inspection"; 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";
} }

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java
View File

@@ -44,14 +44,14 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测参数数据业务") @Operation(summary = "创建检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
public CommonResult<BusinessAssayParameterDataRespVO> createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) { public CommonResult<BusinessAssayParameterDataRespVO> createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) {
return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO)); return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测参数数据业务") @Operation(summary = "更新检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
public CommonResult<Boolean> updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) {
businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO); businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测参数数据业务") @Operation(summary = "删除检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessAssayParameterData(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayParameterData(@RequestParam("id") Long id) {
businessAssayParameterDataService.deleteBusinessAssayParameterData(id); businessAssayParameterDataService.deleteBusinessAssayParameterData(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测参数数据业务") @Operation(summary = "批量删除检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds()); businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测参数数据业务") @Operation(summary = "获得检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayParameterDataRespVO> getBusinessAssayParameterData(@RequestParam("id") Long id) { public CommonResult<BusinessAssayParameterDataRespVO> getBusinessAssayParameterData(@RequestParam("id") Long id) {
BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id); BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id);
return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class)); return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测参数数据业务分页") @Operation(summary = "获得检测参数数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
public CommonResult<PageResult<BusinessAssayParameterDataRespVO>> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayParameterDataRespVO>> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) {
PageResult<BusinessAssayParameterDataDO> pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO); PageResult<BusinessAssayParameterDataDO> pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测参数数据业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO, public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayProjectDataController.java
View File

@@ -45,14 +45,14 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测项目数据业务") @Operation(summary = "创建检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
public CommonResult<BusinessAssayProjectDataRespVO> createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) { public CommonResult<BusinessAssayProjectDataRespVO> createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) {
return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO)); return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测项目数据业务") @Operation(summary = "更新检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
public CommonResult<Boolean> updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) {
businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO); businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO);
return success(true); return success(true);
@@ -61,7 +61,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测项目数据业务") @Operation(summary = "删除检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessAssayProjectData(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayProjectData(@RequestParam("id") Long id) {
businessAssayProjectDataService.deleteBusinessAssayProjectData(id); businessAssayProjectDataService.deleteBusinessAssayProjectData(id);
return success(true); return success(true);
@@ -70,7 +70,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测项目数据业务") @Operation(summary = "批量删除检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds()); businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds());
return success(true); return success(true);
@@ -79,7 +79,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测项目数据业务") @Operation(summary = "获得检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayProjectDataRespVO> getBusinessAssayProjectData(@RequestParam("id") Long id) { public CommonResult<BusinessAssayProjectDataRespVO> getBusinessAssayProjectData(@RequestParam("id") Long id) {
BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id); BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id);
return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class)); return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class));
@@ -87,7 +87,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测项目数据业务分页") @Operation(summary = "获得检测项目数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
public CommonResult<PageResult<BusinessAssayProjectDataRespVO>> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayProjectDataRespVO>> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) {
PageResult<BusinessAssayProjectDataDO> pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO); PageResult<BusinessAssayProjectDataDO> pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class));
@@ -95,7 +95,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测项目数据业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO, public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java
View File

@@ -44,14 +44,14 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测报表数据业务") @Operation(summary = "创建检测报表数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')")
public CommonResult<BusinessAssayReportDataRespVO> createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) { public CommonResult<BusinessAssayReportDataRespVO> createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) {
return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO)); return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测报表数据业务") @Operation(summary = "更新检测报表数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')")
public CommonResult<Boolean> updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) {
businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO); businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测报表数据业务") @Operation(summary = "删除检测报表数据业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessAssayReportData(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayReportData(@RequestParam("id") Long id) {
businessAssayReportDataService.deleteBusinessAssayReportData(id); businessAssayReportDataService.deleteBusinessAssayReportData(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测报表数据业务") @Operation(summary = "批量删除检测报表数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds()); businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测报表数据业务") @Operation(summary = "获得检测报表数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayReportDataRespVO> getBusinessAssayReportData(@RequestParam("id") Long id) { public CommonResult<BusinessAssayReportDataRespVO> getBusinessAssayReportData(@RequestParam("id") Long id) {
BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id); BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id);
return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class)); return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测报表数据业务分页") @Operation(summary = "获得检测报表数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
public CommonResult<PageResult<BusinessAssayReportDataRespVO>> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayReportDataRespVO>> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) {
PageResult<BusinessAssayReportDataDO> pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO); PageResult<BusinessAssayReportDataDO> pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测报表数据业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO, public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java
View File

@@ -45,14 +45,14 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测任务分配业务") @Operation(summary = "创建检测任务分配业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')")
public CommonResult<BusinessAssayTaskRespVO> createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) { public CommonResult<BusinessAssayTaskRespVO> createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) {
return success(businessAssayTaskService.createBusinessAssayTask(createReqVO)); return success(businessAssayTaskService.createBusinessAssayTask(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测任务分配业务") @Operation(summary = "更新检测任务分配业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')")
public CommonResult<Boolean> updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) {
businessAssayTaskService.updateBusinessAssayTask(updateReqVO); businessAssayTaskService.updateBusinessAssayTask(updateReqVO);
return success(true); return success(true);
@@ -61,7 +61,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测任务分配业务") @Operation(summary = "删除检测任务分配业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
public CommonResult<Boolean> deleteBusinessAssayTask(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayTask(@RequestParam("id") Long id) {
businessAssayTaskService.deleteBusinessAssayTask(id); businessAssayTaskService.deleteBusinessAssayTask(id);
return success(true); return success(true);
@@ -70,7 +70,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测任务分配业务") @Operation(summary = "批量删除检测任务分配业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds()); businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds());
return success(true); return success(true);
@@ -79,7 +79,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测任务分配业务") @Operation(summary = "获得检测任务分配业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayTaskRespVO> getBusinessAssayTask(@RequestParam("id") Long id) { public CommonResult<BusinessAssayTaskRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id); BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class)); return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class));
@@ -87,7 +87,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测任务分配业务分页") @Operation(summary = "获得检测任务分配业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO); PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -95,7 +95,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测任务分配业务 Excel") @Operation(summary = "导出检测任务分配业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO, public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

20
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDataController.java
View File

@@ -42,14 +42,14 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样检测任务业务") @Operation(summary = "创建子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
public CommonResult<BusinessAssayTaskDataRespVO> createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) { public CommonResult<BusinessAssayTaskDataRespVO> createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) {
return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO)); return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样检测任务业务") @Operation(summary = "更新子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
public CommonResult<Boolean> updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) {
businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO); businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样检测任务业务") @Operation(summary = "删除子样检测任务业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessAssayTaskData(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayTaskData(@RequestParam("id") Long id) {
businessAssayTaskDataService.deleteBusinessAssayTaskData(id); businessAssayTaskDataService.deleteBusinessAssayTaskData(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样检测任务业务") @Operation(summary = "批量删除子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds()); businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样检测任务业务") @Operation(summary = "获得子样检测任务业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayTaskDataRespVO> getBusinessAssayTaskData(@RequestParam("id") Long id) { public CommonResult<BusinessAssayTaskDataRespVO> getBusinessAssayTaskData(@RequestParam("id") Long id) {
BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id); BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id);
return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class)); return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class));
@@ -84,7 +84,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/getUnAssayTaskGroupList") @GetMapping("/getUnAssayTaskGroupList")
@Operation(summary = "获得未指派的子样检测任务业务分组列表") @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) { public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO); List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
return success(list); return success(list);
@@ -92,7 +92,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/getUnAuditTaskGroupList") @GetMapping("/getUnAuditTaskGroupList")
@Operation(summary = "获得未审核的子样检测任务业务分组列表") @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) { public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO); List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
return success(list); return success(list);
@@ -100,7 +100,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得子样检测任务业务列表") @Operation(summary = "获得子样检测任务业务列表")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<List<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataReqVO reqVO) { public CommonResult<List<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataExtendRespVO> listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO); List<BusinessAssayTaskDataExtendRespVO> listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO);
return success(listResult); return success(listResult);
@@ -108,7 +108,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样检测任务业务分页") @Operation(summary = "获得子样检测任务业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<PageResult<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDataExtendRespVO> pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO); PageResult<BusinessAssayTaskDataExtendRespVO> pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -116,7 +116,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样检测任务业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO, public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java
View File

@@ -44,14 +44,14 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测任务分配明细") @Operation(summary = "创建检测任务分配明细")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')")
public CommonResult<BusinessAssayTaskDetailRespVO> createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) { public CommonResult<BusinessAssayTaskDetailRespVO> createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) {
return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO)); return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测任务分配明细") @Operation(summary = "更新检测任务分配明细")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')")
public CommonResult<Boolean> updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) {
businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO); businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测任务分配明细") @Operation(summary = "删除检测任务分配明细")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) {
businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id); businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测任务分配明细") @Operation(summary = "批量删除检测任务分配明细")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds()); businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测任务分配明细") @Operation(summary = "获得检测任务分配明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessAssayTaskDetailRespVO> getBusinessAssayTaskDetail(@RequestParam("id") Long id) { public CommonResult<BusinessAssayTaskDetailRespVO> getBusinessAssayTaskDetail(@RequestParam("id") Long id) {
BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id); BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id);
return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class)); return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测任务分配明细分页") @Operation(summary = "获得检测任务分配明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO); PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得检测任务分配明细分页") @Operation(summary = "获得检测任务分配明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<List<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) { public CommonResult<List<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) {
List<BusinessAssayTaskDetailExtendRespVO> resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO); List<BusinessAssayTaskDetailExtendRespVO> resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO);
return success(resultList); return success(resultList);
@@ -102,7 +102,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测任务分配明细 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO, public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessBaseSampleController.java
View File

@@ -44,14 +44,14 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建主样业务") @Operation(summary = "创建主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
public CommonResult<BusinessBaseSampleRespVO> createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) { public CommonResult<BusinessBaseSampleRespVO> createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) {
return success(businessBaseSampleService.createBusinessBaseSample(createReqVO)); return success(businessBaseSampleService.createBusinessBaseSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新主样业务") @Operation(summary = "更新主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
public CommonResult<Boolean> updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) {
businessBaseSampleService.updateBusinessBaseSample(updateReqVO); businessBaseSampleService.updateBusinessBaseSample(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除主样业务") @Operation(summary = "删除主样业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
public CommonResult<Boolean> deleteBusinessBaseSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessBaseSample(@RequestParam("id") Long id) {
businessBaseSampleService.deleteBusinessBaseSample(id); businessBaseSampleService.deleteBusinessBaseSample(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除主样业务") @Operation(summary = "批量删除主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
public CommonResult<Boolean> deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) {
businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds()); businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得主样业务") @Operation(summary = "获得主样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessBaseSampleRespVO> getBusinessBaseSample(@RequestParam("id") Long id) { public CommonResult<BusinessBaseSampleRespVO> getBusinessBaseSample(@RequestParam("id") Long id) {
BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id); BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id);
return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class)); return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得主样业务分页") @Operation(summary = "获得主样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
public CommonResult<PageResult<BusinessBaseSampleRespVO>> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BusinessBaseSampleRespVO>> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) {
PageResult<BusinessBaseSampleDO> pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO); PageResult<BusinessBaseSampleDO> pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出主样业务 Excel") @Operation(summary = "导出主样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO, public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessHandoverRecordSubController.java
View File

@@ -45,14 +45,14 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样交接记录业务") @Operation(summary = "创建子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')") //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
public CommonResult<BusinessHandoverRecordSubRespVO> createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) { public CommonResult<BusinessHandoverRecordSubRespVO> createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) {
return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO)); return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样交接记录业务") @Operation(summary = "更新子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')") //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
public CommonResult<Boolean> updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) {
businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO); businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO);
return success(true); return success(true);
@@ -61,7 +61,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样交接记录业务") @Operation(summary = "删除子样交接记录业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) {
businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id); businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id);
return success(true); return success(true);
@@ -70,7 +70,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样交接记录业务") @Operation(summary = "批量删除子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
public CommonResult<Boolean> deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) {
businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds()); businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds());
return success(true); return success(true);
@@ -79,7 +79,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样交接记录业务") @Operation(summary = "获得子样交接记录业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessHandoverRecordSubRespVO> getBusinessHandoverRecordSub(@RequestParam("id") Long id) { public CommonResult<BusinessHandoverRecordSubRespVO> getBusinessHandoverRecordSub(@RequestParam("id") Long id) {
BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id); BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id);
return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class)); return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class));
@@ -87,7 +87,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样交接记录业务分页") @Operation(summary = "获得子样交接记录业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')") //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) {
PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO); PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -95,7 +95,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样交接记录业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO, public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java
View File

@@ -44,14 +44,14 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建质控样检测项目业务") @Operation(summary = "创建质控样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')") //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')")
public CommonResult<BusinessQualityControlSampleProjectRespVO> createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) { public CommonResult<BusinessQualityControlSampleProjectRespVO> createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) {
return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO)); return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新质控样检测项目业务") @Operation(summary = "更新质控样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')") //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')")
public CommonResult<Boolean> updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) {
businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO); businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除质控样检测项目业务") @Operation(summary = "删除质控样检测项目业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id); businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测项目业务") @Operation(summary = "批量删除质控样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) {
businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds()); businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得质控样检测项目业务") @Operation(summary = "获得质控样检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessQualityControlSampleProjectRespVO> getBusinessQualityControlSampleProject(@RequestParam("id") Long id) { public CommonResult<BusinessQualityControlSampleProjectRespVO> getBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id); BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id);
return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class)); return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得质控样检测项目业务分页") @Operation(summary = "获得质控样检测项目业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')") //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
public CommonResult<PageResult<BusinessQualityControlSampleProjectRespVO>> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessQualityControlSampleProjectRespVO>> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) {
PageResult<BusinessQualityControlSampleProjectDO> pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO); PageResult<BusinessQualityControlSampleProjectDO> pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出质控样检测项目业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO, public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleAssayResultController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建委检登记来样品位") @Operation(summary = "创建委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')")
public CommonResult<BusinessSampleAssayResultRespVO> createBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO createReqVO) { public CommonResult<BusinessSampleAssayResultRespVO> createBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO createReqVO) {
return success(businessSampleAssayResultService.createBusinessSampleAssayResult(createReqVO)); return success(businessSampleAssayResultService.createBusinessSampleAssayResult(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新委检登记来样品位") @Operation(summary = "更新委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')")
public CommonResult<Boolean> updateBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO updateReqVO) {
businessSampleAssayResultService.updateBusinessSampleAssayResult(updateReqVO); businessSampleAssayResultService.updateBusinessSampleAssayResult(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除委检登记来样品位") @Operation(summary = "删除委检登记来样品位")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSampleAssayResult(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleAssayResult(@RequestParam("id") Long id) {
businessSampleAssayResultService.deleteBusinessSampleAssayResult(id); businessSampleAssayResultService.deleteBusinessSampleAssayResult(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记来样品位") @Operation(summary = "批量删除委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
public CommonResult<Boolean> deleteBusinessSampleAssayResultList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleAssayResultList(@RequestBody BatchDeleteReqVO req) {
businessSampleAssayResultService.deleteBusinessSampleAssayResultListByIds(req.getIds()); businessSampleAssayResultService.deleteBusinessSampleAssayResultListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得委检登记来样品位") @Operation(summary = "获得委检登记来样品位")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleAssayResultRespVO> getBusinessSampleAssayResult(@RequestParam("id") Long id) { public CommonResult<BusinessSampleAssayResultRespVO> getBusinessSampleAssayResult(@RequestParam("id") Long id) {
BusinessSampleAssayResultDO businessSampleAssayResult = businessSampleAssayResultService.getBusinessSampleAssayResult(id); BusinessSampleAssayResultDO businessSampleAssayResult = businessSampleAssayResultService.getBusinessSampleAssayResult(id);
return success(BeanUtils.toBean(businessSampleAssayResult, BusinessSampleAssayResultRespVO.class)); return success(BeanUtils.toBean(businessSampleAssayResult, BusinessSampleAssayResultRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得委检登记来样品位分页") @Operation(summary = "获得委检登记来样品位分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
public CommonResult<PageResult<BusinessSampleAssayResultRespVO>> getBusinessSampleAssayResultPage(@Valid BusinessSampleAssayResultPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleAssayResultRespVO>> getBusinessSampleAssayResultPage(@Valid BusinessSampleAssayResultPageReqVO pageReqVO) {
PageResult<BusinessSampleAssayResultDO> pageResult = businessSampleAssayResultService.getBusinessSampleAssayResultPage(pageReqVO); PageResult<BusinessSampleAssayResultDO> pageResult = businessSampleAssayResultService.getBusinessSampleAssayResultPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleAssayResultRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSampleAssayResultRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出委检登记来样品位 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleAssayResultExcel(@Valid BusinessSampleAssayResultPageReqVO pageReqVO, public void exportBusinessSampleAssayResultExcel(@Valid BusinessSampleAssayResultPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustDetailController.java
View File

@@ -42,14 +42,14 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建委检登记样品明细") @Operation(summary = "创建委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')")
public CommonResult<BusinessSampleEntrustDetailRespVO> createBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO createReqVO) { public CommonResult<BusinessSampleEntrustDetailRespVO> createBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO createReqVO) {
return success(businessSampleEntrustDetailService.createBusinessSampleEntrustDetail(createReqVO)); return success(businessSampleEntrustDetailService.createBusinessSampleEntrustDetail(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新委检登记样品明细") @Operation(summary = "更新委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO updateReqVO) {
businessSampleEntrustDetailService.updateBusinessSampleEntrustDetail(updateReqVO); businessSampleEntrustDetailService.updateBusinessSampleEntrustDetail(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除委检登记样品明细") @Operation(summary = "删除委检登记样品明细")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSampleEntrustDetail(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetail(id); businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetail(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记样品明细") @Operation(summary = "批量删除委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustDetailList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleEntrustDetailList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetailListByIds(req.getIds()); businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetailListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得委检登记样品明细") @Operation(summary = "获得委检登记样品明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleEntrustDetailRespVO> getBusinessSampleEntrustDetail(@RequestParam("id") Long id) { public CommonResult<BusinessSampleEntrustDetailRespVO> getBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
BusinessSampleEntrustDetailDO businessSampleEntrustDetail = businessSampleEntrustDetailService.getBusinessSampleEntrustDetail(id); BusinessSampleEntrustDetailDO businessSampleEntrustDetail = businessSampleEntrustDetailService.getBusinessSampleEntrustDetail(id);
return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class)); return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class));
@@ -85,7 +85,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得委检登记样品明细列表") @Operation(summary = "获得委检登记样品明细列表")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<List<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) { public CommonResult<List<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) {
List<BusinessSampleEntrustDetailExtendRespVO> listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO); List<BusinessSampleEntrustDetailExtendRespVO> listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO);
return success(listResult); return success(listResult);
@@ -93,7 +93,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得委检登记样品明细分页") @Operation(summary = "获得委检登记样品明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<PageResult<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustDetailExtendRespVO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO); PageResult<BusinessSampleEntrustDetailExtendRespVO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -101,7 +101,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出委检登记样品明细 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO, public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustProjectController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建委检样品检测项目业务") @Operation(summary = "创建委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')")
public CommonResult<BusinessSampleEntrustProjectRespVO> createBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO createReqVO) { public CommonResult<BusinessSampleEntrustProjectRespVO> createBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO createReqVO) {
return success(businessSampleEntrustProjectService.createBusinessSampleEntrustProject(createReqVO)); return success(businessSampleEntrustProjectService.createBusinessSampleEntrustProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新委检样品检测项目业务") @Operation(summary = "更新委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO updateReqVO) {
businessSampleEntrustProjectService.updateBusinessSampleEntrustProject(updateReqVO); businessSampleEntrustProjectService.updateBusinessSampleEntrustProject(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除委检样品检测项目业务") @Operation(summary = "删除委检样品检测项目业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSampleEntrustProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleEntrustProject(@RequestParam("id") Long id) {
businessSampleEntrustProjectService.deleteBusinessSampleEntrustProject(id); businessSampleEntrustProjectService.deleteBusinessSampleEntrustProject(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检样品检测项目业务") @Operation(summary = "批量删除委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleEntrustProjectList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustProjectService.deleteBusinessSampleEntrustProjectListByIds(req.getIds()); businessSampleEntrustProjectService.deleteBusinessSampleEntrustProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得委检样品检测项目业务") @Operation(summary = "获得委检样品检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleEntrustProjectRespVO> getBusinessSampleEntrustProject(@RequestParam("id") Long id) { public CommonResult<BusinessSampleEntrustProjectRespVO> getBusinessSampleEntrustProject(@RequestParam("id") Long id) {
BusinessSampleEntrustProjectDO businessSampleEntrustProject = businessSampleEntrustProjectService.getBusinessSampleEntrustProject(id); BusinessSampleEntrustProjectDO businessSampleEntrustProject = businessSampleEntrustProjectService.getBusinessSampleEntrustProject(id);
return success(BeanUtils.toBean(businessSampleEntrustProject, BusinessSampleEntrustProjectRespVO.class)); return success(BeanUtils.toBean(businessSampleEntrustProject, BusinessSampleEntrustProjectRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得委检样品检测项目业务分页") @Operation(summary = "获得委检样品检测项目业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
public CommonResult<PageResult<BusinessSampleEntrustProjectRespVO>> getBusinessSampleEntrustProjectPage(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleEntrustProjectRespVO>> getBusinessSampleEntrustProjectPage(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustProjectDO> pageResult = businessSampleEntrustProjectService.getBusinessSampleEntrustProjectPage(pageReqVO); PageResult<BusinessSampleEntrustProjectDO> pageResult = businessSampleEntrustProjectService.getBusinessSampleEntrustProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustProjectRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出委检样品检测项目业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustProjectExcel(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO, public void exportBusinessSampleEntrustProjectExcel(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java
View File

@@ -46,14 +46,14 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建委检登记业务") @Operation(summary = "创建委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')")
public CommonResult<BusinessSampleEntrustRegistrationRespVO> createBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO createReqVO) { public CommonResult<BusinessSampleEntrustRegistrationRespVO> createBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO createReqVO) {
return success(businessSampleEntrustRegistrationService.createBusinessSampleEntrustRegistration(createReqVO)); return success(businessSampleEntrustRegistrationService.createBusinessSampleEntrustRegistration(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新委检登记业务") @Operation(summary = "更新委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO updateReqVO) {
businessSampleEntrustRegistrationService.updateBusinessSampleEntrustRegistration(updateReqVO); businessSampleEntrustRegistrationService.updateBusinessSampleEntrustRegistration(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除委检登记业务") @Operation(summary = "删除委检登记业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSampleEntrustRegistration(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistration(id); businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistration(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记业务") @Operation(summary = "批量删除委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustRegistrationList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleEntrustRegistrationList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistrationListByIds(req.getIds()); businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistrationListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得委检登记业务") @Operation(summary = "获得委检登记业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleEntrustRegistrationRespVO> getBusinessSampleEntrustRegistration(@RequestParam("id") Long id) { public CommonResult<BusinessSampleEntrustRegistrationRespVO> getBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistration = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistration(id); BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistration = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistration(id);
return success(BeanUtils.toBean(businessSampleEntrustRegistration, BusinessSampleEntrustRegistrationRespVO.class)); return success(BeanUtils.toBean(businessSampleEntrustRegistration, BusinessSampleEntrustRegistrationRespVO.class));
@@ -88,7 +88,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得委检登记业务分页") @Operation(summary = "获得委检登记业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> getBusinessSampleEntrustRegistrationPage(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> getBusinessSampleEntrustRegistrationPage(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> pageResult = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistrationPage(pageReqVO); PageResult<BusinessSampleEntrustRegistrationExtendRespVO> pageResult = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistrationPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -96,7 +96,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出委检登记业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustRegistrationExcel(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO, public void exportBusinessSampleEntrustRegistrationExcel(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品交接单业务") @Operation(summary = "创建样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')")
public CommonResult<BusinessSampleHandoverRespVO> createBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO createReqVO) { public CommonResult<BusinessSampleHandoverRespVO> createBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO createReqVO) {
return success(businessSampleHandoverService.createBusinessSampleHandover(createReqVO)); return success(businessSampleHandoverService.createBusinessSampleHandover(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品交接单业务") @Operation(summary = "更新样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')")
public CommonResult<Boolean> updateBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO updateReqVO) {
businessSampleHandoverService.updateBusinessSampleHandover(updateReqVO); businessSampleHandoverService.updateBusinessSampleHandover(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品交接单业务") @Operation(summary = "删除样品交接单业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandover(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleHandover(@RequestParam("id") Long id) {
businessSampleHandoverService.deleteBusinessSampleHandover(id); businessSampleHandoverService.deleteBusinessSampleHandover(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品交接单业务") @Operation(summary = "批量删除样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandoverList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleHandoverList(@RequestBody BatchDeleteReqVO req) {
businessSampleHandoverService.deleteBusinessSampleHandoverListByIds(req.getIds()); businessSampleHandoverService.deleteBusinessSampleHandoverListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品交接单业务") @Operation(summary = "获得样品交接单业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleHandoverRespVO> getBusinessSampleHandover(@RequestParam("id") Long id) { public CommonResult<BusinessSampleHandoverRespVO> getBusinessSampleHandover(@RequestParam("id") Long id) {
BusinessSampleHandoverDO businessSampleHandover = businessSampleHandoverService.getBusinessSampleHandover(id); BusinessSampleHandoverDO businessSampleHandover = businessSampleHandoverService.getBusinessSampleHandover(id);
return success(BeanUtils.toBean(businessSampleHandover, BusinessSampleHandoverRespVO.class)); return success(BeanUtils.toBean(businessSampleHandover, BusinessSampleHandoverRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品交接单业务分页") @Operation(summary = "获得样品交接单业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
public CommonResult<PageResult<BusinessSampleHandoverRespVO>> getBusinessSampleHandoverPage(@Valid BusinessSampleHandoverPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleHandoverRespVO>> getBusinessSampleHandoverPage(@Valid BusinessSampleHandoverPageReqVO pageReqVO) {
PageResult<BusinessSampleHandoverDO> pageResult = businessSampleHandoverService.getBusinessSampleHandoverPage(pageReqVO); PageResult<BusinessSampleHandoverDO> pageResult = businessSampleHandoverService.getBusinessSampleHandoverPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品交接单业务 Excel") @Operation(summary = "导出样品交接单业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleHandoverExcel(@Valid BusinessSampleHandoverPageReqVO pageReqVO, public void exportBusinessSampleHandoverExcel(@Valid BusinessSampleHandoverPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品交接明细") @Operation(summary = "创建样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')")
public CommonResult<BusinessSampleHandoverDetailRespVO> createBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO createReqVO) { public CommonResult<BusinessSampleHandoverDetailRespVO> createBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO createReqVO) {
return success(businessSampleHandoverDetailService.createBusinessSampleHandoverDetail(createReqVO)); return success(businessSampleHandoverDetailService.createBusinessSampleHandoverDetail(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品交接明细") @Operation(summary = "更新样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')")
public CommonResult<Boolean> updateBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO updateReqVO) {
businessSampleHandoverDetailService.updateBusinessSampleHandoverDetail(updateReqVO); businessSampleHandoverDetailService.updateBusinessSampleHandoverDetail(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品交接明细") @Operation(summary = "删除样品交接明细")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSampleHandoverDetail(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetail(id); businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetail(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品交接明细") @Operation(summary = "批量删除样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandoverDetailList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSampleHandoverDetailList(@RequestBody BatchDeleteReqVO req) {
businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetailListByIds(req.getIds()); businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetailListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品交接明细") @Operation(summary = "获得样品交接明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSampleHandoverDetailRespVO> getBusinessSampleHandoverDetail(@RequestParam("id") Long id) { public CommonResult<BusinessSampleHandoverDetailRespVO> getBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
BusinessSampleHandoverDetailDO businessSampleHandoverDetail = businessSampleHandoverDetailService.getBusinessSampleHandoverDetail(id); BusinessSampleHandoverDetailDO businessSampleHandoverDetail = businessSampleHandoverDetailService.getBusinessSampleHandoverDetail(id);
return success(BeanUtils.toBean(businessSampleHandoverDetail, BusinessSampleHandoverDetailRespVO.class)); return success(BeanUtils.toBean(businessSampleHandoverDetail, BusinessSampleHandoverDetailRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品交接明细分页") @Operation(summary = "获得样品交接明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
public CommonResult<PageResult<BusinessSampleHandoverDetailRespVO>> getBusinessSampleHandoverDetailPage(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSampleHandoverDetailRespVO>> getBusinessSampleHandoverDetailPage(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleHandoverDetailDO> pageResult = businessSampleHandoverDetailService.getBusinessSampleHandoverDetailPage(pageReqVO); PageResult<BusinessSampleHandoverDetailDO> pageResult = businessSampleHandoverDetailService.getBusinessSampleHandoverDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品交接明细 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleHandoverDetailExcel(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO, public void exportBusinessSampleHandoverDetailExcel(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java
View File

@@ -44,14 +44,14 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建标准样业务") @Operation(summary = "创建标准样业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')")
public CommonResult<BusinessStandardSampleRespVO> createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) { public CommonResult<BusinessStandardSampleRespVO> createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) {
return success(businessStandardSampleService.createBusinessStandardSample(createReqVO)); return success(businessStandardSampleService.createBusinessStandardSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新标准样业务") @Operation(summary = "更新标准样业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')")
public CommonResult<Boolean> updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) {
businessStandardSampleService.updateBusinessStandardSample(updateReqVO); businessStandardSampleService.updateBusinessStandardSample(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除标准样业务") @Operation(summary = "删除标准样业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
public CommonResult<Boolean> deleteBusinessStandardSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessStandardSample(@RequestParam("id") Long id) {
businessStandardSampleService.deleteBusinessStandardSample(id); businessStandardSampleService.deleteBusinessStandardSample(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样业务") @Operation(summary = "批量删除标准样业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
public CommonResult<Boolean> deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) {
businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds()); businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得标准样业务") @Operation(summary = "获得标准样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessStandardSampleRespVO> getBusinessStandardSample(@RequestParam("id") Long id) { public CommonResult<BusinessStandardSampleRespVO> getBusinessStandardSample(@RequestParam("id") Long id) {
BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id); BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id);
return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class)); return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得标准样业务分页") @Operation(summary = "获得标准样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
public CommonResult<PageResult<BusinessStandardSampleRespVO>> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BusinessStandardSampleRespVO>> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) {
PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO); PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出标准样业务 Excel") @Operation(summary = "导出标准样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO, public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java
View File

@@ -44,14 +44,14 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建标准样检测项目业务") @Operation(summary = "创建标准样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')")
public CommonResult<BusinessStandardSampleProjectRespVO> createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) { public CommonResult<BusinessStandardSampleProjectRespVO> createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) {
return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO)); return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新标准样检测项目业务") @Operation(summary = "更新标准样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')")
public CommonResult<Boolean> updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) {
businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO); businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除标准样检测项目业务") @Operation(summary = "删除标准样检测项目业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessStandardSampleProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessStandardSampleProject(@RequestParam("id") Long id) {
businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id); businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样检测项目业务") @Operation(summary = "批量删除标准样检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) {
businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds()); businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得标准样检测项目业务") @Operation(summary = "获得标准样检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessStandardSampleProjectRespVO> getBusinessStandardSampleProject(@RequestParam("id") Long id) { public CommonResult<BusinessStandardSampleProjectRespVO> getBusinessStandardSampleProject(@RequestParam("id") Long id) {
BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id); BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id);
return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class)); return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得标准样检测项目业务分页") @Operation(summary = "获得标准样检测项目业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')") //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
public CommonResult<PageResult<BusinessStandardSampleProjectRespVO>> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessStandardSampleProjectRespVO>> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) {
PageResult<BusinessStandardSampleProjectDO> pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO); PageResult<BusinessStandardSampleProjectDO> pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出标准样检测项目业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO, public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java
View File

@@ -42,14 +42,14 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建班组判定数据业务") @Operation(summary = "创建班组判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) { public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO)); return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新班组判定数据业务") @Operation(summary = "更新班组判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO); businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除班组判定数据业务") @Operation(summary = "删除班组判定数据业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id); businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除班组判定数据业务") @Operation(summary = "批量删除班组判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds()); businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得班组判定数据业务") @Operation(summary = "获得班组判定数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { public CommonResult<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id); BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id);
return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class)); return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class));
@@ -84,7 +84,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得班组判定数据业务分页") @Operation(summary = "获得班组判定数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO); PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class));
@@ -92,7 +92,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出班组判定数据业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO, public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建分样业务") @Operation(summary = "创建分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')")
public CommonResult<BusinessSubParentSampleRespVO> createBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO createReqVO) { public CommonResult<BusinessSubParentSampleRespVO> createBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO createReqVO) {
return success(businessSubParentSampleService.createBusinessSubParentSample(createReqVO)); return success(businessSubParentSampleService.createBusinessSubParentSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新分样业务") @Operation(summary = "更新分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')")
public CommonResult<Boolean> updateBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO updateReqVO) {
businessSubParentSampleService.updateBusinessSubParentSample(updateReqVO); businessSubParentSampleService.updateBusinessSubParentSample(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除分样业务") @Operation(summary = "删除分样业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSubParentSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSubParentSample(@RequestParam("id") Long id) {
businessSubParentSampleService.deleteBusinessSubParentSample(id); businessSubParentSampleService.deleteBusinessSubParentSample(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除分样业务") @Operation(summary = "批量删除分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSubParentSampleList(@RequestBody BatchDeleteReqVO req) {
businessSubParentSampleService.deleteBusinessSubParentSampleListByIds(req.getIds()); businessSubParentSampleService.deleteBusinessSubParentSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得分样业务") @Operation(summary = "获得分样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSubParentSampleRespVO> getBusinessSubParentSample(@RequestParam("id") Long id) { public CommonResult<BusinessSubParentSampleRespVO> getBusinessSubParentSample(@RequestParam("id") Long id) {
BusinessSubParentSampleDO businessSubParentSample = businessSubParentSampleService.getBusinessSubParentSample(id); BusinessSubParentSampleDO businessSubParentSample = businessSubParentSampleService.getBusinessSubParentSample(id);
return success(BeanUtils.toBean(businessSubParentSample, BusinessSubParentSampleRespVO.class)); return success(BeanUtils.toBean(businessSubParentSample, BusinessSubParentSampleRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得分样业务分页") @Operation(summary = "获得分样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
public CommonResult<PageResult<BusinessSubParentSampleRespVO>> getBusinessSubParentSamplePage(@Valid BusinessSubParentSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubParentSampleRespVO>> getBusinessSubParentSamplePage(@Valid BusinessSubParentSamplePageReqVO pageReqVO) {
PageResult<BusinessSubParentSampleDO> pageResult = businessSubParentSampleService.getBusinessSubParentSamplePage(pageReqVO); PageResult<BusinessSubParentSampleDO> pageResult = businessSubParentSampleService.getBusinessSubParentSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出分样业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubParentSampleExcel(@Valid BusinessSubParentSamplePageReqVO pageReqVO, public void exportBusinessSubParentSampleExcel(@Valid BusinessSubParentSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样分析班组业务") @Operation(summary = "创建子样分析班组业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')")
public CommonResult<BusinessSubSampleAnalysisGroupRespVO> createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) { public CommonResult<BusinessSubSampleAnalysisGroupRespVO> createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) {
return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO)); return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样分析班组业务") @Operation(summary = "更新子样分析班组业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')")
public CommonResult<Boolean> updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) {
businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO); businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样分析班组业务") @Operation(summary = "删除子样分析班组业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id); businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样分析班组业务") @Operation(summary = "批量删除子样分析班组业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds()); businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样分析班组业务") @Operation(summary = "获得子样分析班组业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSubSampleAnalysisGroupRespVO> getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) { public CommonResult<BusinessSubSampleAnalysisGroupRespVO> getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id); BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id);
return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class)); return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样分析班组业务分页") @Operation(summary = "获得子样分析班组业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
public CommonResult<PageResult<BusinessSubSampleAnalysisGroupRespVO>> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubSampleAnalysisGroupRespVO>> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) {
PageResult<BusinessSubSampleAnalysisGroupDO> pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO); PageResult<BusinessSubSampleAnalysisGroupDO> pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样分析班组业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO, public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java
View File

@@ -44,14 +44,14 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样判定数据业务") @Operation(summary = "创建子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) { public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) {
return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO)); return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样判定数据业务") @Operation(summary = "更新子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO); businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样判定数据业务") @Operation(summary = "删除子样判定数据业务")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id); businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样判定数据业务") @Operation(summary = "批量删除子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds()); businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样判定数据业务") @Operation(summary = "获得子样判定数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) { public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id); BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id);
return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class)); return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class));
@@ -86,7 +86,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样判定数据业务分页") @Operation(summary = "获得子样判定数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) {
PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO); PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class)); return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class));
@@ -94,7 +94,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样判定数据业务 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) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO, public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

18
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java
View File

@@ -47,14 +47,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样业务") @Operation(summary = "创建子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')")
public CommonResult<BusinessSubSampleRespVO> createBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO createReqVO) { public CommonResult<BusinessSubSampleRespVO> createBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO createReqVO) {
return success(businessSubSampleService.createBusinessSubSample(createReqVO)); return success(businessSubSampleService.createBusinessSubSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样业务") @Operation(summary = "更新子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')")
public CommonResult<Boolean> updateBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO updateReqVO) {
businessSubSampleService.updateBusinessSubSample(updateReqVO); businessSubSampleService.updateBusinessSubSample(updateReqVO);
return success(true); return success(true);
@@ -63,7 +63,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样业务") @Operation(summary = "删除子样业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessSubSample(@RequestParam("id") Long id) {
businessSubSampleService.deleteBusinessSubSample(id); businessSubSampleService.deleteBusinessSubSample(id);
return success(true); return success(true);
@@ -72,7 +72,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样业务") @Operation(summary = "批量删除子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBusinessSubSampleList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleService.deleteBusinessSubSampleListByIds(req.getIds()); businessSubSampleService.deleteBusinessSubSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -81,7 +81,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样业务") @Operation(summary = "获得子样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<BusinessSubSampleRespVO> getBusinessSubSample(@RequestParam("id") Long id) { public CommonResult<BusinessSubSampleRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id); BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class)); return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
@@ -89,7 +89,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得子样业务列表") @Operation(summary = "获得子样业务列表")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<?> getBusinessSubSampleList(@Valid BusinessSubSampleReqVO reqVO) { public CommonResult<?> getBusinessSubSampleList(@Valid BusinessSubSampleReqVO reqVO) {
List<BusinessSubSampleExtendRespVO> listResult = businessSubSampleService.getBusinessSubSampleList(reqVO); List<BusinessSubSampleExtendRespVO> listResult = businessSubSampleService.getBusinessSubSampleList(reqVO);
return success(listResult); return success(listResult);
@@ -97,7 +97,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样业务分页") @Operation(summary = "获得子样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSamplePage(@Valid BusinessSubSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSamplePage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO); PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -105,7 +105,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/page-task") @GetMapping("/page-task")
@Operation(summary = "获得子样业务分页") @Operation(summary = "获得子样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO); PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
List<BusinessSubSampleExtendRespVO> list = pageResult.getList(); List<BusinessSubSampleExtendRespVO> list = pageResult.getList();
@@ -128,7 +128,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样业务 Excel") @Operation(summary = "导出子样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleExcel(@Valid BusinessSubSamplePageReqVO pageReqVO, public void exportBusinessSubSampleExcel(@Valid BusinessSubSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

63
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java
View File

@@ -57,42 +57,47 @@ public class SampleFlowController {
SampleFlowNode zxr = new SampleFlowNode(); SampleFlowNode zxr = new SampleFlowNode();
zxr.setNodeName("中心收样"); zxr.setNodeName("中心收样");
zxr.setNodeKey("flw_zx_receive"); zxr.setNodeKey("flw_center_receive");
zxr.setSort(3100); zxr.setSort(3100);
SampleFlowNode zxs = new SampleFlowNode(); SampleFlowNode zxs = new SampleFlowNode();
zxs.setNodeName("中心送样"); zxs.setNodeName("中心送样");
zxs.setNodeKey("flw_zx_send"); zxs.setNodeKey("flw_center_send");
zxs.setSort(3200); zxs.setSort(3200);
SampleFlowNode bzr = new SampleFlowNode(); SampleFlowNode bzr = new SampleFlowNode();
bzr.setNodeName("班组收样"); bzr.setNodeName("班组收样");
bzr.setNodeKey("flw_bz_receive"); bzr.setNodeKey("flw_team_receive");
bzr.setSort(3300); bzr.setSort(3300);
SampleFlowNode ypbm = new SampleFlowNode(); SampleFlowNode ypbm = new SampleFlowNode();
ypbm.setNodeName("样品编密"); ypbm.setNodeName("样品编密");
ypbm.setNodeKey("flw_ypbm"); ypbm.setNodeKey("flw_sample_encrypt");
ypbm.setSort(3400); ypbm.setSort(3400);
SampleFlowNode fxr = new SampleFlowNode(); // SampleFlowNode fxr = new SampleFlowNode();
fxr.setNodeName("分析收样"); // fxr.setNodeName("分析收样");
fxr.setNodeKey("flw_fx_receive"); // fxr.setNodeKey("flw_analysis_receive");
fxr.setSort(3500); // fxr.setSort(3500);
//
SampleFlowNode fxs = new SampleFlowNode(); SampleFlowNode fx = new SampleFlowNode();
fxs.setNodeName("分析送样"); fx.setNodeName("样品分析");
fxs.setNodeKey("flw_fx_send"); fx.setNodeKey("flw_analysis");
fxs.setSort(3600); fx.setSort(3550);
//
// SampleFlowNode fxs = new SampleFlowNode();
// fxs.setNodeName("分析送样");
// fxs.setNodeKey("flw_analysis_send");
// fxs.setSort(3600);
SampleFlowNode bzs = new SampleFlowNode(); SampleFlowNode bzs = new SampleFlowNode();
bzs.setNodeName("班组送样"); bzs.setNodeName("班组送样");
bzs.setNodeKey("flw_bz_send"); bzs.setNodeKey("flw_team_send");
bzs.setSort(3700); bzs.setSort(3700);
SampleFlowNode ypgk = new SampleFlowNode(); SampleFlowNode ypgk = new SampleFlowNode();
ypgk.setNodeName("样品归库"); ypgk.setNodeName("样品归库");
ypgk.setNodeKey("flw_ypgk"); ypgk.setNodeKey("flw_sample_storage");
ypgk.setSort(3800); ypgk.setSort(3800);
ypgk.setNextFlowNodeList(null); ypgk.setNextFlowNodeList(null);
flowNodeList.add(ypgk); flowNodeList.add(ypgk);
@@ -112,32 +117,36 @@ public class SampleFlowController {
flowNodeList.add(zxs); flowNodeList.add(zxs);
bzr.setNextFlowNodeList(new ArrayList<>() {{ bzr.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("样品需要编密并且没编密过")); add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
add(BeanUtils.toBean(fxr,SampleFlowNode.class).setCondition("样品无需编密或样品已编密过")); add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
}}); }});
flowNodeList.add(bzr); flowNodeList.add(bzr);
ypbm.setNextFlowNodeList(new ArrayList<>() {{ ypbm.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(fxr,SampleFlowNode.class).setIsDefault(true)); add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
}}); }});
flowNodeList.add(ypbm); flowNodeList.add(ypbm);
fxr.setNextFlowNodeList(new ArrayList<>() {{ // fxr.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true)); // add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
}}); // }});
flowNodeList.add(fxr); // flowNodeList.add(fxr);
//
//
// fxs.setNextFlowNodeList(new ArrayList<>() {{
// add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
// }});
// flowNodeList.add(fxs);
fx.setNextFlowNodeList(new ArrayList<>() {{
fxs.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完")); add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
}}); }});
flowNodeList.add(fxs); flowNodeList.add(fx);
bzs.setNextFlowNodeList(new ArrayList<>() {{ 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(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报"));
add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完")); add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完"));
}}); }});

41
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
View File

@@ -15,6 +15,7 @@ import cn.hutool.core.collection.CollUtil;
import com.zt.plat.framework.common.exception.ServiceException; 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.BusinessAssayParameterDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO; 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.BusinessAssayTaskDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleAssayResultDO; 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.dataobject.BusinessSubSampleDO;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper; 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.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.BusinessAssayTaskDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessBaseSampleMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessBaseSampleMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSampleAssayResultMapper; 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.ConfigAssayMethodProjectParameterDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigBaseSampleDO; 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.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.ConfigSubSampleDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleMethodDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleMethodDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleParentDO; 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.ConfigAssayMethodProjectParameterMapper;
import com.zt.plat.module.qms.business.config.dal.mapper.ConfigBaseSampleMapper; 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.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.ConfigSubSampleMapper;
import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMethodMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMethodMapper;
import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleParentMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleParentMapper;
@@ -133,6 +137,12 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
@Resource @Resource
private ConfigSampleFlowMapper configSampleFlowMapper; private ConfigSampleFlowMapper configSampleFlowMapper;
@Resource
private BusinessAssayReportDataMapper businessAssayReportDataMapper;
@Resource
private ConfigSampleReportMapper configSampleReportMapper;
@Override @Override
public void process() throws Exception { public void process() throws Exception {
//获取样品委托上下文 //获取样品委托上下文
@@ -154,7 +164,6 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
//样品大类列表 //样品大类列表
List<BaseSampleDO> baseSampleList = baseSampleMapper.selectList(); List<BaseSampleDO> baseSampleList = baseSampleMapper.selectList();
//主样配置 //主样配置
List<ConfigBaseSampleDO> configBaseSampleList = configBaseSampleMapper.selectList(); List<ConfigBaseSampleDO> configBaseSampleList = configBaseSampleMapper.selectList();
//分样配置 //分样配置
@@ -169,8 +178,12 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
List<ConfigAssayMethodProjectDO> configAssayMethodProjectList = configAssayMethodProjectMapper.selectList(); List<ConfigAssayMethodProjectDO> configAssayMethodProjectList = configAssayMethodProjectMapper.selectList();
//分析方法检测项目参数配置 //分析方法检测项目参数配置
List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectList(); List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectList();
//检测项目字典
List<DictionaryProjectDO> dictionaryProjectList = dictionaryProjectMapper.selectList(); List<DictionaryProjectDO> dictionaryProjectList = dictionaryProjectMapper.selectList();
//主样报表配置
List<ConfigSampleReportDO> configSampleReportList = configSampleReportMapper.selectList();
//样品流程配置 //样品流程配置
List<String> configSampleFlowKeyList = new ArrayList<>(); List<String> configSampleFlowKeyList = new ArrayList<>();
List<String> configBaseSampleFlowKeyList = configBaseSampleList.stream().map(m -> m.getFlowKey()).distinct().collect(Collectors.toList()); List<String> configBaseSampleFlowKeyList = configBaseSampleList.stream().map(m -> m.getFlowKey()).distinct().collect(Collectors.toList());
@@ -179,17 +192,29 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
configSampleFlowKeyList.addAll(configSubSampleFlowKeyList); configSampleFlowKeyList.addAll(configSubSampleFlowKeyList);
List<ConfigSampleFlowDO> configSampleFlowList = configSampleFlowMapper.selectLatestConfigSampleFlowListByKeys(configSampleFlowKeyList); List<ConfigSampleFlowDO> configSampleFlowList = configSampleFlowMapper.selectLatestConfigSampleFlowListByKeys(configSampleFlowKeyList);
//主样
List<BusinessBaseSampleDO> businessBaseSampleDOList = new ArrayList<>(); List<BusinessBaseSampleDO> businessBaseSampleDOList = new ArrayList<>();
//分样
List<BusinessSubParentSampleDO> businessSubParentSampleDOList = new ArrayList<>(); List<BusinessSubParentSampleDO> businessSubParentSampleDOList = new ArrayList<>();
//分样子样
List<BusinessSubSampleDO> businessSubSampleDOList = new ArrayList<>(); List<BusinessSubSampleDO> businessSubSampleDOList = new ArrayList<>();
//分样子样分析班组
List<BusinessSubSampleAnalysisGroupDO> businessSubSampleAnalysisGroupDOList = new ArrayList<>(); List<BusinessSubSampleAnalysisGroupDO> businessSubSampleAnalysisGroupDOList = new ArrayList<>();
//子样检测任务
List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = new ArrayList<>(); List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = new ArrayList<>();
//检测任务的分析项目
List<BusinessAssayProjectDataDO> businessAssayProjectDataDOList = new ArrayList<>(); List<BusinessAssayProjectDataDO> businessAssayProjectDataDOList = new ArrayList<>();
//分析项目对应的分析参数
List<BusinessAssayParameterDataDO> businessAssayParameterDataDOList = new ArrayList<>(); List<BusinessAssayParameterDataDO> businessAssayParameterDataDOList = new ArrayList<>();
//分析报表数据
List<BusinessAssayReportDataDO> businessAssayReportDataDOList = new ArrayList<>();
//子样流转信息列表
List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>(); List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
//委托明细排序
List<BusinessSampleEntrustDetailDO> sampleEntrustDetailListSort = sampleEntrustDetailList.stream().sorted(Comparator.comparingInt(BusinessSampleEntrustDetailDO::getSort)).collect(Collectors.toList()); List<BusinessSampleEntrustDetailDO> sampleEntrustDetailListSort = sampleEntrustDetailList.stream().sorted(Comparator.comparingInt(BusinessSampleEntrustDetailDO::getSort)).collect(Collectors.toList());
//主样
BusinessBaseSampleDO businessBaseSampleDO = null; BusinessBaseSampleDO businessBaseSampleDO = null;
for (BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO : sampleEntrustDetailListSort) {//委托样品明细 for (BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO : sampleEntrustDetailListSort) {//委托样品明细
@@ -265,6 +290,17 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
//添加到列表 //添加到列表
businessBaseSampleDOList.add(businessBaseSampleDO); businessBaseSampleDOList.add(businessBaseSampleDO);
//=======================报表==========================
List<ConfigSampleReportDO> 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 //设置主样id
businessSampleEntrustDetailDO.setBusinessBaseSampleId(businessBaseSampleDO.getId()); businessSampleEntrustDetailDO.setBusinessBaseSampleId(businessBaseSampleDO.getId());
@@ -456,6 +492,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
if (CollUtil.isNotEmpty(businessAssayParameterDataDOList)) { if (CollUtil.isNotEmpty(businessAssayParameterDataDOList)) {
businessAssayParameterDataMapper.insertBatch(businessAssayParameterDataDOList); businessAssayParameterDataMapper.insertBatch(businessAssayParameterDataDOList);
} }
if (CollUtil.isNotEmpty(businessAssayReportDataDOList)) {
businessAssayReportDataMapper.insertBatch(businessAssayReportDataDOList);
}
} }
} }

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSimpleEncryptCmp.java
View File

@@ -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.bus.liteflow.slot.SampleFlowContext;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO; 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.core.code.SequenceUtil;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@LiteflowComponent(id = "sampleSimpleEncryptCmp", name = "简码编密") @LiteflowComponent(id = "sampleSimpleEncryptCmp", name = "简码编密")
@@ -33,7 +35,7 @@ public class SampleSimpleEncryptCmp extends NodeComponent {
@Override @Override
public boolean isAccess() { public boolean isAccess() {
SampleFlowContext sampleFlowContext = this.getContextBean(SampleFlowContext.class); SampleFlowContext sampleFlowContext = this.getContextBean(SampleFlowContext.class);
return "flw_ypbm".equals(sampleFlowContext.getCurrentSampleFlowKey()); return QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(sampleFlowContext.getCurrentSampleFlowKey());
} }
} }

48
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java
View File

@@ -1,25 +1,33 @@
package com.zt.plat.module.qms.business.bus.liteflow.sample.flow; package com.zt.plat.module.qms.business.bus.liteflow.sample.flow;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.ql.util.express.DefaultContext;
import com.ql.util.express.ExpressRunner; import com.ql.util.express.ExpressRunner;
import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent; 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.BusinessAssayTaskDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessHandoverRecordSubDO; 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.dataobject.BusinessSubSampleDO;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessHandoverRecordSubMapper; 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.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.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.dal.mapper.ConfigRuleMapper;
import com.zt.plat.module.qms.business.config.service.ConfigSampleFlowService; 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.business.config.service.ConfigSubSampleService;
import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition; import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode; import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@LiteflowComponent(id = "sampleSubProcessUpdateCmp", name = "子样流程节点更新") @LiteflowComponent(id = "sampleSubProcessUpdateCmp", name = "子样流程节点更新")
@@ -57,10 +65,42 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
String configSampleFlowContent = configSampleFlow.getContent(); String configSampleFlowContent = configSampleFlow.getContent();
//样品流程定义 //样品流程定义
SampleFlowDefinition sampleFlowDefinition = JSON.parseObject(configSampleFlowContent, SampleFlowDefinition.class); SampleFlowDefinition sampleFlowDefinition = JSON.parseObject(configSampleFlowContent, SampleFlowDefinition.class);
//获取流程列表
List<SampleFlowNode> flowNodeList = sampleFlowDefinition.getFlowNodeList(); List<SampleFlowNode> flowNodeList = sampleFlowDefinition.getFlowNodeList();
SampleFlowNode flowNode = flowNodeList.stream().filter(f -> f.getNodeKey().equals(currentSampleFlowKey)).findFirst().orElse(null); //查询当前流程节点
List<SampleFlowNode> nextFlowNodeList = flowNode.getNextFlowNodeList(); SampleFlowNode currFlowNode = flowNodeList.stream().filter(f -> f.getNodeKey().equals(currentSampleFlowKey)).findFirst().orElse(null);
SampleFlowNode nextFlowNode = nextFlowNodeList.stream().filter(f -> f.getIsDefault()).findFirst().orElse(null); //获取下一个流程节点列表
List<SampleFlowNode> 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<String, Object> 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.setSampleFlowNodeKey(nextFlowNode.getNodeKey());
businessSubSample.setSampleFlowNodeTime(currentDateTime); businessSubSample.setSampleFlowNodeTime(currentDateTime);

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java
View File

@@ -45,14 +45,14 @@ public class BaseSampleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品大类管理") @Operation(summary = "创建样品大类管理")
@PreAuthorize("@ss.hasPermission('qms:base-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:create')")
public CommonResult<BaseSampleRespVO> createBaseSample(@Valid @RequestBody BaseSampleSaveReqVO createReqVO) { public CommonResult<BaseSampleRespVO> createBaseSample(@Valid @RequestBody BaseSampleSaveReqVO createReqVO) {
return success(baseSampleService.createBaseSample(createReqVO)); return success(baseSampleService.createBaseSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品大类管理") @Operation(summary = "更新样品大类管理")
@PreAuthorize("@ss.hasPermission('qms:base-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:update')")
public CommonResult<Boolean> updateBaseSample(@Valid @RequestBody BaseSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateBaseSample(@Valid @RequestBody BaseSampleSaveReqVO updateReqVO) {
baseSampleService.updateBaseSample(updateReqVO); baseSampleService.updateBaseSample(updateReqVO);
return success(true); return success(true);
@@ -61,7 +61,7 @@ public class BaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品大类管理") @Operation(summary = "删除样品大类管理")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')")
public CommonResult<Boolean> deleteBaseSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBaseSample(@RequestParam("id") Long id) {
baseSampleService.deleteBaseSample(id); baseSampleService.deleteBaseSample(id);
return success(true); return success(true);
@@ -70,7 +70,7 @@ public class BaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品大类管理") @Operation(summary = "批量删除样品大类管理")
@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:delete')")
public CommonResult<Boolean> deleteBaseSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteBaseSampleList(@RequestBody BatchDeleteReqVO req) {
baseSampleService.deleteBaseSampleListByIds(req.getIds()); baseSampleService.deleteBaseSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -79,7 +79,7 @@ public class BaseSampleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品大类管理") @Operation(summary = "获得样品大类管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:base-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:query')")
public CommonResult<BaseSampleRespVO> getBaseSample(@RequestParam("id") Long id) { public CommonResult<BaseSampleRespVO> getBaseSample(@RequestParam("id") Long id) {
BaseSampleDO baseSample = baseSampleService.getBaseSample(id); BaseSampleDO baseSample = baseSampleService.getBaseSample(id);
return success(BeanUtils.toBean(baseSample, BaseSampleRespVO.class)); return success(BeanUtils.toBean(baseSample, BaseSampleRespVO.class));
@@ -94,7 +94,7 @@ public class BaseSampleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品大类管理分页") @Operation(summary = "获得样品大类管理分页")
@PreAuthorize("@ss.hasPermission('qms:base-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:query')")
public CommonResult<PageResult<BaseSampleRespVO>> getBaseSamplePage(@Valid BaseSamplePageReqVO pageReqVO) { public CommonResult<PageResult<BaseSampleRespVO>> getBaseSamplePage(@Valid BaseSamplePageReqVO pageReqVO) {
PageResult<BaseSampleDO> pageResult = baseSampleService.getBaseSamplePage(pageReqVO); PageResult<BaseSampleDO> pageResult = baseSampleService.getBaseSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BaseSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, BaseSampleRespVO.class));
@@ -102,7 +102,7 @@ public class BaseSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品大类管理 Excel") @Operation(summary = "导出样品大类管理 Excel")
@PreAuthorize("@ss.hasPermission('qms:base-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:base-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportBaseSampleExcel(@Valid BaseSamplePageReqVO pageReqVO, public void exportBaseSampleExcel(@Valid BaseSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodController.java
View File

@@ -44,14 +44,14 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法配置") @Operation(summary = "创建检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:create')")
public CommonResult<ConfigAssayMethodRespVO> createConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodRespVO> createConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO createReqVO) {
return success(configAssayMethodService.createConfigAssayMethod(createReqVO)); return success(configAssayMethodService.createConfigAssayMethod(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法配置") @Operation(summary = "更新检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:update')")
public CommonResult<Boolean> updateConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethod(@Valid @RequestBody ConfigAssayMethodSaveReqVO updateReqVO) {
configAssayMethodService.updateConfigAssayMethod(updateReqVO); configAssayMethodService.updateConfigAssayMethod(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法配置") @Operation(summary = "删除检测方法配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')")
public CommonResult<Boolean> deleteConfigAssayMethod(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethod(@RequestParam("id") Long id) {
configAssayMethodService.deleteConfigAssayMethod(id); configAssayMethodService.deleteConfigAssayMethod(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法配置") @Operation(summary = "批量删除检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodService.deleteConfigAssayMethodListByIds(req.getIds()); configAssayMethodService.deleteConfigAssayMethodListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法配置") @Operation(summary = "获得检测方法配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodRespVO> getConfigAssayMethod(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodRespVO> getConfigAssayMethod(@RequestParam("id") Long id) {
ConfigAssayMethodDO configAssayMethod = configAssayMethodService.getConfigAssayMethod(id); ConfigAssayMethodDO configAssayMethod = configAssayMethodService.getConfigAssayMethod(id);
return success(BeanUtils.toBean(configAssayMethod, ConfigAssayMethodRespVO.class)); return success(BeanUtils.toBean(configAssayMethod, ConfigAssayMethodRespVO.class));
@@ -86,7 +86,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得检测方法配置列表") @Operation(summary = "获得检测方法配置列表")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')")
public CommonResult<List<ConfigAssayMethodExtendRespVO>> getConfigAssayMethodList(@Valid ConfigAssayMethodReqVO reqVO) { public CommonResult<List<ConfigAssayMethodExtendRespVO>> getConfigAssayMethodList(@Valid ConfigAssayMethodReqVO reqVO) {
List<ConfigAssayMethodExtendRespVO> listResult = configAssayMethodService.getConfigAssayMethodList(reqVO); List<ConfigAssayMethodExtendRespVO> listResult = configAssayMethodService.getConfigAssayMethodList(reqVO);
return success(listResult); return success(listResult);
@@ -94,7 +94,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法配置分页") @Operation(summary = "获得检测方法配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:query')")
public CommonResult<PageResult<ConfigAssayMethodExtendRespVO>> getConfigAssayMethodPage(@Valid ConfigAssayMethodPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodExtendRespVO>> getConfigAssayMethodPage(@Valid ConfigAssayMethodPageReqVO pageReqVO) {
PageResult<ConfigAssayMethodExtendRespVO> pageResult = configAssayMethodService.getConfigAssayMethodPage(pageReqVO); PageResult<ConfigAssayMethodExtendRespVO> pageResult = configAssayMethodService.getConfigAssayMethodPage(pageReqVO);
return success(pageResult); return success(pageResult);
@@ -102,7 +102,7 @@ public class ConfigAssayMethodController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法配置 Excel") @Operation(summary = "导出检测方法配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method:export')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodExcel(@Valid ConfigAssayMethodPageReqVO pageReqVO, public void exportConfigAssayMethodExcel(@Valid ConfigAssayMethodPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectAssessmentController.java
View File

@@ -42,14 +42,14 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法分析项目判定") @Operation(summary = "创建检测方法分析项目判定")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:create')")
public CommonResult<ConfigAssayMethodProjectAssessmentRespVO> createConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodProjectAssessmentRespVO> createConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO createReqVO) {
return success(configAssayMethodProjectAssessmentService.createConfigAssayMethodProjectAssessment(createReqVO)); return success(configAssayMethodProjectAssessmentService.createConfigAssayMethodProjectAssessment(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法分析项目判定") @Operation(summary = "更新检测方法分析项目判定")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:update')")
public CommonResult<Boolean> updateConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethodProjectAssessment(@Valid @RequestBody ConfigAssayMethodProjectAssessmentSaveReqVO updateReqVO) {
configAssayMethodProjectAssessmentService.updateConfigAssayMethodProjectAssessment(updateReqVO); configAssayMethodProjectAssessmentService.updateConfigAssayMethodProjectAssessment(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法分析项目判定") @Operation(summary = "删除检测方法分析项目判定")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) {
configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessment(id); configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessment(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法分析项目判定") @Operation(summary = "批量删除检测方法分析项目判定")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodProjectAssessmentList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodProjectAssessmentList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessmentListByIds(req.getIds()); configAssayMethodProjectAssessmentService.deleteConfigAssayMethodProjectAssessmentListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法分析项目判定") @Operation(summary = "获得检测方法分析项目判定")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodProjectAssessmentRespVO> getConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodProjectAssessmentRespVO> getConfigAssayMethodProjectAssessment(@RequestParam("id") Long id) {
ConfigAssayMethodProjectAssessmentDO configAssayMethodProjectAssessment = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessment(id); ConfigAssayMethodProjectAssessmentDO configAssayMethodProjectAssessment = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessment(id);
return success(BeanUtils.toBean(configAssayMethodProjectAssessment, ConfigAssayMethodProjectAssessmentRespVO.class)); return success(BeanUtils.toBean(configAssayMethodProjectAssessment, ConfigAssayMethodProjectAssessmentRespVO.class));
@@ -84,7 +84,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法分析项目判定分页") @Operation(summary = "获得检测方法分析项目判定分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-assessment:query')")
public CommonResult<PageResult<ConfigAssayMethodProjectAssessmentRespVO>> getConfigAssayMethodProjectAssessmentPage(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodProjectAssessmentRespVO>> getConfigAssayMethodProjectAssessmentPage(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO) {
PageResult<ConfigAssayMethodProjectAssessmentDO> pageResult = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessmentPage(pageReqVO); PageResult<ConfigAssayMethodProjectAssessmentDO> pageResult = configAssayMethodProjectAssessmentService.getConfigAssayMethodProjectAssessmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectAssessmentRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectAssessmentRespVO.class));
@@ -92,7 +92,7 @@ public class ConfigAssayMethodProjectAssessmentController implements BusinessCon
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法分析项目判定 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodProjectAssessmentExcel(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO, public void exportConfigAssayMethodProjectAssessmentExcel(@Valid ConfigAssayMethodProjectAssessmentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectCoefficientController.java
View File

@@ -42,14 +42,14 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法分析项目补正系数") @Operation(summary = "创建检测方法分析项目补正系数")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:create')")
public CommonResult<ConfigAssayMethodProjectCoefficientRespVO> createConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodProjectCoefficientRespVO> createConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO createReqVO) {
return success(configAssayMethodProjectCoefficientService.createConfigAssayMethodProjectCoefficient(createReqVO)); return success(configAssayMethodProjectCoefficientService.createConfigAssayMethodProjectCoefficient(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法分析项目补正系数") @Operation(summary = "更新检测方法分析项目补正系数")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:update')")
public CommonResult<Boolean> updateConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethodProjectCoefficient(@Valid @RequestBody ConfigAssayMethodProjectCoefficientSaveReqVO updateReqVO) {
configAssayMethodProjectCoefficientService.updateConfigAssayMethodProjectCoefficient(updateReqVO); configAssayMethodProjectCoefficientService.updateConfigAssayMethodProjectCoefficient(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法分析项目补正系数") @Operation(summary = "删除检测方法分析项目补正系数")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) {
configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficient(id); configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficient(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法分析项目补正系数") @Operation(summary = "批量删除检测方法分析项目补正系数")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodProjectCoefficientList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodProjectCoefficientList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficientListByIds(req.getIds()); configAssayMethodProjectCoefficientService.deleteConfigAssayMethodProjectCoefficientListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法分析项目补正系数") @Operation(summary = "获得检测方法分析项目补正系数")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodProjectCoefficientRespVO> getConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodProjectCoefficientRespVO> getConfigAssayMethodProjectCoefficient(@RequestParam("id") Long id) {
ConfigAssayMethodProjectCoefficientDO configAssayMethodProjectCoefficient = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficient(id); ConfigAssayMethodProjectCoefficientDO configAssayMethodProjectCoefficient = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficient(id);
return success(BeanUtils.toBean(configAssayMethodProjectCoefficient, ConfigAssayMethodProjectCoefficientRespVO.class)); return success(BeanUtils.toBean(configAssayMethodProjectCoefficient, ConfigAssayMethodProjectCoefficientRespVO.class));
@@ -84,7 +84,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法分析项目补正系数分页") @Operation(summary = "获得检测方法分析项目补正系数分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-coefficient:query')")
public CommonResult<PageResult<ConfigAssayMethodProjectCoefficientRespVO>> getConfigAssayMethodProjectCoefficientPage(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodProjectCoefficientRespVO>> getConfigAssayMethodProjectCoefficientPage(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO) {
PageResult<ConfigAssayMethodProjectCoefficientDO> pageResult = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficientPage(pageReqVO); PageResult<ConfigAssayMethodProjectCoefficientDO> pageResult = configAssayMethodProjectCoefficientService.getConfigAssayMethodProjectCoefficientPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectCoefficientRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectCoefficientRespVO.class));
@@ -92,7 +92,7 @@ public class ConfigAssayMethodProjectCoefficientController implements BusinessCo
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法分析项目补正系数 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodProjectCoefficientExcel(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO, public void exportConfigAssayMethodProjectCoefficientExcel(@Valid ConfigAssayMethodProjectCoefficientPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectController.java
View File

@@ -46,14 +46,14 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法分析项目配置") @Operation(summary = "创建检测方法分析项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:create')")
public CommonResult<ConfigAssayMethodProjectRespVO> createConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodProjectRespVO> createConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO createReqVO) {
return success(configAssayMethodProjectService.createConfigAssayMethodProject(createReqVO)); return success(configAssayMethodProjectService.createConfigAssayMethodProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法分析项目配置") @Operation(summary = "更新检测方法分析项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:update')")
public CommonResult<Boolean> updateConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethodProject(@Valid @RequestBody ConfigAssayMethodProjectSaveReqVO updateReqVO) {
configAssayMethodProjectService.updateConfigAssayMethodProject(updateReqVO); configAssayMethodProjectService.updateConfigAssayMethodProject(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法分析项目配置") @Operation(summary = "删除检测方法分析项目配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigAssayMethodProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethodProject(@RequestParam("id") Long id) {
configAssayMethodProjectService.deleteConfigAssayMethodProject(id); configAssayMethodProjectService.deleteConfigAssayMethodProject(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法分析项目配置") @Operation(summary = "批量删除检测方法分析项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodProjectList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodProjectService.deleteConfigAssayMethodProjectListByIds(req.getIds()); configAssayMethodProjectService.deleteConfigAssayMethodProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法分析项目配置") @Operation(summary = "获得检测方法分析项目配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodProjectRespVO> getConfigAssayMethodProject(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodProjectRespVO> getConfigAssayMethodProject(@RequestParam("id") Long id) {
ConfigAssayMethodProjectDO configAssayMethodProject = configAssayMethodProjectService.getConfigAssayMethodProject(id); ConfigAssayMethodProjectDO configAssayMethodProject = configAssayMethodProjectService.getConfigAssayMethodProject(id);
return success(BeanUtils.toBean(configAssayMethodProject, ConfigAssayMethodProjectRespVO.class)); return success(BeanUtils.toBean(configAssayMethodProject, ConfigAssayMethodProjectRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法分析项目配置分页") @Operation(summary = "获得检测方法分析项目配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project:query')")
public CommonResult<PageResult<ConfigAssayMethodProjectRespVO>> getConfigAssayMethodProjectPage(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodProjectRespVO>> getConfigAssayMethodProjectPage(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO) {
PageResult<ConfigAssayMethodProjectDO> pageResult = configAssayMethodProjectService.getConfigAssayMethodProjectPage(pageReqVO); PageResult<ConfigAssayMethodProjectDO> pageResult = configAssayMethodProjectService.getConfigAssayMethodProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigAssayMethodProjectController implements BusinessControllerMar
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法分析项目配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodProjectExcel(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO, public void exportConfigAssayMethodProjectExcel(@Valid ConfigAssayMethodProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectParameterController.java
View File

@@ -46,14 +46,14 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法分析项目参数配置") @Operation(summary = "创建检测方法分析项目参数配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:create')")
public CommonResult<ConfigAssayMethodProjectParameterRespVO> createConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodProjectParameterRespVO> createConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO createReqVO) {
return success(configAssayMethodProjectParameterService.createConfigAssayMethodProjectParameter(createReqVO)); return success(configAssayMethodProjectParameterService.createConfigAssayMethodProjectParameter(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法分析项目参数配置") @Operation(summary = "更新检测方法分析项目参数配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:update')")
public CommonResult<Boolean> updateConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethodProjectParameter(@Valid @RequestBody ConfigAssayMethodProjectParameterSaveReqVO updateReqVO) {
configAssayMethodProjectParameterService.updateConfigAssayMethodProjectParameter(updateReqVO); configAssayMethodProjectParameterService.updateConfigAssayMethodProjectParameter(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法分析项目参数配置") @Operation(summary = "删除检测方法分析项目参数配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigAssayMethodProjectParameter(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethodProjectParameter(@RequestParam("id") Long id) {
configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameter(id); configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameter(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法分析项目参数配置") @Operation(summary = "批量删除检测方法分析项目参数配置")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodProjectParameterList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodProjectParameterList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameterListByIds(req.getIds()); configAssayMethodProjectParameterService.deleteConfigAssayMethodProjectParameterListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法分析项目参数配置") @Operation(summary = "获得检测方法分析项目参数配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodProjectParameterRespVO> getConfigAssayMethodProjectParameter(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodProjectParameterRespVO> getConfigAssayMethodProjectParameter(@RequestParam("id") Long id) {
ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameter = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameter(id); ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameter = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameter(id);
return success(BeanUtils.toBean(configAssayMethodProjectParameter, ConfigAssayMethodProjectParameterRespVO.class)); return success(BeanUtils.toBean(configAssayMethodProjectParameter, ConfigAssayMethodProjectParameterRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法分析项目参数配置分页") @Operation(summary = "获得检测方法分析项目参数配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-parameter:query')")
public CommonResult<PageResult<ConfigAssayMethodProjectParameterRespVO>> getConfigAssayMethodProjectParameterPage(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodProjectParameterRespVO>> getConfigAssayMethodProjectParameterPage(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO) {
PageResult<ConfigAssayMethodProjectParameterDO> pageResult = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameterPage(pageReqVO); PageResult<ConfigAssayMethodProjectParameterDO> pageResult = configAssayMethodProjectParameterService.getConfigAssayMethodProjectParameterPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectParameterRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectParameterRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigAssayMethodProjectParameterController implements BusinessCont
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法分析项目参数配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodProjectParameterExcel(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO, public void exportConfigAssayMethodProjectParameterExcel(@Valid ConfigAssayMethodProjectParameterPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodProjectRangeController.java
View File

@@ -44,14 +44,14 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测方法分析项目区间") @Operation(summary = "创建检测方法分析项目区间")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:create')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:create')")
public CommonResult<ConfigAssayMethodProjectRangeRespVO> createConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO createReqVO) { public CommonResult<ConfigAssayMethodProjectRangeRespVO> createConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO createReqVO) {
return success(configAssayMethodProjectRangeService.createConfigAssayMethodProjectRange(createReqVO)); return success(configAssayMethodProjectRangeService.createConfigAssayMethodProjectRange(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测方法分析项目区间") @Operation(summary = "更新检测方法分析项目区间")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:update')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:update')")
public CommonResult<Boolean> updateConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigAssayMethodProjectRange(@Valid @RequestBody ConfigAssayMethodProjectRangeSaveReqVO updateReqVO) {
configAssayMethodProjectRangeService.updateConfigAssayMethodProjectRange(updateReqVO); configAssayMethodProjectRangeService.updateConfigAssayMethodProjectRange(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测方法分析项目区间") @Operation(summary = "删除检测方法分析项目区间")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigAssayMethodProjectRange(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigAssayMethodProjectRange(@RequestParam("id") Long id) {
configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRange(id); configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRange(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测方法分析项目区间") @Operation(summary = "批量删除检测方法分析项目区间")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:delete')")
public CommonResult<Boolean> deleteConfigAssayMethodProjectRangeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigAssayMethodProjectRangeList(@RequestBody BatchDeleteReqVO req) {
configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRangeListByIds(req.getIds()); configAssayMethodProjectRangeService.deleteConfigAssayMethodProjectRangeListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测方法分析项目区间") @Operation(summary = "获得检测方法分析项目区间")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigAssayMethodProjectRangeRespVO> getConfigAssayMethodProjectRange(@RequestParam("id") Long id) { public CommonResult<ConfigAssayMethodProjectRangeRespVO> getConfigAssayMethodProjectRange(@RequestParam("id") Long id) {
ConfigAssayMethodProjectRangeDO configAssayMethodProjectRange = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRange(id); ConfigAssayMethodProjectRangeDO configAssayMethodProjectRange = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRange(id);
return success(BeanUtils.toBean(configAssayMethodProjectRange, ConfigAssayMethodProjectRangeRespVO.class)); return success(BeanUtils.toBean(configAssayMethodProjectRange, ConfigAssayMethodProjectRangeRespVO.class));
@@ -86,7 +86,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测方法分析项目区间分页") @Operation(summary = "获得检测方法分析项目区间分页")
@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')") //@PreAuthorize("@ss.hasPermission('qms:config-assay-method-project-range:query')")
public CommonResult<PageResult<ConfigAssayMethodProjectRangeRespVO>> getConfigAssayMethodProjectRangePage(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigAssayMethodProjectRangeRespVO>> getConfigAssayMethodProjectRangePage(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO) {
PageResult<ConfigAssayMethodProjectRangeDO> pageResult = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRangePage(pageReqVO); PageResult<ConfigAssayMethodProjectRangeDO> pageResult = configAssayMethodProjectRangeService.getConfigAssayMethodProjectRangePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRangeRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigAssayMethodProjectRangeRespVO.class));
@@ -94,7 +94,7 @@ public class ConfigAssayMethodProjectRangeController implements BusinessControll
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测方法分析项目区间 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigAssayMethodProjectRangeExcel(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO, public void exportConfigAssayMethodProjectRangeExcel(@Valid ConfigAssayMethodProjectRangePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigBaseSampleController.java
View File

@@ -46,14 +46,14 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建主样配置") @Operation(summary = "创建主样配置")
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:create')")
public CommonResult<ConfigBaseSampleRespVO> createConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO createReqVO) { public CommonResult<ConfigBaseSampleRespVO> createConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO createReqVO) {
return success(configBaseSampleService.createConfigBaseSample(createReqVO)); return success(configBaseSampleService.createConfigBaseSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新主样配置") @Operation(summary = "更新主样配置")
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:update')")
public CommonResult<Boolean> updateConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigBaseSample(@Valid @RequestBody ConfigBaseSampleSaveReqVO updateReqVO) {
configBaseSampleService.updateConfigBaseSample(updateReqVO); configBaseSampleService.updateConfigBaseSample(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除主样配置") @Operation(summary = "删除主样配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')")
public CommonResult<Boolean> deleteConfigBaseSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigBaseSample(@RequestParam("id") Long id) {
configBaseSampleService.deleteConfigBaseSample(id); configBaseSampleService.deleteConfigBaseSample(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除主样配置") @Operation(summary = "批量删除主样配置")
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:delete')")
public CommonResult<Boolean> deleteConfigBaseSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigBaseSampleList(@RequestBody BatchDeleteReqVO req) {
configBaseSampleService.deleteConfigBaseSampleListByIds(req.getIds()); configBaseSampleService.deleteConfigBaseSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得主样配置") @Operation(summary = "获得主样配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigBaseSampleRespVO> getConfigBaseSample(@RequestParam("id") Long id) { public CommonResult<ConfigBaseSampleRespVO> getConfigBaseSample(@RequestParam("id") Long id) {
ConfigBaseSampleDO configBaseSample = configBaseSampleService.getConfigBaseSample(id); ConfigBaseSampleDO configBaseSample = configBaseSampleService.getConfigBaseSample(id);
return success(BeanUtils.toBean(configBaseSample, ConfigBaseSampleRespVO.class)); return success(BeanUtils.toBean(configBaseSample, ConfigBaseSampleRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得主样配置分页") @Operation(summary = "获得主样配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:query')")
public CommonResult<PageResult<ConfigBaseSampleRespVO>> getConfigBaseSamplePage(@Valid ConfigBaseSamplePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigBaseSampleRespVO>> getConfigBaseSamplePage(@Valid ConfigBaseSamplePageReqVO pageReqVO) {
PageResult<ConfigBaseSampleDO> pageResult = configBaseSampleService.getConfigBaseSamplePage(pageReqVO); PageResult<ConfigBaseSampleDO> pageResult = configBaseSampleService.getConfigBaseSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigBaseSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigBaseSampleRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigBaseSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出主样配置 Excel") @Operation(summary = "导出主样配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-base-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:config-base-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigBaseSampleExcel(@Valid ConfigBaseSamplePageReqVO pageReqVO, public void exportConfigBaseSampleExcel(@Valid ConfigBaseSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceController.java
View File

@@ -47,14 +47,14 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检验委托来源配置") @Operation(summary = "创建检验委托来源配置")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:create')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:create')")
public CommonResult<ConfigEntrustSourceRespVO> createConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO createReqVO) { public CommonResult<ConfigEntrustSourceRespVO> createConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO createReqVO) {
return success(configEntrustSourceService.createConfigEntrustSource(createReqVO)); return success(configEntrustSourceService.createConfigEntrustSource(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检验委托来源配置") @Operation(summary = "更新检验委托来源配置")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:update')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:update')")
public CommonResult<Boolean> updateConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigEntrustSource(@Valid @RequestBody ConfigEntrustSourceSaveReqVO updateReqVO) {
configEntrustSourceService.updateConfigEntrustSource(updateReqVO); configEntrustSourceService.updateConfigEntrustSource(updateReqVO);
return success(true); return success(true);
@@ -63,7 +63,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检验委托来源配置") @Operation(summary = "删除检验委托来源配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')")
public CommonResult<Boolean> deleteConfigEntrustSource(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigEntrustSource(@RequestParam("id") Long id) {
configEntrustSourceService.deleteConfigEntrustSource(id); configEntrustSourceService.deleteConfigEntrustSource(id);
return success(true); return success(true);
@@ -72,7 +72,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检验委托来源配置") @Operation(summary = "批量删除检验委托来源配置")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:delete')")
public CommonResult<Boolean> deleteConfigEntrustSourceList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigEntrustSourceList(@RequestBody BatchDeleteReqVO req) {
configEntrustSourceService.deleteConfigEntrustSourceListByIds(req.getIds()); configEntrustSourceService.deleteConfigEntrustSourceListByIds(req.getIds());
return success(true); return success(true);
@@ -81,7 +81,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检验委托来源配置") @Operation(summary = "获得检验委托来源配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigEntrustSourceRespVO> getConfigEntrustSource(@RequestParam("id") Long id) { public CommonResult<ConfigEntrustSourceRespVO> getConfigEntrustSource(@RequestParam("id") Long id) {
ConfigEntrustSourceDO configEntrustSource = configEntrustSourceService.getConfigEntrustSource(id); ConfigEntrustSourceDO configEntrustSource = configEntrustSourceService.getConfigEntrustSource(id);
return success(BeanUtils.toBean(configEntrustSource, ConfigEntrustSourceRespVO.class)); return success(BeanUtils.toBean(configEntrustSource, ConfigEntrustSourceRespVO.class));
@@ -89,7 +89,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检验委托来源配置分页") @Operation(summary = "获得检验委托来源配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')")
public CommonResult<PageResult<ConfigEntrustSourceRespVO>> getConfigEntrustSourcePage(@Valid ConfigEntrustSourcePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigEntrustSourceRespVO>> getConfigEntrustSourcePage(@Valid ConfigEntrustSourcePageReqVO pageReqVO) {
PageResult<ConfigEntrustSourceDO> pageResult = configEntrustSourceService.getConfigEntrustSourcePage(pageReqVO); PageResult<ConfigEntrustSourceDO> pageResult = configEntrustSourceService.getConfigEntrustSourcePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigEntrustSourceRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigEntrustSourceRespVO.class));
@@ -97,7 +97,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得检验委托来源配置分页") @Operation(summary = "获得检验委托来源配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:query')")
public CommonResult<List<ConfigEntrustSourceRespVO>> getConfigEntrustSourceList(@Valid ConfigEntrustSourceReqVO reqVO) { public CommonResult<List<ConfigEntrustSourceRespVO>> getConfigEntrustSourceList(@Valid ConfigEntrustSourceReqVO reqVO) {
List<ConfigEntrustSourceDO> listResult = configEntrustSourceService.getConfigEntrustSourceList(reqVO); List<ConfigEntrustSourceDO> listResult = configEntrustSourceService.getConfigEntrustSourceList(reqVO);
return success(BeanUtils.toBean(listResult, ConfigEntrustSourceRespVO.class)); return success(BeanUtils.toBean(listResult, ConfigEntrustSourceRespVO.class));
@@ -106,7 +106,7 @@ public class ConfigEntrustSourceController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检验委托来源配置 Excel") @Operation(summary = "导出检验委托来源配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:export')") //@PreAuthorize("@ss.hasPermission('qms:config-entrust-source:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigEntrustSourceExcel(@Valid ConfigEntrustSourcePageReqVO pageReqVO, public void exportConfigEntrustSourceExcel(@Valid ConfigEntrustSourcePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigProjectController.java
View File

@@ -46,14 +46,14 @@ public class ConfigProjectController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测项目配置") @Operation(summary = "创建检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-project:create')") //@PreAuthorize("@ss.hasPermission('qms:config-project:create')")
public CommonResult<ConfigProjectRespVO> createConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO createReqVO) { public CommonResult<ConfigProjectRespVO> createConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO createReqVO) {
return success(configProjectService.createConfigProject(createReqVO)); return success(configProjectService.createConfigProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测项目配置") @Operation(summary = "更新检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-project:update')") //@PreAuthorize("@ss.hasPermission('qms:config-project:update')")
public CommonResult<Boolean> updateConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigProject(@Valid @RequestBody ConfigProjectSaveReqVO updateReqVO) {
configProjectService.updateConfigProject(updateReqVO); configProjectService.updateConfigProject(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigProjectController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测项目配置") @Operation(summary = "删除检测项目配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-project:delete')")
public CommonResult<Boolean> deleteConfigProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigProject(@RequestParam("id") Long id) {
configProjectService.deleteConfigProject(id); configProjectService.deleteConfigProject(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigProjectController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测项目配置") @Operation(summary = "批量删除检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-project:delete')")
public CommonResult<Boolean> deleteConfigProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigProjectList(@RequestBody BatchDeleteReqVO req) {
configProjectService.deleteConfigProjectListByIds(req.getIds()); configProjectService.deleteConfigProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigProjectController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测项目配置") @Operation(summary = "获得检测项目配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:config-project:query')") //@PreAuthorize("@ss.hasPermission('qms:config-project:query')")
public CommonResult<ConfigProjectRespVO> getConfigProject(@RequestParam("id") Long id) { public CommonResult<ConfigProjectRespVO> getConfigProject(@RequestParam("id") Long id) {
ConfigProjectDO configProject = configProjectService.getConfigProject(id); ConfigProjectDO configProject = configProjectService.getConfigProject(id);
return success(BeanUtils.toBean(configProject, ConfigProjectRespVO.class)); return success(BeanUtils.toBean(configProject, ConfigProjectRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigProjectController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测项目配置分页") @Operation(summary = "获得检测项目配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-project:query')") //@PreAuthorize("@ss.hasPermission('qms:config-project:query')")
public CommonResult<PageResult<ConfigProjectRespVO>> getConfigProjectPage(@Valid ConfigProjectPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigProjectRespVO>> getConfigProjectPage(@Valid ConfigProjectPageReqVO pageReqVO) {
PageResult<ConfigProjectDO> pageResult = configProjectService.getConfigProjectPage(pageReqVO); PageResult<ConfigProjectDO> pageResult = configProjectService.getConfigProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigProjectRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigProjectController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测项目配置 Excel") @Operation(summary = "导出检测项目配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-project:export')") //@PreAuthorize("@ss.hasPermission('qms:config-project:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigProjectExcel(@Valid ConfigProjectPageReqVO pageReqVO, public void exportConfigProjectExcel(@Valid ConfigProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportFieldController.java
View File

@@ -46,14 +46,14 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建报表字段配置") @Operation(summary = "创建报表字段配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-field:create')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:create')")
public CommonResult<ConfigReportFieldRespVO> createConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO createReqVO) { public CommonResult<ConfigReportFieldRespVO> createConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO createReqVO) {
return success(configReportFieldService.createConfigReportField(createReqVO)); return success(configReportFieldService.createConfigReportField(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新报表字段配置") @Operation(summary = "更新报表字段配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-field:update')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:update')")
public CommonResult<Boolean> updateConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigReportField(@Valid @RequestBody ConfigReportFieldSaveReqVO updateReqVO) {
configReportFieldService.updateConfigReportField(updateReqVO); configReportFieldService.updateConfigReportField(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除报表字段配置") @Operation(summary = "删除报表字段配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')")
public CommonResult<Boolean> deleteConfigReportField(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigReportField(@RequestParam("id") Long id) {
configReportFieldService.deleteConfigReportField(id); configReportFieldService.deleteConfigReportField(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除报表字段配置") @Operation(summary = "批量删除报表字段配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:delete')")
public CommonResult<Boolean> deleteConfigReportFieldList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigReportFieldList(@RequestBody BatchDeleteReqVO req) {
configReportFieldService.deleteConfigReportFieldListByIds(req.getIds()); configReportFieldService.deleteConfigReportFieldListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得报表字段配置") @Operation(summary = "获得报表字段配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigReportFieldRespVO> getConfigReportField(@RequestParam("id") Long id) { public CommonResult<ConfigReportFieldRespVO> getConfigReportField(@RequestParam("id") Long id) {
ConfigReportFieldDO configReportField = configReportFieldService.getConfigReportField(id); ConfigReportFieldDO configReportField = configReportFieldService.getConfigReportField(id);
return success(BeanUtils.toBean(configReportField, ConfigReportFieldRespVO.class)); return success(BeanUtils.toBean(configReportField, ConfigReportFieldRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得报表字段配置分页") @Operation(summary = "获得报表字段配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-report-field:query')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:query')")
public CommonResult<PageResult<ConfigReportFieldRespVO>> getConfigReportFieldPage(@Valid ConfigReportFieldPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigReportFieldRespVO>> getConfigReportFieldPage(@Valid ConfigReportFieldPageReqVO pageReqVO) {
PageResult<ConfigReportFieldDO> pageResult = configReportFieldService.getConfigReportFieldPage(pageReqVO); PageResult<ConfigReportFieldDO> pageResult = configReportFieldService.getConfigReportFieldPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigReportFieldRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigReportFieldRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigReportFieldController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出报表字段配置 Excel") @Operation(summary = "导出报表字段配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-report-field:export')") //@PreAuthorize("@ss.hasPermission('qms:config-report-field:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigReportFieldExcel(@Valid ConfigReportFieldPageReqVO pageReqVO, public void exportConfigReportFieldExcel(@Valid ConfigReportFieldPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java
View File

@@ -109,14 +109,14 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建报表模版配置") @Operation(summary = "创建报表模版配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-template:create')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:create')")
public CommonResult<ConfigReportTemplateRespVO> createConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO createReqVO) { public CommonResult<ConfigReportTemplateRespVO> createConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO createReqVO) {
return success(configReportTemplateService.createConfigReportTemplate(createReqVO)); return success(configReportTemplateService.createConfigReportTemplate(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新报表模版配置") @Operation(summary = "更新报表模版配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-template:update')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:update')")
public CommonResult<Boolean> updateConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigReportTemplate(@Valid @RequestBody ConfigReportTemplateSaveReqVO updateReqVO) {
configReportTemplateService.updateConfigReportTemplate(updateReqVO); configReportTemplateService.updateConfigReportTemplate(updateReqVO);
return success(true); return success(true);
@@ -125,7 +125,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除报表模版配置") @Operation(summary = "删除报表模版配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')")
public CommonResult<Boolean> deleteConfigReportTemplate(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigReportTemplate(@RequestParam("id") Long id) {
configReportTemplateService.deleteConfigReportTemplate(id); configReportTemplateService.deleteConfigReportTemplate(id);
return success(true); return success(true);
@@ -134,7 +134,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除报表模版配置") @Operation(summary = "批量删除报表模版配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:delete')")
public CommonResult<Boolean> deleteConfigReportTemplateList(@RequestParam("ids") List<Long> ids) { public CommonResult<Boolean> deleteConfigReportTemplateList(@RequestParam("ids") List<Long> ids) {
configReportTemplateService.deleteConfigReportTemplateListByIds(ids); configReportTemplateService.deleteConfigReportTemplateListByIds(ids);
return success(true); return success(true);
@@ -143,7 +143,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得报表模版配置") @Operation(summary = "获得报表模版配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigReportTemplateRespVO> getConfigReportTemplate(@RequestParam("id") Long id) { public CommonResult<ConfigReportTemplateRespVO> getConfigReportTemplate(@RequestParam("id") Long id) {
ConfigReportTemplateDO configReportTemplate = configReportTemplateService.getConfigReportTemplate(id); ConfigReportTemplateDO configReportTemplate = configReportTemplateService.getConfigReportTemplate(id);
return success(BeanUtils.toBean(configReportTemplate, ConfigReportTemplateRespVO.class)); return success(BeanUtils.toBean(configReportTemplate, ConfigReportTemplateRespVO.class));
@@ -151,7 +151,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得报表模版配置分页") @Operation(summary = "获得报表模版配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')")
public CommonResult<PageResult<ConfigReportTemplateRespVO>> getConfigReportTemplatePage(@Valid ConfigReportTemplatePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigReportTemplateRespVO>> getConfigReportTemplatePage(@Valid ConfigReportTemplatePageReqVO pageReqVO) {
PageResult<ConfigReportTemplateDO> pageResult = configReportTemplateService.getConfigReportTemplatePage(pageReqVO); PageResult<ConfigReportTemplateDO> pageResult = configReportTemplateService.getConfigReportTemplatePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigReportTemplateRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigReportTemplateRespVO.class));
@@ -159,7 +159,7 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出报表模版配置 Excel") @Operation(summary = "导出报表模版配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-report-template:export')") //@PreAuthorize("@ss.hasPermission('qms:config-report-template:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigReportTemplateExcel(@Valid ConfigReportTemplatePageReqVO pageReqVO, public void exportConfigReportTemplateExcel(@Valid ConfigReportTemplatePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTypeController.java
View File

@@ -46,14 +46,14 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建报表类型配置") @Operation(summary = "创建报表类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-type:create')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:create')")
public CommonResult<ConfigReportTypeRespVO> createConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO createReqVO) { public CommonResult<ConfigReportTypeRespVO> createConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO createReqVO) {
return success(configReportTypeService.createConfigReportType(createReqVO)); return success(configReportTypeService.createConfigReportType(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新报表类型配置") @Operation(summary = "更新报表类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-type:update')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:update')")
public CommonResult<Boolean> updateConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigReportType(@Valid @RequestBody ConfigReportTypeSaveReqVO updateReqVO) {
configReportTypeService.updateConfigReportType(updateReqVO); configReportTypeService.updateConfigReportType(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除报表类型配置") @Operation(summary = "删除报表类型配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')")
public CommonResult<Boolean> deleteConfigReportType(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigReportType(@RequestParam("id") Long id) {
configReportTypeService.deleteConfigReportType(id); configReportTypeService.deleteConfigReportType(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除报表类型配置") @Operation(summary = "批量删除报表类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:delete')")
public CommonResult<Boolean> deleteConfigReportTypeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigReportTypeList(@RequestBody BatchDeleteReqVO req) {
configReportTypeService.deleteConfigReportTypeListByIds(req.getIds()); configReportTypeService.deleteConfigReportTypeListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得报表类型配置") @Operation(summary = "获得报表类型配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigReportTypeRespVO> getConfigReportType(@RequestParam("id") Long id) { public CommonResult<ConfigReportTypeRespVO> getConfigReportType(@RequestParam("id") Long id) {
ConfigReportTypeDO configReportType = configReportTypeService.getConfigReportType(id); ConfigReportTypeDO configReportType = configReportTypeService.getConfigReportType(id);
return success(BeanUtils.toBean(configReportType, ConfigReportTypeRespVO.class)); return success(BeanUtils.toBean(configReportType, ConfigReportTypeRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得报表类型配置分页") @Operation(summary = "获得报表类型配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-report-type:query')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:query')")
public CommonResult<PageResult<ConfigReportTypeRespVO>> getConfigReportTypePage(@Valid ConfigReportTypePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigReportTypeRespVO>> getConfigReportTypePage(@Valid ConfigReportTypePageReqVO pageReqVO) {
PageResult<ConfigReportTypeDO> pageResult = configReportTypeService.getConfigReportTypePage(pageReqVO); PageResult<ConfigReportTypeDO> pageResult = configReportTypeService.getConfigReportTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigReportTypeRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigReportTypeRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigReportTypeController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出报表类型配置 Excel") @Operation(summary = "导出报表类型配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-report-type:export')") //@PreAuthorize("@ss.hasPermission('qms:config-report-type:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigReportTypeExcel(@Valid ConfigReportTypePageReqVO pageReqVO, public void exportConfigReportTypeExcel(@Valid ConfigReportTypePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigRuleController.java
View File

@@ -42,14 +42,14 @@ public class ConfigRuleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建规则配置") @Operation(summary = "创建规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-rule:create')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:create')")
public CommonResult<ConfigRuleRespVO> createConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO createReqVO) { public CommonResult<ConfigRuleRespVO> createConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO createReqVO) {
return success(configRuleService.createConfigRule(createReqVO)); return success(configRuleService.createConfigRule(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新规则配置") @Operation(summary = "更新规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-rule:update')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:update')")
public CommonResult<Boolean> updateConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigRule(@Valid @RequestBody ConfigRuleSaveReqVO updateReqVO) {
configRuleService.updateConfigRule(updateReqVO); configRuleService.updateConfigRule(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class ConfigRuleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除规则配置") @Operation(summary = "删除规则配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')")
public CommonResult<Boolean> deleteConfigRule(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigRule(@RequestParam("id") Long id) {
configRuleService.deleteConfigRule(id); configRuleService.deleteConfigRule(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class ConfigRuleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除规则配置") @Operation(summary = "批量删除规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:delete')")
public CommonResult<Boolean> deleteConfigRuleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigRuleList(@RequestBody BatchDeleteReqVO req) {
configRuleService.deleteConfigRuleListByIds(req.getIds()); configRuleService.deleteConfigRuleListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class ConfigRuleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得规则配置") @Operation(summary = "获得规则配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:config-rule:query')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:query')")
public CommonResult<ConfigRuleRespVO> getConfigRule(@RequestParam("id") Long id) { public CommonResult<ConfigRuleRespVO> getConfigRule(@RequestParam("id") Long id) {
ConfigRuleDO configRule = configRuleService.getConfigRule(id); ConfigRuleDO configRule = configRuleService.getConfigRule(id);
return success(BeanUtils.toBean(configRule, ConfigRuleRespVO.class)); return success(BeanUtils.toBean(configRule, ConfigRuleRespVO.class));
@@ -84,7 +84,7 @@ public class ConfigRuleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得规则配置分页") @Operation(summary = "获得规则配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-rule:query')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:query')")
public CommonResult<PageResult<ConfigRuleRespVO>> getConfigRulePage(@Valid ConfigRulePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigRuleRespVO>> getConfigRulePage(@Valid ConfigRulePageReqVO pageReqVO) {
PageResult<ConfigRuleDO> pageResult = configRuleService.getConfigRulePage(pageReqVO); PageResult<ConfigRuleDO> pageResult = configRuleService.getConfigRulePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigRuleRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigRuleRespVO.class));
@@ -92,7 +92,7 @@ public class ConfigRuleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出规则配置 Excel") @Operation(summary = "导出规则配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-rule:export')") //@PreAuthorize("@ss.hasPermission('qms:config-rule:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigRuleExcel(@Valid ConfigRulePageReqVO pageReqVO, public void exportConfigRuleExcel(@Valid ConfigRulePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleFlowController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品流程配置") @Operation(summary = "创建样品流程配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:create')")
public CommonResult<ConfigSampleFlowRespVO> createConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO createReqVO) { public CommonResult<ConfigSampleFlowRespVO> createConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO createReqVO) {
return success(configSampleFlowService.createConfigSampleFlow(createReqVO)); return success(configSampleFlowService.createConfigSampleFlow(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品流程配置") @Operation(summary = "更新样品流程配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:update')")
public CommonResult<Boolean> updateConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSampleFlow(@Valid @RequestBody ConfigSampleFlowSaveReqVO updateReqVO) {
configSampleFlowService.updateConfigSampleFlow(updateReqVO); configSampleFlowService.updateConfigSampleFlow(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品流程配置") @Operation(summary = "删除样品流程配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')")
public CommonResult<Boolean> deleteConfigSampleFlow(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSampleFlow(@RequestParam("id") Long id) {
configSampleFlowService.deleteConfigSampleFlow(id); configSampleFlowService.deleteConfigSampleFlow(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品流程配置") @Operation(summary = "批量删除样品流程配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:delete')")
public CommonResult<Boolean> deleteConfigSampleFlowList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSampleFlowList(@RequestBody BatchDeleteReqVO req) {
configSampleFlowService.deleteConfigSampleFlowListByIds(req.getIds()); configSampleFlowService.deleteConfigSampleFlowListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品流程配置") @Operation(summary = "获得样品流程配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSampleFlowRespVO> getConfigSampleFlow(@RequestParam("id") Long id) { public CommonResult<ConfigSampleFlowRespVO> getConfigSampleFlow(@RequestParam("id") Long id) {
ConfigSampleFlowDO configSampleFlow = configSampleFlowService.getConfigSampleFlow(id); ConfigSampleFlowDO configSampleFlow = configSampleFlowService.getConfigSampleFlow(id);
return success(BeanUtils.toBean(configSampleFlow, ConfigSampleFlowRespVO.class)); return success(BeanUtils.toBean(configSampleFlow, ConfigSampleFlowRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品流程配置分页") @Operation(summary = "获得样品流程配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:query')")
public CommonResult<PageResult<ConfigSampleFlowRespVO>> getConfigSampleFlowPage(@Valid ConfigSampleFlowPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSampleFlowRespVO>> getConfigSampleFlowPage(@Valid ConfigSampleFlowPageReqVO pageReqVO) {
PageResult<ConfigSampleFlowDO> pageResult = configSampleFlowService.getConfigSampleFlowPage(pageReqVO); PageResult<ConfigSampleFlowDO> pageResult = configSampleFlowService.getConfigSampleFlowPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSampleFlowRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSampleFlowRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigSampleFlowController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品流程配置 Excel") @Operation(summary = "导出样品流程配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:export')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-flow:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSampleFlowExcel(@Valid ConfigSampleFlowPageReqVO pageReqVO, public void exportConfigSampleFlowExcel(@Valid ConfigSampleFlowPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleHandoverController.java
View File

@@ -44,14 +44,14 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品交接配置") @Operation(summary = "创建样品交接配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:create')")
public CommonResult<ConfigSampleHandoverRespVO> createConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO createReqVO) { public CommonResult<ConfigSampleHandoverRespVO> createConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO createReqVO) {
return success(configSampleHandoverService.createConfigSampleHandover(createReqVO)); return success(configSampleHandoverService.createConfigSampleHandover(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品交接配置") @Operation(summary = "更新样品交接配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:update')")
public CommonResult<Boolean> updateConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSampleHandover(@Valid @RequestBody ConfigSampleHandoverSaveReqVO updateReqVO) {
configSampleHandoverService.updateConfigSampleHandover(updateReqVO); configSampleHandoverService.updateConfigSampleHandover(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品交接配置") @Operation(summary = "删除样品交接配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')")
public CommonResult<Boolean> deleteConfigSampleHandover(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSampleHandover(@RequestParam("id") Long id) {
configSampleHandoverService.deleteConfigSampleHandover(id); configSampleHandoverService.deleteConfigSampleHandover(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品交接配置") @Operation(summary = "批量删除样品交接配置")
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:delete')")
public CommonResult<Boolean> deleteConfigSampleHandoverList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSampleHandoverList(@RequestBody BatchDeleteReqVO req) {
configSampleHandoverService.deleteConfigSampleHandoverListByIds(req.getIds()); configSampleHandoverService.deleteConfigSampleHandoverListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品交接配置") @Operation(summary = "获得样品交接配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSampleHandoverRespVO> getConfigSampleHandover(@RequestParam("id") Long id) { public CommonResult<ConfigSampleHandoverRespVO> getConfigSampleHandover(@RequestParam("id") Long id) {
ConfigSampleHandoverDO configSampleHandover = configSampleHandoverService.getConfigSampleHandover(id); ConfigSampleHandoverDO configSampleHandover = configSampleHandoverService.getConfigSampleHandover(id);
return success(BeanUtils.toBean(configSampleHandover, ConfigSampleHandoverRespVO.class)); return success(BeanUtils.toBean(configSampleHandover, ConfigSampleHandoverRespVO.class));
@@ -86,7 +86,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品交接配置分页") @Operation(summary = "获得样品交接配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:query')")
public CommonResult<PageResult<ConfigSampleHandoverRespVO>> getConfigSampleHandoverPage(@Valid ConfigSampleHandoverPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSampleHandoverRespVO>> getConfigSampleHandoverPage(@Valid ConfigSampleHandoverPageReqVO pageReqVO) {
PageResult<ConfigSampleHandoverDO> pageResult = configSampleHandoverService.getConfigSampleHandoverPage(pageReqVO); PageResult<ConfigSampleHandoverDO> pageResult = configSampleHandoverService.getConfigSampleHandoverPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSampleHandoverRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSampleHandoverRespVO.class));
@@ -94,7 +94,7 @@ public class ConfigSampleHandoverController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品交接配置 Excel") @Operation(summary = "导出样品交接配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:export')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-handover:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSampleHandoverExcel(@Valid ConfigSampleHandoverPageReqVO pageReqVO, public void exportConfigSampleHandoverExcel(@Valid ConfigSampleHandoverPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSampleReportController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品报表关系") @Operation(summary = "创建样品报表关系")
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:create')")
public CommonResult<ConfigSampleReportRespVO> createConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO createReqVO) { public CommonResult<ConfigSampleReportRespVO> createConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO createReqVO) {
return success(configSampleReportService.createConfigSampleReport(createReqVO)); return success(configSampleReportService.createConfigSampleReport(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品报表关系") @Operation(summary = "更新样品报表关系")
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:update')")
public CommonResult<Boolean> updateConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSampleReport(@Valid @RequestBody ConfigSampleReportSaveReqVO updateReqVO) {
configSampleReportService.updateConfigSampleReport(updateReqVO); configSampleReportService.updateConfigSampleReport(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品报表关系") @Operation(summary = "删除样品报表关系")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')")
public CommonResult<Boolean> deleteConfigSampleReport(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSampleReport(@RequestParam("id") Long id) {
configSampleReportService.deleteConfigSampleReport(id); configSampleReportService.deleteConfigSampleReport(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品报表关系") @Operation(summary = "批量删除样品报表关系")
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:delete')")
public CommonResult<Boolean> deleteConfigSampleReportList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSampleReportList(@RequestBody BatchDeleteReqVO req) {
configSampleReportService.deleteConfigSampleReportListByIds(req.getIds()); configSampleReportService.deleteConfigSampleReportListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品报表关系") @Operation(summary = "获得样品报表关系")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSampleReportRespVO> getConfigSampleReport(@RequestParam("id") Long id) { public CommonResult<ConfigSampleReportRespVO> getConfigSampleReport(@RequestParam("id") Long id) {
ConfigSampleReportDO configSampleReport = configSampleReportService.getConfigSampleReport(id); ConfigSampleReportDO configSampleReport = configSampleReportService.getConfigSampleReport(id);
return success(BeanUtils.toBean(configSampleReport, ConfigSampleReportRespVO.class)); return success(BeanUtils.toBean(configSampleReport, ConfigSampleReportRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品报表关系分页") @Operation(summary = "获得样品报表关系分页")
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:query')")
public CommonResult<PageResult<ConfigSampleReportRespVO>> getConfigSampleReportPage(@Valid ConfigSampleReportPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSampleReportRespVO>> getConfigSampleReportPage(@Valid ConfigSampleReportPageReqVO pageReqVO) {
PageResult<ConfigSampleReportDO> pageResult = configSampleReportService.getConfigSampleReportPage(pageReqVO); PageResult<ConfigSampleReportDO> pageResult = configSampleReportService.getConfigSampleReportPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSampleReportRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSampleReportRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigSampleReportController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品报表关系 Excel") @Operation(summary = "导出样品报表关系 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-sample-report:export')") //@PreAuthorize("@ss.hasPermission('qms:config-sample-report:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSampleReportExcel(@Valid ConfigSampleReportPageReqVO pageReqVO, public void exportConfigSampleReportExcel(@Valid ConfigSampleReportPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowCodeController.java
View File

@@ -43,14 +43,14 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建LiteFlow脚本配置") @Operation(summary = "创建LiteFlow脚本配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:create')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:create')")
public CommonResult<ConfigSimpleFlowCodeRespVO> createConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO createReqVO) { public CommonResult<ConfigSimpleFlowCodeRespVO> createConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO createReqVO) {
return success(configSimpleFlowCodeService.createConfigSimpleFlowCode(createReqVO)); return success(configSimpleFlowCodeService.createConfigSimpleFlowCode(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新LiteFlow脚本配置") @Operation(summary = "更新LiteFlow脚本配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:update')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:update')")
public CommonResult<Boolean> updateConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSimpleFlowCode(@Valid @RequestBody ConfigSimpleFlowCodeSaveReqVO updateReqVO) {
configSimpleFlowCodeService.updateConfigSimpleFlowCode(updateReqVO); configSimpleFlowCodeService.updateConfigSimpleFlowCode(updateReqVO);
return success(true); return success(true);
@@ -59,7 +59,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除LiteFlow脚本配置") @Operation(summary = "删除LiteFlow脚本配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigSimpleFlowCode(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSimpleFlowCode(@RequestParam("id") Long id) {
configSimpleFlowCodeService.deleteConfigSimpleFlowCode(id); configSimpleFlowCodeService.deleteConfigSimpleFlowCode(id);
return success(true); return success(true);
@@ -68,7 +68,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除LiteFlow脚本配置") @Operation(summary = "批量删除LiteFlow脚本配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:delete')")
public CommonResult<Boolean> deleteConfigSimpleFlowCodeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSimpleFlowCodeList(@RequestBody BatchDeleteReqVO req) {
configSimpleFlowCodeService.deleteConfigSimpleFlowCodeListByIds(req.getIds()); configSimpleFlowCodeService.deleteConfigSimpleFlowCodeListByIds(req.getIds());
return success(true); return success(true);
@@ -77,7 +77,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得LiteFlow脚本配置") @Operation(summary = "获得LiteFlow脚本配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSimpleFlowCodeRespVO> getConfigSimpleFlowCode(@RequestParam("id") Long id) { public CommonResult<ConfigSimpleFlowCodeRespVO> getConfigSimpleFlowCode(@RequestParam("id") Long id) {
ConfigSimpleFlowCodeDO configSimpleFlowCode = configSimpleFlowCodeService.getConfigSimpleFlowCode(id); ConfigSimpleFlowCodeDO configSimpleFlowCode = configSimpleFlowCodeService.getConfigSimpleFlowCode(id);
return success(BeanUtils.toBean(configSimpleFlowCode, ConfigSimpleFlowCodeRespVO.class)); return success(BeanUtils.toBean(configSimpleFlowCode, ConfigSimpleFlowCodeRespVO.class));
@@ -85,7 +85,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得LiteFlow脚本配置分页") @Operation(summary = "获得LiteFlow脚本配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-code:query')")
public CommonResult<PageResult<ConfigSimpleFlowCodeRespVO>> getConfigSimpleFlowCodePage(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSimpleFlowCodeRespVO>> getConfigSimpleFlowCodePage(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO) {
PageResult<ConfigSimpleFlowCodeDO> pageResult = configSimpleFlowCodeService.getConfigSimpleFlowCodePage(pageReqVO); PageResult<ConfigSimpleFlowCodeDO> pageResult = configSimpleFlowCodeService.getConfigSimpleFlowCodePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowCodeRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowCodeRespVO.class));
@@ -93,7 +93,7 @@ public class ConfigSimpleFlowCodeController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出LiteFlow脚本配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSimpleFlowCodeExcel(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO, public void exportConfigSimpleFlowCodeExcel(@Valid ConfigSimpleFlowCodePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSimpleFlowRuleController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建LiteFlow规则配置") @Operation(summary = "创建LiteFlow规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:create')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:create')")
public CommonResult<ConfigSimpleFlowRuleRespVO> createConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO createReqVO) { public CommonResult<ConfigSimpleFlowRuleRespVO> createConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO createReqVO) {
return success(configSimpleFlowRuleService.createConfigSimpleFlowRule(createReqVO)); return success(configSimpleFlowRuleService.createConfigSimpleFlowRule(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新LiteFlow规则配置") @Operation(summary = "更新LiteFlow规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:update')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:update')")
public CommonResult<Boolean> updateConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSimpleFlowRule(@Valid @RequestBody ConfigSimpleFlowRuleSaveReqVO updateReqVO) {
configSimpleFlowRuleService.updateConfigSimpleFlowRule(updateReqVO); configSimpleFlowRuleService.updateConfigSimpleFlowRule(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除LiteFlow规则配置") @Operation(summary = "删除LiteFlow规则配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigSimpleFlowRule(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSimpleFlowRule(@RequestParam("id") Long id) {
configSimpleFlowRuleService.deleteConfigSimpleFlowRule(id); configSimpleFlowRuleService.deleteConfigSimpleFlowRule(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除LiteFlow规则配置") @Operation(summary = "批量删除LiteFlow规则配置")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:delete')")
public CommonResult<Boolean> deleteConfigSimpleFlowRuleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSimpleFlowRuleList(@RequestBody BatchDeleteReqVO req) {
configSimpleFlowRuleService.deleteConfigSimpleFlowRuleListByIds(req.getIds()); configSimpleFlowRuleService.deleteConfigSimpleFlowRuleListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得LiteFlow规则配置") @Operation(summary = "获得LiteFlow规则配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSimpleFlowRuleRespVO> getConfigSimpleFlowRule(@RequestParam("id") Long id) { public CommonResult<ConfigSimpleFlowRuleRespVO> getConfigSimpleFlowRule(@RequestParam("id") Long id) {
ConfigSimpleFlowRuleDO configSimpleFlowRule = configSimpleFlowRuleService.getConfigSimpleFlowRule(id); ConfigSimpleFlowRuleDO configSimpleFlowRule = configSimpleFlowRuleService.getConfigSimpleFlowRule(id);
return success(BeanUtils.toBean(configSimpleFlowRule, ConfigSimpleFlowRuleRespVO.class)); return success(BeanUtils.toBean(configSimpleFlowRule, ConfigSimpleFlowRuleRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得LiteFlow规则配置分页") @Operation(summary = "获得LiteFlow规则配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')") //@PreAuthorize("@ss.hasPermission('qms:config-simple-flow-rule:query')")
public CommonResult<PageResult<ConfigSimpleFlowRuleRespVO>> getConfigSimpleFlowRulePage(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSimpleFlowRuleRespVO>> getConfigSimpleFlowRulePage(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO) {
PageResult<ConfigSimpleFlowRuleDO> pageResult = configSimpleFlowRuleService.getConfigSimpleFlowRulePage(pageReqVO); PageResult<ConfigSimpleFlowRuleDO> pageResult = configSimpleFlowRuleService.getConfigSimpleFlowRulePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowRuleRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSimpleFlowRuleRespVO.class));
@@ -108,7 +108,7 @@ public class ConfigSimpleFlowRuleController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出LiteFlow规则配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSimpleFlowRuleExcel(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO, public void exportConfigSimpleFlowRuleExcel(@Valid ConfigSimpleFlowRulePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleProjectController.java
View File

@@ -46,14 +46,14 @@ public class ConfigStandardSampleProjectController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建标准样检测项目配置") @Operation(summary = "创建标准样检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:create')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:create')")
public CommonResult<ConfigStandardSampleProjectRespVO> createConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO createReqVO) { public CommonResult<ConfigStandardSampleProjectRespVO> createConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO createReqVO) {
return success(configStandardSampleProjectService.createConfigStandardSampleProject(createReqVO)); return success(configStandardSampleProjectService.createConfigStandardSampleProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新标准样检测项目配置") @Operation(summary = "更新标准样检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:update')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:update')")
public CommonResult<Boolean> updateConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigStandardSampleProject(@Valid @RequestBody ConfigStandardSampleProjectSaveReqVO updateReqVO) {
configStandardSampleProjectService.updateConfigStandardSampleProject(updateReqVO); configStandardSampleProjectService.updateConfigStandardSampleProject(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigStandardSampleProjectController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除标准样检测项目配置") @Operation(summary = "删除标准样检测项目配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigStandardSampleProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigStandardSampleProject(@RequestParam("id") Long id) {
configStandardSampleProjectService.deleteConfigStandardSampleProject(id); configStandardSampleProjectService.deleteConfigStandardSampleProject(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigStandardSampleProjectController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样检测项目配置") @Operation(summary = "批量删除标准样检测项目配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:delete')")
public CommonResult<Boolean> deleteConfigStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) {
configStandardSampleProjectService.deleteConfigStandardSampleProjectListByIds(req.getIds()); configStandardSampleProjectService.deleteConfigStandardSampleProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigStandardSampleProjectController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得标准样检测项目配置") @Operation(summary = "获得标准样检测项目配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigStandardSampleProjectRespVO> getConfigStandardSampleProject(@RequestParam("id") Long id) { public CommonResult<ConfigStandardSampleProjectRespVO> getConfigStandardSampleProject(@RequestParam("id") Long id) {
ConfigStandardSampleProjectDO configStandardSampleProject = configStandardSampleProjectService.getConfigStandardSampleProject(id); ConfigStandardSampleProjectDO configStandardSampleProject = configStandardSampleProjectService.getConfigStandardSampleProject(id);
return success(BeanUtils.toBean(configStandardSampleProject, ConfigStandardSampleProjectRespVO.class)); return success(BeanUtils.toBean(configStandardSampleProject, ConfigStandardSampleProjectRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigStandardSampleProjectController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得标准样检测项目配置分页") @Operation(summary = "获得标准样检测项目配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-project:query')")
public CommonResult<PageResult<ConfigStandardSampleProjectRespVO>> getConfigStandardSampleProjectPage(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigStandardSampleProjectRespVO>> getConfigStandardSampleProjectPage(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO) {
PageResult<ConfigStandardSampleProjectDO> pageResult = configStandardSampleProjectService.getConfigStandardSampleProjectPage(pageReqVO); PageResult<ConfigStandardSampleProjectDO> pageResult = configStandardSampleProjectService.getConfigStandardSampleProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigStandardSampleProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigStandardSampleProjectRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigStandardSampleProjectController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出标准样检测项目配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigStandardSampleProjectExcel(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO, public void exportConfigStandardSampleProjectExcel(@Valid ConfigStandardSampleProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigStandardSampleTypeController.java
View File

@@ -46,14 +46,14 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建标准样类型配置") @Operation(summary = "创建标准样类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:create')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:create')")
public CommonResult<ConfigStandardSampleTypeRespVO> createConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO createReqVO) { public CommonResult<ConfigStandardSampleTypeRespVO> createConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO createReqVO) {
return success(configStandardSampleTypeService.createConfigStandardSampleType(createReqVO)); return success(configStandardSampleTypeService.createConfigStandardSampleType(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新标准样类型配置") @Operation(summary = "更新标准样类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:update')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:update')")
public CommonResult<Boolean> updateConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigStandardSampleType(@Valid @RequestBody ConfigStandardSampleTypeSaveReqVO updateReqVO) {
configStandardSampleTypeService.updateConfigStandardSampleType(updateReqVO); configStandardSampleTypeService.updateConfigStandardSampleType(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除标准样类型配置") @Operation(summary = "删除标准样类型配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigStandardSampleType(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigStandardSampleType(@RequestParam("id") Long id) {
configStandardSampleTypeService.deleteConfigStandardSampleType(id); configStandardSampleTypeService.deleteConfigStandardSampleType(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样类型配置") @Operation(summary = "批量删除标准样类型配置")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:delete')")
public CommonResult<Boolean> deleteConfigStandardSampleTypeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigStandardSampleTypeList(@RequestBody BatchDeleteReqVO req) {
configStandardSampleTypeService.deleteConfigStandardSampleTypeListByIds(req.getIds()); configStandardSampleTypeService.deleteConfigStandardSampleTypeListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得标准样类型配置") @Operation(summary = "获得标准样类型配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigStandardSampleTypeRespVO> getConfigStandardSampleType(@RequestParam("id") Long id) { public CommonResult<ConfigStandardSampleTypeRespVO> getConfigStandardSampleType(@RequestParam("id") Long id) {
ConfigStandardSampleTypeDO configStandardSampleType = configStandardSampleTypeService.getConfigStandardSampleType(id); ConfigStandardSampleTypeDO configStandardSampleType = configStandardSampleTypeService.getConfigStandardSampleType(id);
return success(BeanUtils.toBean(configStandardSampleType, ConfigStandardSampleTypeRespVO.class)); return success(BeanUtils.toBean(configStandardSampleType, ConfigStandardSampleTypeRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得标准样类型配置分页") @Operation(summary = "获得标准样类型配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')") //@PreAuthorize("@ss.hasPermission('qms:config-standard-sample-type:query')")
public CommonResult<PageResult<ConfigStandardSampleTypeRespVO>> getConfigStandardSampleTypePage(@Valid ConfigStandardSampleTypePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigStandardSampleTypeRespVO>> getConfigStandardSampleTypePage(@Valid ConfigStandardSampleTypePageReqVO pageReqVO) {
PageResult<ConfigStandardSampleTypeDO> pageResult = configStandardSampleTypeService.getConfigStandardSampleTypePage(pageReqVO); PageResult<ConfigStandardSampleTypeDO> pageResult = configStandardSampleTypeService.getConfigStandardSampleTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigStandardSampleTypeRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigStandardSampleTypeRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigStandardSampleTypeController implements BusinessControllerMar
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出标准样类型配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigStandardSampleTypeExcel(@Valid ConfigStandardSampleTypePageReqVO pageReqVO, public void exportConfigStandardSampleTypeExcel(@Valid ConfigStandardSampleTypePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样配置") @Operation(summary = "创建子样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:create')")
public CommonResult<ConfigSubSampleRespVO> createConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO createReqVO) { public CommonResult<ConfigSubSampleRespVO> createConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO createReqVO) {
return success(configSubSampleService.createConfigSubSample(createReqVO)); return success(configSubSampleService.createConfigSubSample(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样配置") @Operation(summary = "更新子样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:update')")
public CommonResult<Boolean> updateConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSubSample(@Valid @RequestBody ConfigSubSampleSaveReqVO updateReqVO) {
configSubSampleService.updateConfigSubSample(updateReqVO); configSubSampleService.updateConfigSubSample(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样配置") @Operation(summary = "删除子样配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')")
public CommonResult<Boolean> deleteConfigSubSample(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSubSample(@RequestParam("id") Long id) {
configSubSampleService.deleteConfigSubSample(id); configSubSampleService.deleteConfigSubSample(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样配置") @Operation(summary = "批量删除子样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:delete')")
public CommonResult<Boolean> deleteConfigSubSampleList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSubSampleList(@RequestBody BatchDeleteReqVO req) {
configSubSampleService.deleteConfigSubSampleListByIds(req.getIds()); configSubSampleService.deleteConfigSubSampleListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样配置") @Operation(summary = "获得子样配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSubSampleRespVO> getConfigSubSample(@RequestParam("id") Long id) { public CommonResult<ConfigSubSampleRespVO> getConfigSubSample(@RequestParam("id") Long id) {
ConfigSubSampleDO configSubSample = configSubSampleService.getConfigSubSample(id); ConfigSubSampleDO configSubSample = configSubSampleService.getConfigSubSample(id);
return success(BeanUtils.toBean(configSubSample, ConfigSubSampleRespVO.class)); return success(BeanUtils.toBean(configSubSample, ConfigSubSampleRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样配置分页") @Operation(summary = "获得子样配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:query')")
public CommonResult<PageResult<ConfigSubSampleRespVO>> getConfigSubSamplePage(@Valid ConfigSubSamplePageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSubSampleRespVO>> getConfigSubSamplePage(@Valid ConfigSubSamplePageReqVO pageReqVO) {
PageResult<ConfigSubSampleDO> pageResult = configSubSampleService.getConfigSubSamplePage(pageReqVO); PageResult<ConfigSubSampleDO> pageResult = configSubSampleService.getConfigSubSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSubSampleRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSubSampleRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigSubSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样配置 Excel") @Operation(summary = "导出子样配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:export')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSubSampleExcel(@Valid ConfigSubSamplePageReqVO pageReqVO, public void exportConfigSubSampleExcel(@Valid ConfigSubSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleMethodController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建子样与检测方法配置") @Operation(summary = "创建子样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:create')")
public CommonResult<ConfigSubSampleMethodRespVO> createConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO createReqVO) { public CommonResult<ConfigSubSampleMethodRespVO> createConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO createReqVO) {
return success(configSubSampleMethodService.createConfigSubSampleMethod(createReqVO)); return success(configSubSampleMethodService.createConfigSubSampleMethod(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新子样与检测方法配置") @Operation(summary = "更新子样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:update')")
public CommonResult<Boolean> updateConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSubSampleMethod(@Valid @RequestBody ConfigSubSampleMethodSaveReqVO updateReqVO) {
configSubSampleMethodService.updateConfigSubSampleMethod(updateReqVO); configSubSampleMethodService.updateConfigSubSampleMethod(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除子样与检测方法配置") @Operation(summary = "删除子样与检测方法配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigSubSampleMethod(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSubSampleMethod(@RequestParam("id") Long id) {
configSubSampleMethodService.deleteConfigSubSampleMethod(id); configSubSampleMethodService.deleteConfigSubSampleMethod(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样与检测方法配置") @Operation(summary = "批量删除子样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:delete')")
public CommonResult<Boolean> deleteConfigSubSampleMethodList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSubSampleMethodList(@RequestBody BatchDeleteReqVO req) {
configSubSampleMethodService.deleteConfigSubSampleMethodListByIds(req.getIds()); configSubSampleMethodService.deleteConfigSubSampleMethodListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得子样与检测方法配置") @Operation(summary = "获得子样与检测方法配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSubSampleMethodRespVO> getConfigSubSampleMethod(@RequestParam("id") Long id) { public CommonResult<ConfigSubSampleMethodRespVO> getConfigSubSampleMethod(@RequestParam("id") Long id) {
ConfigSubSampleMethodDO configSubSampleMethod = configSubSampleMethodService.getConfigSubSampleMethod(id); ConfigSubSampleMethodDO configSubSampleMethod = configSubSampleMethodService.getConfigSubSampleMethod(id);
return success(BeanUtils.toBean(configSubSampleMethod, ConfigSubSampleMethodRespVO.class)); return success(BeanUtils.toBean(configSubSampleMethod, ConfigSubSampleMethodRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得子样与检测方法配置分页") @Operation(summary = "获得子样与检测方法配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-method:query')")
public CommonResult<PageResult<ConfigSubSampleMethodRespVO>> getConfigSubSampleMethodPage(@Valid ConfigSubSampleMethodPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSubSampleMethodRespVO>> getConfigSubSampleMethodPage(@Valid ConfigSubSampleMethodPageReqVO pageReqVO) {
PageResult<ConfigSubSampleMethodDO> pageResult = configSubSampleMethodService.getConfigSubSampleMethodPage(pageReqVO); PageResult<ConfigSubSampleMethodDO> pageResult = configSubSampleMethodService.getConfigSubSampleMethodPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSubSampleMethodRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSubSampleMethodRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigSubSampleMethodController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出子样与检测方法配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSubSampleMethodExcel(@Valid ConfigSubSampleMethodPageReqVO pageReqVO, public void exportConfigSubSampleMethodExcel(@Valid ConfigSubSampleMethodPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentController.java
View File

@@ -46,14 +46,14 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建分样配置") @Operation(summary = "创建分样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:create')")
public CommonResult<ConfigSubSampleParentRespVO> createConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO createReqVO) { public CommonResult<ConfigSubSampleParentRespVO> createConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO createReqVO) {
return success(configSubSampleParentService.createConfigSubSampleParent(createReqVO)); return success(configSubSampleParentService.createConfigSubSampleParent(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新分样配置") @Operation(summary = "更新分样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:update')")
public CommonResult<Boolean> updateConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSubSampleParent(@Valid @RequestBody ConfigSubSampleParentSaveReqVO updateReqVO) {
configSubSampleParentService.updateConfigSubSampleParent(updateReqVO); configSubSampleParentService.updateConfigSubSampleParent(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除分样配置") @Operation(summary = "删除分样配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigSubSampleParent(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSubSampleParent(@RequestParam("id") Long id) {
configSubSampleParentService.deleteConfigSubSampleParent(id); configSubSampleParentService.deleteConfigSubSampleParent(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除分样配置") @Operation(summary = "批量删除分样配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:delete')")
public CommonResult<Boolean> deleteConfigSubSampleParentList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSubSampleParentList(@RequestBody BatchDeleteReqVO req) {
configSubSampleParentService.deleteConfigSubSampleParentListByIds(req.getIds()); configSubSampleParentService.deleteConfigSubSampleParentListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得分样配置") @Operation(summary = "获得分样配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSubSampleParentRespVO> getConfigSubSampleParent(@RequestParam("id") Long id) { public CommonResult<ConfigSubSampleParentRespVO> getConfigSubSampleParent(@RequestParam("id") Long id) {
ConfigSubSampleParentDO configSubSampleParent = configSubSampleParentService.getConfigSubSampleParent(id); ConfigSubSampleParentDO configSubSampleParent = configSubSampleParentService.getConfigSubSampleParent(id);
return success(BeanUtils.toBean(configSubSampleParent, ConfigSubSampleParentRespVO.class)); return success(BeanUtils.toBean(configSubSampleParent, ConfigSubSampleParentRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得分样配置分页") @Operation(summary = "获得分样配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent:query')")
public CommonResult<PageResult<ConfigSubSampleParentRespVO>> getConfigSubSampleParentPage(@Valid ConfigSubSampleParentPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSubSampleParentRespVO>> getConfigSubSampleParentPage(@Valid ConfigSubSampleParentPageReqVO pageReqVO) {
PageResult<ConfigSubSampleParentDO> pageResult = configSubSampleParentService.getConfigSubSampleParentPage(pageReqVO); PageResult<ConfigSubSampleParentDO> pageResult = configSubSampleParentService.getConfigSubSampleParentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigSubSampleParentController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出分样配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSubSampleParentExcel(@Valid ConfigSubSampleParentPageReqVO pageReqVO, public void exportConfigSubSampleParentExcel(@Valid ConfigSubSampleParentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigSubSampleParentMethodController.java
View File

@@ -42,14 +42,14 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建分样与检测方法配置") @Operation(summary = "创建分样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:create')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:create')")
public CommonResult<ConfigSubSampleParentMethodRespVO> createConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO createReqVO) { public CommonResult<ConfigSubSampleParentMethodRespVO> createConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO createReqVO) {
return success(configSubSampleParentMethodService.createConfigSubSampleParentMethod(createReqVO)); return success(configSubSampleParentMethodService.createConfigSubSampleParentMethod(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新分样与检测方法配置") @Operation(summary = "更新分样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:update')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:update')")
public CommonResult<Boolean> updateConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigSubSampleParentMethod(@Valid @RequestBody ConfigSubSampleParentMethodSaveReqVO updateReqVO) {
configSubSampleParentMethodService.updateConfigSubSampleParentMethod(updateReqVO); configSubSampleParentMethodService.updateConfigSubSampleParentMethod(updateReqVO);
return success(true); return success(true);
@@ -58,7 +58,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除分样与检测方法配置") @Operation(summary = "删除分样与检测方法配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigSubSampleParentMethod(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigSubSampleParentMethod(@RequestParam("id") Long id) {
configSubSampleParentMethodService.deleteConfigSubSampleParentMethod(id); configSubSampleParentMethodService.deleteConfigSubSampleParentMethod(id);
return success(true); return success(true);
@@ -67,7 +67,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除分样与检测方法配置") @Operation(summary = "批量删除分样与检测方法配置")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:delete')")
public CommonResult<Boolean> deleteConfigSubSampleParentMethodList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigSubSampleParentMethodList(@RequestBody BatchDeleteReqVO req) {
configSubSampleParentMethodService.deleteConfigSubSampleParentMethodListByIds(req.getIds()); configSubSampleParentMethodService.deleteConfigSubSampleParentMethodListByIds(req.getIds());
return success(true); return success(true);
@@ -76,7 +76,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得分样与检测方法配置") @Operation(summary = "获得分样与检测方法配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigSubSampleParentMethodRespVO> getConfigSubSampleParentMethod(@RequestParam("id") Long id) { public CommonResult<ConfigSubSampleParentMethodRespVO> getConfigSubSampleParentMethod(@RequestParam("id") Long id) {
ConfigSubSampleParentMethodDO configSubSampleParentMethod = configSubSampleParentMethodService.getConfigSubSampleParentMethod(id); ConfigSubSampleParentMethodDO configSubSampleParentMethod = configSubSampleParentMethodService.getConfigSubSampleParentMethod(id);
return success(BeanUtils.toBean(configSubSampleParentMethod, ConfigSubSampleParentMethodRespVO.class)); return success(BeanUtils.toBean(configSubSampleParentMethod, ConfigSubSampleParentMethodRespVO.class));
@@ -84,7 +84,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得分样与检测方法配置分页") @Operation(summary = "获得分样与检测方法配置分页")
@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')") //@PreAuthorize("@ss.hasPermission('qms:config-sub-sample-parent-method:query')")
public CommonResult<PageResult<ConfigSubSampleParentMethodRespVO>> getConfigSubSampleParentMethodPage(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigSubSampleParentMethodRespVO>> getConfigSubSampleParentMethodPage(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO) {
PageResult<ConfigSubSampleParentMethodDO> pageResult = configSubSampleParentMethodService.getConfigSubSampleParentMethodPage(pageReqVO); PageResult<ConfigSubSampleParentMethodDO> pageResult = configSubSampleParentMethodService.getConfigSubSampleParentMethodPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentMethodRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigSubSampleParentMethodRespVO.class));
@@ -92,7 +92,7 @@ public class ConfigSubSampleParentMethodController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出分样与检测方法配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigSubSampleParentMethodExcel(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO, public void exportConfigSubSampleParentMethodExcel(@Valid ConfigSubSampleParentMethodPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationInfomationController.java
View File

@@ -46,14 +46,14 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品库位信息") @Operation(summary = "创建样品库位信息")
@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:create')") //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:create')")
public CommonResult<ConfigWarehouseLocationInfomationRespVO> createConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO createReqVO) { public CommonResult<ConfigWarehouseLocationInfomationRespVO> createConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO createReqVO) {
return success(configWarehouseLocationInfomationService.createConfigWarehouseLocationInfomation(createReqVO)); return success(configWarehouseLocationInfomationService.createConfigWarehouseLocationInfomation(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品库位信息") @Operation(summary = "更新样品库位信息")
@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:update')") //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:update')")
public CommonResult<Boolean> updateConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO updateReqVO) { public CommonResult<Boolean> updateConfigWarehouseLocationInfomation(@Valid @RequestBody ConfigWarehouseLocationInfomationSaveReqVO updateReqVO) {
configWarehouseLocationInfomationService.updateConfigWarehouseLocationInfomation(updateReqVO); configWarehouseLocationInfomationService.updateConfigWarehouseLocationInfomation(updateReqVO);
return success(true); return success(true);
@@ -62,7 +62,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品库位信息") @Operation(summary = "删除样品库位信息")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteConfigWarehouseLocationInfomation(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteConfigWarehouseLocationInfomation(@RequestParam("id") Long id) {
configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomation(id); configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomation(id);
return success(true); return success(true);
@@ -71,7 +71,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品库位信息") @Operation(summary = "批量删除样品库位信息")
@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')") //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:delete')")
public CommonResult<Boolean> deleteConfigWarehouseLocationInfomationList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteConfigWarehouseLocationInfomationList(@RequestBody BatchDeleteReqVO req) {
configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomationListByIds(req.getIds()); configWarehouseLocationInfomationService.deleteConfigWarehouseLocationInfomationListByIds(req.getIds());
return success(true); return success(true);
@@ -80,7 +80,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品库位信息") @Operation(summary = "获得样品库位信息")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ConfigWarehouseLocationInfomationRespVO> getConfigWarehouseLocationInfomation(@RequestParam("id") Long id) { public CommonResult<ConfigWarehouseLocationInfomationRespVO> getConfigWarehouseLocationInfomation(@RequestParam("id") Long id) {
ConfigWarehouseLocationInfomationDO configWarehouseLocationInfomation = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomation(id); ConfigWarehouseLocationInfomationDO configWarehouseLocationInfomation = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomation(id);
return success(BeanUtils.toBean(configWarehouseLocationInfomation, ConfigWarehouseLocationInfomationRespVO.class)); return success(BeanUtils.toBean(configWarehouseLocationInfomation, ConfigWarehouseLocationInfomationRespVO.class));
@@ -88,7 +88,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品库位信息分页") @Operation(summary = "获得样品库位信息分页")
@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')") //@PreAuthorize("@ss.hasPermission('qms:config-warehouse-location-infomation:query')")
public CommonResult<PageResult<ConfigWarehouseLocationInfomationRespVO>> getConfigWarehouseLocationInfomationPage(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO) { public CommonResult<PageResult<ConfigWarehouseLocationInfomationRespVO>> getConfigWarehouseLocationInfomationPage(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO) {
PageResult<ConfigWarehouseLocationInfomationDO> pageResult = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomationPage(pageReqVO); PageResult<ConfigWarehouseLocationInfomationDO> pageResult = configWarehouseLocationInfomationService.getConfigWarehouseLocationInfomationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ConfigWarehouseLocationInfomationRespVO.class)); return success(BeanUtils.toBean(pageResult, ConfigWarehouseLocationInfomationRespVO.class));
@@ -96,7 +96,7 @@ public class ConfigWarehouseLocationInfomationController implements BusinessCont
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品库位信息 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) @ApiAccessLog(operateType = EXPORT)
public void exportConfigWarehouseLocationInfomationExcel(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO, public void exportConfigWarehouseLocationInfomationExcel(@Valid ConfigWarehouseLocationInfomationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java
View File

@@ -49,7 +49,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@PostMapping("/createTempData") @PostMapping("/createTempData")
@Operation(summary = "创建检测标准临时数据") @Operation(summary = "创建检测标准临时数据")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')")
public CommonResult<MaterialAssayStandardRespVO> createTempData() { public CommonResult<MaterialAssayStandardRespVO> createTempData() {
MaterialAssayStandardSaveReqVO vo = new MaterialAssayStandardSaveReqVO(); MaterialAssayStandardSaveReqVO vo = new MaterialAssayStandardSaveReqVO();
vo.setRemark(MaterialAssayStandardMapper.tempDataKey); vo.setRemark(MaterialAssayStandardMapper.tempDataKey);
@@ -61,14 +61,14 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测标准") @Operation(summary = "创建检测标准")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:create')")
public CommonResult<MaterialAssayStandardRespVO> createMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO createReqVO) { public CommonResult<MaterialAssayStandardRespVO> createMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO createReqVO) {
return success(materialAssayStandardService.createMaterialAssayStandard(createReqVO)); return success(materialAssayStandardService.createMaterialAssayStandard(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测标准") @Operation(summary = "更新检测标准")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:update')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:update')")
public CommonResult<Boolean> updateMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO updateReqVO) { public CommonResult<Boolean> updateMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO updateReqVO) {
materialAssayStandardService.updateMaterialAssayStandard(updateReqVO); materialAssayStandardService.updateMaterialAssayStandard(updateReqVO);
return success(true); return success(true);
@@ -77,7 +77,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测标准") @Operation(summary = "删除检测标准")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')")
public CommonResult<Boolean> deleteMaterialAssayStandard(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteMaterialAssayStandard(@RequestParam("id") Long id) {
materialAssayStandardService.deleteMaterialAssayStandard(id); materialAssayStandardService.deleteMaterialAssayStandard(id);
return success(true); return success(true);
@@ -86,7 +86,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测标准") @Operation(summary = "批量删除检测标准")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:delete')")
public CommonResult<Boolean> deleteMaterialAssayStandardList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteMaterialAssayStandardList(@RequestBody BatchDeleteReqVO req) {
materialAssayStandardService.deleteMaterialAssayStandardListByIds(req.getIds()); materialAssayStandardService.deleteMaterialAssayStandardListByIds(req.getIds());
return success(true); return success(true);
@@ -95,7 +95,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测标准") @Operation(summary = "获得检测标准")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<MaterialAssayStandardRespVO> getMaterialAssayStandard(@RequestParam("id") Long id) { public CommonResult<MaterialAssayStandardRespVO> getMaterialAssayStandard(@RequestParam("id") Long id) {
MaterialAssayStandardDO materialAssayStandard = materialAssayStandardService.getMaterialAssayStandard(id); MaterialAssayStandardDO materialAssayStandard = materialAssayStandardService.getMaterialAssayStandard(id);
return success(BeanUtils.toBean(materialAssayStandard, MaterialAssayStandardRespVO.class)); return success(BeanUtils.toBean(materialAssayStandard, MaterialAssayStandardRespVO.class));
@@ -132,7 +132,7 @@ public class MaterialAssayStandardController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测标准 Excel") @Operation(summary = "导出检测标准 Excel")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:export')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportMaterialAssayStandardExcel(@Valid MaterialAssayStandardPageReqVO pageReqVO, public void exportMaterialAssayStandardExcel(@Valid MaterialAssayStandardPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java
View File

@@ -76,14 +76,14 @@ public class MaterialAssayStandardDetailController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建物料检测标准检测项目") @Operation(summary = "创建物料检测标准检测项目")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:create')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:create')")
public CommonResult<MaterialAssayStandardDetailRespVO> createMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO createReqVO) { public CommonResult<MaterialAssayStandardDetailRespVO> createMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO createReqVO) {
return success(materialAssayStandardDetailService.createMaterialAssayStandardDetail(createReqVO)); return success(materialAssayStandardDetailService.createMaterialAssayStandardDetail(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新物料检测标准检测项目") @Operation(summary = "更新物料检测标准检测项目")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:update')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:update')")
public CommonResult<Boolean> updateMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO updateReqVO) { public CommonResult<Boolean> updateMaterialAssayStandardDetail(@Valid @RequestBody MaterialAssayStandardDetailSaveReqVO updateReqVO) {
materialAssayStandardDetailService.updateMaterialAssayStandardDetail(updateReqVO); materialAssayStandardDetailService.updateMaterialAssayStandardDetail(updateReqVO);
return success(true); return success(true);
@@ -92,7 +92,7 @@ public class MaterialAssayStandardDetailController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除物料检测标准检测项目") @Operation(summary = "删除物料检测标准检测项目")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteMaterialAssayStandardDetail(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteMaterialAssayStandardDetail(@RequestParam("id") Long id) {
materialAssayStandardDetailService.deleteMaterialAssayStandardDetail(id); materialAssayStandardDetailService.deleteMaterialAssayStandardDetail(id);
return success(true); return success(true);
@@ -101,7 +101,7 @@ public class MaterialAssayStandardDetailController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除物料检测标准检测项目") @Operation(summary = "批量删除物料检测标准检测项目")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:delete')")
public CommonResult<Boolean> deleteMaterialAssayStandardDetailList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteMaterialAssayStandardDetailList(@RequestBody BatchDeleteReqVO req) {
materialAssayStandardDetailService.deleteMaterialAssayStandardDetailListByIds(req.getIds()); materialAssayStandardDetailService.deleteMaterialAssayStandardDetailListByIds(req.getIds());
return success(true); return success(true);
@@ -110,7 +110,7 @@ public class MaterialAssayStandardDetailController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得物料检测标准检测项目") @Operation(summary = "获得物料检测标准检测项目")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<MaterialAssayStandardDetailRespVO> getMaterialAssayStandardDetail(@RequestParam("id") Long id) { public CommonResult<MaterialAssayStandardDetailRespVO> getMaterialAssayStandardDetail(@RequestParam("id") Long id) {
MaterialAssayStandardDetailDO materialAssayStandardDetail = materialAssayStandardDetailService.getMaterialAssayStandardDetail(id); MaterialAssayStandardDetailDO materialAssayStandardDetail = materialAssayStandardDetailService.getMaterialAssayStandardDetail(id);
return success(BeanUtils.toBean(materialAssayStandardDetail, MaterialAssayStandardDetailRespVO.class)); return success(BeanUtils.toBean(materialAssayStandardDetail, MaterialAssayStandardDetailRespVO.class));
@@ -118,7 +118,7 @@ public class MaterialAssayStandardDetailController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得物料检测标准检测项目分页") @Operation(summary = "获得物料检测标准检测项目分页")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')")
public CommonResult<PageResult<MaterialAssayStandardDetailRespVO>> getMaterialAssayStandardDetailPage(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO) { public CommonResult<PageResult<MaterialAssayStandardDetailRespVO>> getMaterialAssayStandardDetailPage(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO) {
PageResult<MaterialAssayStandardDetailDO> pageResult = materialAssayStandardDetailService.getMaterialAssayStandardDetailPage(pageReqVO); PageResult<MaterialAssayStandardDetailDO> pageResult = materialAssayStandardDetailService.getMaterialAssayStandardDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialAssayStandardDetailRespVO.class)); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardDetailRespVO.class));
@@ -126,7 +126,7 @@ public class MaterialAssayStandardDetailController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出物料检测标准检测项目 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) @ApiAccessLog(operateType = EXPORT)
public void exportMaterialAssayStandardDetailExcel(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO, public void exportMaterialAssayStandardDetailExcel(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardForecastProjectController.java
View File

@@ -44,14 +44,14 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建物料检测标准来样品位配置") @Operation(summary = "创建物料检测标准来样品位配置")
@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:create')") //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:create')")
public CommonResult<MaterialAssayStandardForecastProjectRespVO> createMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO createReqVO) { public CommonResult<MaterialAssayStandardForecastProjectRespVO> createMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO createReqVO) {
return success(materialAssayStandardForecastProjectService.createMaterialAssayStandardForecastProject(createReqVO)); return success(materialAssayStandardForecastProjectService.createMaterialAssayStandardForecastProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新物料检测标准来样品位配置") @Operation(summary = "更新物料检测标准来样品位配置")
@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:update')") //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:update')")
public CommonResult<Boolean> updateMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateMaterialAssayStandardForecastProject(@Valid @RequestBody MaterialAssayStandardForecastProjectSaveReqVO updateReqVO) {
materialAssayStandardForecastProjectService.updateMaterialAssayStandardForecastProject(updateReqVO); materialAssayStandardForecastProjectService.updateMaterialAssayStandardForecastProject(updateReqVO);
return success(true); return success(true);
@@ -60,7 +60,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除物料检测标准来样品位配置") @Operation(summary = "删除物料检测标准来样品位配置")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteMaterialAssayStandardForecastProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteMaterialAssayStandardForecastProject(@RequestParam("id") Long id) {
materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProject(id); materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProject(id);
return success(true); return success(true);
@@ -69,7 +69,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除物料检测标准来样品位配置") @Operation(summary = "批量删除物料检测标准来样品位配置")
@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')") //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:delete')")
public CommonResult<Boolean> deleteMaterialAssayStandardForecastProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteMaterialAssayStandardForecastProjectList(@RequestBody BatchDeleteReqVO req) {
materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProjectListByIds(req.getIds()); materialAssayStandardForecastProjectService.deleteMaterialAssayStandardForecastProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -78,7 +78,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得物料检测标准来样品位配置") @Operation(summary = "获得物料检测标准来样品位配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<MaterialAssayStandardForecastProjectRespVO> getMaterialAssayStandardForecastProject(@RequestParam("id") Long id) { public CommonResult<MaterialAssayStandardForecastProjectRespVO> getMaterialAssayStandardForecastProject(@RequestParam("id") Long id) {
MaterialAssayStandardForecastProjectDO materialAssayStandardForecastProject = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProject(id); MaterialAssayStandardForecastProjectDO materialAssayStandardForecastProject = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProject(id);
return success(BeanUtils.toBean(materialAssayStandardForecastProject, MaterialAssayStandardForecastProjectRespVO.class)); return success(BeanUtils.toBean(materialAssayStandardForecastProject, MaterialAssayStandardForecastProjectRespVO.class));
@@ -86,7 +86,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得物料检测标准来样品位配置分页") @Operation(summary = "获得物料检测标准来样品位配置分页")
@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')") //@PreAuthorize("@ss.hasPermission('t:material-assay-standard-forecast-project:query')")
public CommonResult<PageResult<MaterialAssayStandardForecastProjectRespVO>> getMaterialAssayStandardForecastProjectPage(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO) { public CommonResult<PageResult<MaterialAssayStandardForecastProjectRespVO>> getMaterialAssayStandardForecastProjectPage(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO) {
PageResult<MaterialAssayStandardForecastProjectDO> pageResult = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProjectPage(pageReqVO); PageResult<MaterialAssayStandardForecastProjectDO> pageResult = materialAssayStandardForecastProjectService.getMaterialAssayStandardForecastProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialAssayStandardForecastProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardForecastProjectRespVO.class));
@@ -94,7 +94,7 @@ public class MaterialAssayStandardForecastProjectController implements BusinessC
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出物料检测标准来样品位配置 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) @ApiAccessLog(operateType = EXPORT)
public void exportMaterialAssayStandardForecastProjectExcel(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO, public void exportMaterialAssayStandardForecastProjectExcel(@Valid MaterialAssayStandardForecastProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardMethodController.java
View File

@@ -45,14 +45,14 @@ public class MaterialAssayStandardMethodController implements BusinessController
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建物料检测标准与方法") @Operation(summary = "创建物料检测标准与方法")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:create')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:create')")
public CommonResult<MaterialAssayStandardMethodRespVO> createMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO createReqVO) { public CommonResult<MaterialAssayStandardMethodRespVO> createMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO createReqVO) {
return success(materialAssayStandardMethodService.createMaterialAssayStandardMethod(createReqVO)); return success(materialAssayStandardMethodService.createMaterialAssayStandardMethod(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新物料检测标准与方法") @Operation(summary = "更新物料检测标准与方法")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:update')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:update')")
public CommonResult<Boolean> updateMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO updateReqVO) { public CommonResult<Boolean> updateMaterialAssayStandardMethod(@Valid @RequestBody MaterialAssayStandardMethodSaveReqVO updateReqVO) {
materialAssayStandardMethodService.updateMaterialAssayStandardMethod(updateReqVO); materialAssayStandardMethodService.updateMaterialAssayStandardMethod(updateReqVO);
return success(true); return success(true);
@@ -61,7 +61,7 @@ public class MaterialAssayStandardMethodController implements BusinessController
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除物料检测标准与方法") @Operation(summary = "删除物料检测标准与方法")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteMaterialAssayStandardMethod(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteMaterialAssayStandardMethod(@RequestParam("id") Long id) {
materialAssayStandardMethodService.deleteMaterialAssayStandardMethod(id); materialAssayStandardMethodService.deleteMaterialAssayStandardMethod(id);
return success(true); return success(true);
@@ -70,7 +70,7 @@ public class MaterialAssayStandardMethodController implements BusinessController
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除物料检测标准与方法") @Operation(summary = "批量删除物料检测标准与方法")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:delete')")
public CommonResult<Boolean> deleteMaterialAssayStandardMethodList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteMaterialAssayStandardMethodList(@RequestBody BatchDeleteReqVO req) {
materialAssayStandardMethodService.deleteMaterialAssayStandardMethodListByIds(req.getIds()); materialAssayStandardMethodService.deleteMaterialAssayStandardMethodListByIds(req.getIds());
return success(true); return success(true);
@@ -79,7 +79,7 @@ public class MaterialAssayStandardMethodController implements BusinessController
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得物料检测标准与方法") @Operation(summary = "获得物料检测标准与方法")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<MaterialAssayStandardMethodRespVO> getMaterialAssayStandardMethod(@RequestParam("id") Long id) { public CommonResult<MaterialAssayStandardMethodRespVO> getMaterialAssayStandardMethod(@RequestParam("id") Long id) {
MaterialAssayStandardMethodDO materialAssayStandardMethod = materialAssayStandardMethodService.getMaterialAssayStandardMethod(id); MaterialAssayStandardMethodDO materialAssayStandardMethod = materialAssayStandardMethodService.getMaterialAssayStandardMethod(id);
return success(BeanUtils.toBean(materialAssayStandardMethod, MaterialAssayStandardMethodRespVO.class)); return success(BeanUtils.toBean(materialAssayStandardMethod, MaterialAssayStandardMethodRespVO.class));
@@ -87,7 +87,7 @@ public class MaterialAssayStandardMethodController implements BusinessController
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得物料检测标准与方法分页") @Operation(summary = "获得物料检测标准与方法分页")
@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-method:query')")
public CommonResult<PageResult<MaterialAssayStandardMethodRespVO>> getMaterialAssayStandardMethodPage(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO) { public CommonResult<PageResult<MaterialAssayStandardMethodRespVO>> getMaterialAssayStandardMethodPage(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO) {
PageResult<MaterialAssayStandardMethodDO> pageResult = materialAssayStandardMethodService.getMaterialAssayStandardMethodPage(pageReqVO); PageResult<MaterialAssayStandardMethodDO> pageResult = materialAssayStandardMethodService.getMaterialAssayStandardMethodPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialAssayStandardMethodRespVO.class)); return success(BeanUtils.toBean(pageResult, MaterialAssayStandardMethodRespVO.class));
@@ -95,7 +95,7 @@ public class MaterialAssayStandardMethodController implements BusinessController
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出物料检测标准与方法 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) @ApiAccessLog(operateType = EXPORT)
public void exportMaterialAssayStandardMethodExcel(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO, public void exportMaterialAssayStandardMethodExcel(@Valid MaterialAssayStandardMethodPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

17
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java
View File

@@ -42,7 +42,7 @@ public class ConfigSubSampleMethodDO extends BusinessBaseDO {
@TableField("CFG_ASY_MTHD_ID") @TableField("CFG_ASY_MTHD_ID")
private Long configAssayMethodId; private Long configAssayMethodId;
/** /**
* 是否默认使用,1-启用，0-不启用 * 是否默认使用,1-是，0-否
*/ */
@TableField("IS_DFT_USE") @TableField("IS_DFT_USE")
private Integer isDefaultUse; private Integer isDefaultUse;
@@ -52,6 +52,21 @@ public class ConfigSubSampleMethodDO extends BusinessBaseDO {
@TableField("TSK_CNT") @TableField("TSK_CNT")
private Integer taskCount; 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") @TableField("SYS_DEPT_CD")

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryParameterController.java
View File

@@ -41,14 +41,14 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测参数字典") @Operation(summary = "创建检测参数字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:create')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:create')")
public CommonResult<DictionaryParameterRespVO> createDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO createReqVO) { public CommonResult<DictionaryParameterRespVO> createDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO createReqVO) {
return success(dictionaryParameterService.createDictionaryParameter(createReqVO)); return success(dictionaryParameterService.createDictionaryParameter(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测参数字典") @Operation(summary = "更新检测参数字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:update')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:update')")
public CommonResult<Boolean> updateDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDictionaryParameter(@Valid @RequestBody DictionaryParameterSaveReqVO updateReqVO) {
dictionaryParameterService.updateDictionaryParameter(updateReqVO); dictionaryParameterService.updateDictionaryParameter(updateReqVO);
return success(true); return success(true);
@@ -57,7 +57,7 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测参数字典") @Operation(summary = "删除检测参数字典")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')")
public CommonResult<Boolean> deleteDictionaryParameter(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteDictionaryParameter(@RequestParam("id") Long id) {
dictionaryParameterService.deleteDictionaryParameter(id); dictionaryParameterService.deleteDictionaryParameter(id);
return success(true); return success(true);
@@ -66,7 +66,7 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测参数字典") @Operation(summary = "批量删除检测参数字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:delete')")
public CommonResult<Boolean> deleteDictionaryParameterList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteDictionaryParameterList(@RequestBody BatchDeleteReqVO req) {
dictionaryParameterService.deleteDictionaryParameterListByIds(req.getIds()); dictionaryParameterService.deleteDictionaryParameterListByIds(req.getIds());
return success(true); return success(true);
@@ -75,7 +75,7 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测参数字典") @Operation(summary = "获得检测参数字典")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')")
public CommonResult<DictionaryParameterRespVO> getDictionaryParameter(@RequestParam("id") Long id) { public CommonResult<DictionaryParameterRespVO> getDictionaryParameter(@RequestParam("id") Long id) {
DictionaryParameterDO dictionaryParameter = dictionaryParameterService.getDictionaryParameter(id); DictionaryParameterDO dictionaryParameter = dictionaryParameterService.getDictionaryParameter(id);
return success(BeanUtils.toBean(dictionaryParameter, DictionaryParameterRespVO.class)); return success(BeanUtils.toBean(dictionaryParameter, DictionaryParameterRespVO.class));
@@ -83,7 +83,7 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测参数字典分页") @Operation(summary = "获得检测参数字典分页")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:query')")
public CommonResult<PageResult<DictionaryParameterRespVO>> getDictionaryParameterPage(@Valid DictionaryParameterPageReqVO pageReqVO) { public CommonResult<PageResult<DictionaryParameterRespVO>> getDictionaryParameterPage(@Valid DictionaryParameterPageReqVO pageReqVO) {
PageResult<DictionaryParameterDO> pageResult = dictionaryParameterService.getDictionaryParameterPage(pageReqVO); PageResult<DictionaryParameterDO> pageResult = dictionaryParameterService.getDictionaryParameterPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DictionaryParameterRespVO.class)); return success(BeanUtils.toBean(pageResult, DictionaryParameterRespVO.class));
@@ -91,7 +91,7 @@ public class DictionaryParameterController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测参数字典 Excel") @Operation(summary = "导出检测参数字典 Excel")
@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:export')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-parameter:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportDictionaryParameterExcel(@Valid DictionaryParameterPageReqVO pageReqVO, public void exportDictionaryParameterExcel(@Valid DictionaryParameterPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionaryProjectController.java
View File

@@ -41,14 +41,14 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测项目字典") @Operation(summary = "创建检测项目字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:create')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:create')")
public CommonResult<DictionaryProjectRespVO> createDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO createReqVO) { public CommonResult<DictionaryProjectRespVO> createDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO createReqVO) {
return success(dictionaryProjectService.createDictionaryProject(createReqVO)); return success(dictionaryProjectService.createDictionaryProject(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测项目字典") @Operation(summary = "更新检测项目字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:update')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:update')")
public CommonResult<Boolean> updateDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDictionaryProject(@Valid @RequestBody DictionaryProjectSaveReqVO updateReqVO) {
dictionaryProjectService.updateDictionaryProject(updateReqVO); dictionaryProjectService.updateDictionaryProject(updateReqVO);
return success(true); return success(true);
@@ -57,7 +57,7 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测项目字典") @Operation(summary = "删除检测项目字典")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')")
public CommonResult<Boolean> deleteDictionaryProject(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteDictionaryProject(@RequestParam("id") Long id) {
dictionaryProjectService.deleteDictionaryProject(id); dictionaryProjectService.deleteDictionaryProject(id);
return success(true); return success(true);
@@ -66,7 +66,7 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测项目字典") @Operation(summary = "批量删除检测项目字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:delete')")
public CommonResult<Boolean> deleteDictionaryProjectList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteDictionaryProjectList(@RequestBody BatchDeleteReqVO req) {
dictionaryProjectService.deleteDictionaryProjectListByIds(req.getIds()); dictionaryProjectService.deleteDictionaryProjectListByIds(req.getIds());
return success(true); return success(true);
@@ -75,7 +75,7 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测项目字典") @Operation(summary = "获得检测项目字典")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')")
public CommonResult<DictionaryProjectRespVO> getDictionaryProject(@RequestParam("id") Long id) { public CommonResult<DictionaryProjectRespVO> getDictionaryProject(@RequestParam("id") Long id) {
DictionaryProjectDO dictionaryProject = dictionaryProjectService.getDictionaryProject(id); DictionaryProjectDO dictionaryProject = dictionaryProjectService.getDictionaryProject(id);
return success(BeanUtils.toBean(dictionaryProject, DictionaryProjectRespVO.class)); return success(BeanUtils.toBean(dictionaryProject, DictionaryProjectRespVO.class));
@@ -83,7 +83,7 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测项目字典分页") @Operation(summary = "获得检测项目字典分页")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:query')")
public CommonResult<PageResult<DictionaryProjectRespVO>> getDictionaryProjectPage(@Valid DictionaryProjectPageReqVO pageReqVO) { public CommonResult<PageResult<DictionaryProjectRespVO>> getDictionaryProjectPage(@Valid DictionaryProjectPageReqVO pageReqVO) {
PageResult<DictionaryProjectDO> pageResult = dictionaryProjectService.getDictionaryProjectPage(pageReqVO); PageResult<DictionaryProjectDO> pageResult = dictionaryProjectService.getDictionaryProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DictionaryProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, DictionaryProjectRespVO.class));
@@ -91,7 +91,7 @@ public class DictionaryProjectController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测项目字典 Excel") @Operation(summary = "导出检测项目字典 Excel")
@PreAuthorize("@ss.hasPermission('qms:dictionary-project:export')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-project:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportDictionaryProjectExcel(@Valid DictionaryProjectPageReqVO pageReqVO, public void exportDictionaryProjectExcel(@Valid DictionaryProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleFlowNodeController.java
View File

@@ -41,14 +41,14 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品流程节点字典") @Operation(summary = "创建样品流程节点字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:create')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:create')")
public CommonResult<DictionarySampleFlowNodeRespVO> createDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO createReqVO) { public CommonResult<DictionarySampleFlowNodeRespVO> createDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO createReqVO) {
return success(dictionarySampleFlowNodeService.createDictionarySampleFlowNode(createReqVO)); return success(dictionarySampleFlowNodeService.createDictionarySampleFlowNode(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品流程节点字典") @Operation(summary = "更新样品流程节点字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:update')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:update')")
public CommonResult<Boolean> updateDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDictionarySampleFlowNode(@Valid @RequestBody DictionarySampleFlowNodeSaveReqVO updateReqVO) {
dictionarySampleFlowNodeService.updateDictionarySampleFlowNode(updateReqVO); dictionarySampleFlowNodeService.updateDictionarySampleFlowNode(updateReqVO);
return success(true); return success(true);
@@ -57,7 +57,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品流程节点字典") @Operation(summary = "删除样品流程节点字典")
@Parameter(name = "id", description = "编号", required = true) @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<Boolean> deleteDictionarySampleFlowNode(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteDictionarySampleFlowNode(@RequestParam("id") Long id) {
dictionarySampleFlowNodeService.deleteDictionarySampleFlowNode(id); dictionarySampleFlowNodeService.deleteDictionarySampleFlowNode(id);
return success(true); return success(true);
@@ -66,7 +66,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品流程节点字典") @Operation(summary = "批量删除样品流程节点字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:delete')")
public CommonResult<Boolean> deleteDictionarySampleFlowNodeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteDictionarySampleFlowNodeList(@RequestBody BatchDeleteReqVO req) {
dictionarySampleFlowNodeService.deleteDictionarySampleFlowNodeListByIds(req.getIds()); dictionarySampleFlowNodeService.deleteDictionarySampleFlowNodeListByIds(req.getIds());
return success(true); return success(true);
@@ -75,7 +75,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品流程节点字典") @Operation(summary = "获得样品流程节点字典")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<DictionarySampleFlowNodeRespVO> getDictionarySampleFlowNode(@RequestParam("id") Long id) { public CommonResult<DictionarySampleFlowNodeRespVO> getDictionarySampleFlowNode(@RequestParam("id") Long id) {
DictionarySampleFlowNodeDO dictionarySampleFlowNode = dictionarySampleFlowNodeService.getDictionarySampleFlowNode(id); DictionarySampleFlowNodeDO dictionarySampleFlowNode = dictionarySampleFlowNodeService.getDictionarySampleFlowNode(id);
return success(BeanUtils.toBean(dictionarySampleFlowNode, DictionarySampleFlowNodeRespVO.class)); return success(BeanUtils.toBean(dictionarySampleFlowNode, DictionarySampleFlowNodeRespVO.class));
@@ -83,7 +83,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品流程节点字典分页") @Operation(summary = "获得样品流程节点字典分页")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-flow-node:query')")
public CommonResult<PageResult<DictionarySampleFlowNodeRespVO>> getDictionarySampleFlowNodePage(@Valid DictionarySampleFlowNodePageReqVO pageReqVO) { public CommonResult<PageResult<DictionarySampleFlowNodeRespVO>> getDictionarySampleFlowNodePage(@Valid DictionarySampleFlowNodePageReqVO pageReqVO) {
PageResult<DictionarySampleFlowNodeDO> pageResult = dictionarySampleFlowNodeService.getDictionarySampleFlowNodePage(pageReqVO); PageResult<DictionarySampleFlowNodeDO> pageResult = dictionarySampleFlowNodeService.getDictionarySampleFlowNodePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DictionarySampleFlowNodeRespVO.class)); return success(BeanUtils.toBean(pageResult, DictionarySampleFlowNodeRespVO.class));
@@ -91,7 +91,7 @@ public class DictionarySampleFlowNodeController implements BusinessControllerMar
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品流程节点字典 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) @ApiAccessLog(operateType = EXPORT)
public void exportDictionarySampleFlowNodeExcel(@Valid DictionarySampleFlowNodePageReqVO pageReqVO, public void exportDictionarySampleFlowNodeExcel(@Valid DictionarySampleFlowNodePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/dic/controller/admin/DictionarySampleTypeController.java
View File

@@ -41,14 +41,14 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建样品类型字典") @Operation(summary = "创建样品类型字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:create')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:create')")
public CommonResult<DictionarySampleTypeRespVO> createDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO createReqVO) { public CommonResult<DictionarySampleTypeRespVO> createDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO createReqVO) {
return success(dictionarySampleTypeService.createDictionarySampleType(createReqVO)); return success(dictionarySampleTypeService.createDictionarySampleType(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新样品类型字典") @Operation(summary = "更新样品类型字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:update')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:update')")
public CommonResult<Boolean> updateDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDictionarySampleType(@Valid @RequestBody DictionarySampleTypeSaveReqVO updateReqVO) {
dictionarySampleTypeService.updateDictionarySampleType(updateReqVO); dictionarySampleTypeService.updateDictionarySampleType(updateReqVO);
return success(true); return success(true);
@@ -57,7 +57,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除样品类型字典") @Operation(summary = "删除样品类型字典")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')")
public CommonResult<Boolean> deleteDictionarySampleType(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteDictionarySampleType(@RequestParam("id") Long id) {
dictionarySampleTypeService.deleteDictionarySampleType(id); dictionarySampleTypeService.deleteDictionarySampleType(id);
return success(true); return success(true);
@@ -66,7 +66,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品类型字典") @Operation(summary = "批量删除样品类型字典")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:delete')")
public CommonResult<Boolean> deleteDictionarySampleTypeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteDictionarySampleTypeList(@RequestBody BatchDeleteReqVO req) {
dictionarySampleTypeService.deleteDictionarySampleTypeListByIds(req.getIds()); dictionarySampleTypeService.deleteDictionarySampleTypeListByIds(req.getIds());
return success(true); return success(true);
@@ -75,7 +75,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得样品类型字典") @Operation(summary = "获得样品类型字典")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<DictionarySampleTypeRespVO> getDictionarySampleType(@RequestParam("id") Long id) { public CommonResult<DictionarySampleTypeRespVO> getDictionarySampleType(@RequestParam("id") Long id) {
DictionarySampleTypeDO dictionarySampleType = dictionarySampleTypeService.getDictionarySampleType(id); DictionarySampleTypeDO dictionarySampleType = dictionarySampleTypeService.getDictionarySampleType(id);
return success(BeanUtils.toBean(dictionarySampleType, DictionarySampleTypeRespVO.class)); return success(BeanUtils.toBean(dictionarySampleType, DictionarySampleTypeRespVO.class));
@@ -83,7 +83,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得样品类型字典分页") @Operation(summary = "获得样品类型字典分页")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:query')")
public CommonResult<PageResult<DictionarySampleTypeRespVO>> getDictionarySampleTypePage(@Valid DictionarySampleTypePageReqVO pageReqVO) { public CommonResult<PageResult<DictionarySampleTypeRespVO>> getDictionarySampleTypePage(@Valid DictionarySampleTypePageReqVO pageReqVO) {
PageResult<DictionarySampleTypeDO> pageResult = dictionarySampleTypeService.getDictionarySampleTypePage(pageReqVO); PageResult<DictionarySampleTypeDO> pageResult = dictionarySampleTypeService.getDictionarySampleTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DictionarySampleTypeRespVO.class)); return success(BeanUtils.toBean(pageResult, DictionarySampleTypeRespVO.class));
@@ -91,7 +91,7 @@ public class DictionarySampleTypeController implements BusinessControllerMarker
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出样品类型字典 Excel") @Operation(summary = "导出样品类型字典 Excel")
@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:export')") //@PreAuthorize("@ss.hasPermission('qms:dictionary-sample-type:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportDictionarySampleTypeExcel(@Valid DictionarySampleTypePageReqVO pageReqVO, public void exportDictionarySampleTypeExcel(@Valid DictionarySampleTypePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
View File

@@ -75,14 +75,14 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测报告明细") @Operation(summary = "创建检测报告明细")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')")
public CommonResult<ReportDocumentDataRespVO> createReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO createReqVO) { public CommonResult<ReportDocumentDataRespVO> createReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO createReqVO) {
return success(reportDocumentDataService.createReportDocumentData(createReqVO)); return success(reportDocumentDataService.createReportDocumentData(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测报告明细") @Operation(summary = "更新检测报告明细")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:update')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:update')")
public CommonResult<Boolean> updateReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO updateReqVO) { public CommonResult<Boolean> updateReportDocumentData(@Valid @RequestBody ReportDocumentDataSaveReqVO updateReqVO) {
reportDocumentDataService.updateReportDocumentData(updateReqVO); reportDocumentDataService.updateReportDocumentData(updateReqVO);
return success(true); return success(true);
@@ -91,7 +91,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测报告明细") @Operation(summary = "删除检测报告明细")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')")
public CommonResult<Boolean> deleteReportDocumentData(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteReportDocumentData(@RequestParam("id") Long id) {
reportDocumentDataService.deleteReportDocumentData(id); reportDocumentDataService.deleteReportDocumentData(id);
return success(true); return success(true);
@@ -100,7 +100,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测报告明细") @Operation(summary = "批量删除检测报告明细")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:delete')")
public CommonResult<Boolean> deleteReportDocumentDataList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteReportDocumentDataList(@RequestBody BatchDeleteReqVO req) {
reportDocumentDataService.deleteReportDocumentDataListByIds(req.getIds()); reportDocumentDataService.deleteReportDocumentDataListByIds(req.getIds());
return success(true); return success(true);
@@ -109,7 +109,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测报告明细") @Operation(summary = "获得检测报告明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ReportDocumentDataRespVO> getReportDocumentData(@RequestParam("id") Long id) { public CommonResult<ReportDocumentDataRespVO> getReportDocumentData(@RequestParam("id") Long id) {
ReportDocumentDataDO reportDocumentData = reportDocumentDataService.getReportDocumentData(id); ReportDocumentDataDO reportDocumentData = reportDocumentDataService.getReportDocumentData(id);
return success(BeanUtils.toBean(reportDocumentData, ReportDocumentDataRespVO.class)); return success(BeanUtils.toBean(reportDocumentData, ReportDocumentDataRespVO.class));
@@ -117,7 +117,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测报告明细分页") @Operation(summary = "获得检测报告明细分页")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:query')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:query')")
public CommonResult<PageResult<ReportDocumentDataRespVO>> getReportDocumentDataPage(@Valid ReportDocumentDataPageReqVO pageReqVO) { public CommonResult<PageResult<ReportDocumentDataRespVO>> getReportDocumentDataPage(@Valid ReportDocumentDataPageReqVO pageReqVO) {
PageResult<ReportDocumentDataDO> pageResult = reportDocumentDataService.getReportDocumentDataPage(pageReqVO); PageResult<ReportDocumentDataDO> pageResult = reportDocumentDataService.getReportDocumentDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ReportDocumentDataRespVO.class)); return success(BeanUtils.toBean(pageResult, ReportDocumentDataRespVO.class));
@@ -125,7 +125,7 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测报告明细 Excel") @Operation(summary = "导出检测报告明细 Excel")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:export')") //@PreAuthorize("@ss.hasPermission('qms:report-document-data:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportReportDocumentDataExcel(@Valid ReportDocumentDataPageReqVO pageReqVO, public void exportReportDocumentDataExcel(@Valid ReportDocumentDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java
View File

@@ -54,7 +54,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测报告") @Operation(summary = "创建检测报告")
@PreAuthorize("@ss.hasPermission('qms:report-document-main:create')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:create')")
public CommonResult<ReportDocumentMainRespVO> createReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO createReqVO) { public CommonResult<ReportDocumentMainRespVO> createReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO createReqVO) {
return success(reportDocumentMainService.createReportDocumentMain(createReqVO)); return success(reportDocumentMainService.createReportDocumentMain(createReqVO));
} }
@@ -99,7 +99,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新检测报告业务") @Operation(summary = "更新检测报告业务")
@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')")
public CommonResult<Boolean> updateReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) { public CommonResult<Boolean> updateReportDocumentMain(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) {
updateReqVO.setCancelFlag("0"); updateReqVO.setCancelFlag("0");
reportDocumentMainService.updateReportDocumentMain(updateReqVO); reportDocumentMainService.updateReportDocumentMain(updateReqVO);
@@ -109,7 +109,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除检测报告业务") @Operation(summary = "删除检测报告业务")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')")
public CommonResult<Boolean> deleteReportDocumentMain(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteReportDocumentMain(@RequestParam("id") Long id) {
reportDocumentMainService.deleteReportDocumentMain(id); reportDocumentMainService.deleteReportDocumentMain(id);
return success(true); return success(true);
@@ -118,7 +118,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测报告业务") @Operation(summary = "批量删除检测报告业务")
@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:delete')")
public CommonResult<Boolean> deleteReportDocumentMainList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteReportDocumentMainList(@RequestBody BatchDeleteReqVO req) {
reportDocumentMainService.deleteReportDocumentMainListByIds(req.getIds()); reportDocumentMainService.deleteReportDocumentMainListByIds(req.getIds());
return success(true); return success(true);
@@ -127,7 +127,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得检测报告业务") @Operation(summary = "获得检测报告业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ReportDocumentMainRespVO> getReportDocumentMain(@RequestParam("id") Long id) { public CommonResult<ReportDocumentMainRespVO> getReportDocumentMain(@RequestParam("id") Long id) {
ReportDocumentMainDO reportDocumentMain = reportDocumentMainService.getReportDocumentMain(id); ReportDocumentMainDO reportDocumentMain = reportDocumentMainService.getReportDocumentMain(id);
return success(BeanUtils.toBean(reportDocumentMain, ReportDocumentMainRespVO.class)); return success(BeanUtils.toBean(reportDocumentMain, ReportDocumentMainRespVO.class));
@@ -135,7 +135,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得检测报告业务分页") @Operation(summary = "获得检测报告业务分页")
@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
public CommonResult<PageResult<ReportDocumentMainRespVO>> getReportDocumentMainPage(@Valid ReportDocumentMainPageReqVO pageReqVO) { public CommonResult<PageResult<ReportDocumentMainRespVO>> getReportDocumentMainPage(@Valid ReportDocumentMainPageReqVO pageReqVO) {
PageResult<ReportDocumentMainDO> pageResult = reportDocumentMainService.getReportDocumentMainPage(pageReqVO); PageResult<ReportDocumentMainDO> pageResult = reportDocumentMainService.getReportDocumentMainPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ReportDocumentMainRespVO.class)); return success(BeanUtils.toBean(pageResult, ReportDocumentMainRespVO.class));
@@ -143,7 +143,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出检测报告业务 Excel") @Operation(summary = "导出检测报告业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:report-document-main:export')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportReportDocumentMainExcel(@Valid ReportDocumentMainPageReqVO pageReqVO, public void exportReportDocumentMainExcel(@Valid ReportDocumentMainPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentTypeController.java
View File

@@ -39,7 +39,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@PostMapping("/save") @PostMapping("/save")
@Operation(summary = "更新报告类型配置") @Operation(summary = "更新报告类型配置")
@PreAuthorize("@ss.hasPermission('qms:report-document-type:update')") //@PreAuthorize("@ss.hasPermission('qms:report-document-type:update')")
public CommonResult<String> updateReportDocumentType(@Valid @RequestBody ReportDocumentTypeSaveReqVO updateReqVO) { public CommonResult<String> updateReportDocumentType(@Valid @RequestBody ReportDocumentTypeSaveReqVO updateReqVO) {
return reportDocumentTypeService.save(updateReqVO); return reportDocumentTypeService.save(updateReqVO);
} }
@@ -47,7 +47,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除报告类型配置") @Operation(summary = "删除报告类型配置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')")
public CommonResult<Boolean> deleteReportDocumentType(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteReportDocumentType(@RequestParam("id") Long id) {
reportDocumentTypeService.deleteReportDocumentType(id); reportDocumentTypeService.deleteReportDocumentType(id);
return success(true); return success(true);
@@ -56,7 +56,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@DeleteMapping("/delete-list") @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除报告类型配置") @Operation(summary = "批量删除报告类型配置")
@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')") //@PreAuthorize("@ss.hasPermission('qms:report-document-type:delete')")
public CommonResult<Boolean> deleteReportDocumentTypeList(@RequestBody BatchDeleteReqVO req) { public CommonResult<Boolean> deleteReportDocumentTypeList(@RequestBody BatchDeleteReqVO req) {
reportDocumentTypeService.deleteReportDocumentTypeListByIds(req.getIds()); reportDocumentTypeService.deleteReportDocumentTypeListByIds(req.getIds());
return success(true); return success(true);
@@ -65,7 +65,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得报告类型配置") @Operation(summary = "获得报告类型配置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @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<ReportDocumentTypeRespVO> getReportDocumentType(@RequestParam("id") Long id) { public CommonResult<ReportDocumentTypeRespVO> getReportDocumentType(@RequestParam("id") Long id) {
ReportDocumentTypeDO reportDocumentType = reportDocumentTypeService.getReportDocumentType(id); ReportDocumentTypeDO reportDocumentType = reportDocumentTypeService.getReportDocumentType(id);
return success(BeanUtils.toBean(reportDocumentType, ReportDocumentTypeRespVO.class)); return success(BeanUtils.toBean(reportDocumentType, ReportDocumentTypeRespVO.class));
@@ -73,7 +73,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得报告类型配置分页") @Operation(summary = "获得报告类型配置分页")
@PreAuthorize("@ss.hasPermission('qms:report-document-type:query')") //@PreAuthorize("@ss.hasPermission('qms:report-document-type:query')")
public CommonResult<PageResult<ReportDocumentTypeRespVO>> getReportDocumentTypePage(@Valid ReportDocumentTypePageReqVO pageReqVO) { public CommonResult<PageResult<ReportDocumentTypeRespVO>> getReportDocumentTypePage(@Valid ReportDocumentTypePageReqVO pageReqVO) {
PageResult<ReportDocumentTypeDO> pageResult = reportDocumentTypeService.getReportDocumentTypePage(pageReqVO); PageResult<ReportDocumentTypeDO> pageResult = reportDocumentTypeService.getReportDocumentTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ReportDocumentTypeRespVO.class)); return success(BeanUtils.toBean(pageResult, ReportDocumentTypeRespVO.class));
@@ -81,7 +81,7 @@ public class ReportDocumentTypeController implements BusinessControllerMarker {
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出报告类型配置 Excel") @Operation(summary = "导出报告类型配置 Excel")
@PreAuthorize("@ss.hasPermission('qms:report-document-type:export')") //@PreAuthorize("@ss.hasPermission('qms:report-document-type:export')")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportReportDocumentTypeExcel(@Valid ReportDocumentTypePageReqVO pageReqVO, public void exportReportDocumentTypeExcel(@Valid ReportDocumentTypePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/sampleflow/SampleFlowNode.java
View File

@@ -20,7 +20,7 @@ public class SampleFlowNode implements Serializable {
private String nodeName; private String nodeName;
/** 是否默认流程 **/ /** 是否默认流程 **/
private Boolean isDefault; private Boolean isDefault = false;
/** 条件 **/ /** 条件 **/
private String condition; private String condition;

4
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
View File

@@ -44,7 +44,7 @@
LEFT JOIN T_CFG_ASY_MTHD tcam ON LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbatd.CFG_ASY_MTHD_ID = tcam.ID tbatd.CFG_ASY_MTHD_ID = tcam.ID
WHERE WHERE
tbatd.SMP_FLW_NDE_KY = 'flw_fx_receive' tbatd.SMP_FLW_NDE_KY = 'flw_analysis'
AND tbatd.DELETED = 0 AND tbatd.DELETED = 0
GROUP BY GROUP BY
tbatd.CFG_ASY_MTHD_ID, tbatd.CFG_ASY_MTHD_ID,
@@ -71,7 +71,7 @@
LEFT JOIN T_BSN_SB_SMP tbss ON LEFT JOIN T_BSN_SB_SMP tbss ON
tbatd.BSN_SB_SMP_ID = tbss.ID tbatd.BSN_SB_SMP_ID = tbss.ID
WHERE tbatd.IS_ASN_TSKD = 0 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 , GROUP BY tbss.ID ,
tbss.SMP_NAME , tbss.SMP_NAME ,
tbss.SMP_CD , tbss.SMP_CD ,