feat:qms阶段性提交
This commit is contained in:
@@ -25,6 +25,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
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;
|
||||
@@ -36,6 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-parameter-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayParameterDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -37,6 +39,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-project-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayProjectDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-report-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayReportDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -24,9 +24,13 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
import com.zt.plat.framework.security.core.LoginUser;
|
||||
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
|
||||
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskService;
|
||||
@@ -37,6 +41,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-task")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayTaskController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
@@ -89,6 +94,10 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
|
||||
@Operation(summary = "获得检测任务分配业务分页")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
|
||||
public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) {
|
||||
if (pageReqVO.getDeptId() == null) {
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
pageReqVO.setDeptId(loginUser.getVisitDeptId());
|
||||
}
|
||||
PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
}
|
||||
|
||||
@@ -21,9 +21,13 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
import com.zt.plat.framework.security.core.LoginUser;
|
||||
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.*;
|
||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
|
||||
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDataService;
|
||||
@@ -34,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-task-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayTaskDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
@@ -86,6 +91,10 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
@Operation(summary = "获得未指派的子样检测任务业务分组列表")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
|
||||
if (reqVO.getAssayDepartmentId() == null) {
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
|
||||
}
|
||||
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
|
||||
return success(list);
|
||||
}
|
||||
@@ -94,6 +103,10 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
|
||||
@Operation(summary = "获得未审核的子样检测任务业务分组列表")
|
||||
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
|
||||
public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
|
||||
if (reqVO.getAssayDepartmentId() == null) {
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
|
||||
}
|
||||
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-task-detail")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayTaskDetailController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-assay-task-parameter-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessAssayTaskParameterDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-base-sample")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessBaseSampleController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -37,6 +39,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-handover-record-sub")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessHandoverRecordSubController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@ 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 com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
@RestController
|
||||
@RequestMapping("/qms/business-qc-coefficient-data")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
public class BusinessQCCoefficientDataController implements BusinessControllerMarker {
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user