feat:阶段性代码合并
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
package com.zt.plat.module.qms.business.bus.controller.admin;
|
||||
|
||||
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataPageReqVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataSaveReqVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import jakarta.validation.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
@@ -20,9 +23,8 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
|
||||
@@ -42,14 +44,14 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建检测参数数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
|
||||
public CommonResult<BusinessAssayParameterDataRespVO> createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) {
|
||||
return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新检测参数数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
|
||||
public CommonResult<Boolean> updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) {
|
||||
businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO);
|
||||
return success(true);
|
||||
@@ -58,7 +60,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除检测参数数据业务")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayParameterData(@RequestParam("id") Long id) {
|
||||
businessAssayParameterDataService.deleteBusinessAssayParameterData(id);
|
||||
return success(true);
|
||||
@@ -67,7 +69,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除检测参数数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) {
|
||||
businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -76,7 +78,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得检测参数数据业务")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
|
||||
public CommonResult<BusinessAssayParameterDataRespVO> getBusinessAssayParameterData(@RequestParam("id") Long id) {
|
||||
BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id);
|
||||
return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class));
|
||||
@@ -84,7 +86,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得检测参数数据业务分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
|
||||
public CommonResult<PageResult<BusinessAssayParameterDataRespVO>> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) {
|
||||
PageResult<BusinessAssayParameterDataDO> pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class));
|
||||
@@ -92,7 +94,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出检测参数数据业务 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
package com.zt.plat.module.qms.business.bus.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataPageReqVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataSaveReqVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import jakarta.validation.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
@@ -43,14 +45,14 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建检测项目数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
|
||||
public CommonResult<BusinessAssayProjectDataRespVO> createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) {
|
||||
return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新检测项目数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
|
||||
public CommonResult<Boolean> updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) {
|
||||
businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO);
|
||||
return success(true);
|
||||
@@ -59,7 +61,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除检测项目数据业务")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayProjectData(@RequestParam("id") Long id) {
|
||||
businessAssayProjectDataService.deleteBusinessAssayProjectData(id);
|
||||
return success(true);
|
||||
@@ -68,7 +70,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除检测项目数据业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) {
|
||||
businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -77,7 +79,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得检测项目数据业务")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
|
||||
public CommonResult<BusinessAssayProjectDataRespVO> getBusinessAssayProjectData(@RequestParam("id") Long id) {
|
||||
BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id);
|
||||
return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class));
|
||||
@@ -85,7 +87,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得检测项目数据业务分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
|
||||
public CommonResult<PageResult<BusinessAssayProjectDataRespVO>> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) {
|
||||
PageResult<BusinessAssayProjectDataDO> pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class));
|
||||
@@ -93,7 +95,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出检测项目数据业务 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.qms.business.bus.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -10,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import jakarta.validation.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
@@ -42,14 +42,14 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建子样检测任务业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
|
||||
public CommonResult<BusinessAssayTaskDataRespVO> createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) {
|
||||
return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新子样检测任务业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
|
||||
public CommonResult<Boolean> updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) {
|
||||
businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO);
|
||||
return success(true);
|
||||
@@ -58,7 +58,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除子样检测任务业务")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayTaskData(@RequestParam("id") Long id) {
|
||||
businessAssayTaskDataService.deleteBusinessAssayTaskData(id);
|
||||
return success(true);
|
||||
@@ -67,7 +67,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除子样检测任务业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) {
|
||||
businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -76,7 +76,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得子样检测任务业务")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<BusinessAssayTaskDataRespVO> getBusinessAssayTaskData(@RequestParam("id") Long id) {
|
||||
BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id);
|
||||
return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class));
|
||||
@@ -84,15 +84,23 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
|
||||
@GetMapping("/getUnAssayTaskGroupList")
|
||||
@Operation(summary = "获得未指派的子样检测任务业务分组列表")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<?> getUnAssayTaskGroupList() {
|
||||
List<Map<String, Object>> list = businessAssayTaskDataService.getUnAssayTaskGroupList();
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
|
||||
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
@GetMapping("/getUnAuditTaskGroupList")
|
||||
@Operation(summary = "获得未审核的子样检测任务业务分组列表")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
|
||||
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
@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) {
|
||||
List<BusinessAssayTaskDataExtendRespVO> listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO);
|
||||
return success(listResult);
|
||||
@@ -100,7 +108,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得子样检测任务业务分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<PageResult<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) {
|
||||
PageResult<BusinessAssayTaskDataExtendRespVO> pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
@@ -108,7 +116,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出子样检测任务业务 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,8 @@
|
||||
package com.zt.plat.module.qms.business.bus.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSamplePageReqVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleSaveReqVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import jakarta.validation.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
@@ -42,14 +44,14 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建主样业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
|
||||
public CommonResult<BusinessBaseSampleRespVO> createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) {
|
||||
return success(businessBaseSampleService.createBusinessBaseSample(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新主样业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
|
||||
public CommonResult<Boolean> updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) {
|
||||
businessBaseSampleService.updateBusinessBaseSample(updateReqVO);
|
||||
return success(true);
|
||||
@@ -58,7 +60,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除主样业务")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessBaseSample(@RequestParam("id") Long id) {
|
||||
businessBaseSampleService.deleteBusinessBaseSample(id);
|
||||
return success(true);
|
||||
@@ -67,7 +69,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除主样业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) {
|
||||
businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -76,7 +78,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得主样业务")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
|
||||
public CommonResult<BusinessBaseSampleRespVO> getBusinessBaseSample(@RequestParam("id") Long id) {
|
||||
BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id);
|
||||
return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class));
|
||||
@@ -84,7 +86,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得主样业务分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
|
||||
public CommonResult<PageResult<BusinessBaseSampleRespVO>> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) {
|
||||
PageResult<BusinessBaseSampleDO> pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class));
|
||||
@@ -92,7 +94,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出主样业务 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package com.zt.plat.module.qms.business.bus.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubExtendRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubPageReqVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubSaveReqVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import jakarta.validation.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
@@ -42,14 +45,14 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建子样交接记录业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
|
||||
public CommonResult<BusinessHandoverRecordSubRespVO> createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) {
|
||||
return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新子样交接记录业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
|
||||
public CommonResult<Boolean> updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) {
|
||||
businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO);
|
||||
return success(true);
|
||||
@@ -58,7 +61,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除子样交接记录业务")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) {
|
||||
businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id);
|
||||
return success(true);
|
||||
@@ -67,7 +70,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除子样交接记录业务")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
|
||||
public CommonResult<Boolean> deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) {
|
||||
businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -76,7 +79,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得子样交接记录业务")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
|
||||
public CommonResult<BusinessHandoverRecordSubRespVO> getBusinessHandoverRecordSub(@RequestParam("id") Long id) {
|
||||
BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id);
|
||||
return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class));
|
||||
@@ -84,7 +87,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得子样交接记录业务分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
|
||||
public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) {
|
||||
PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
@@ -92,7 +95,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出子样交接记录业务 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user