feat:qms阶段性提交

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

@@ -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 {
 
 

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

@@ -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 {
 
 

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

@@ -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 {
 
 

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

@@ -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);
     }

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

@@ -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);
     }

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

@@ -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 {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskParameterDataController.java

@@ -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 {
 
 

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

@@ -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 {
 
 

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

@@ -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 {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java

@@ -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 {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientParameterDataController.java

@@ -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-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCCoefficientParameterDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java

@@ -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-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java

@@ -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-management-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementParameterDataController.java

@@ -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-management-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementParameterDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementProjectDataController.java

@@ -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-management-project-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementProjectDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementSampleParameterDataController.java

@@ -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-management-sample-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementSampleParameterDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCParameterDataController.java

@@ -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-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCParameterDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCProjectDataController.java

@@ -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-project-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCProjectDataController implements BusinessControllerMarker {
 
 

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

@@ -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-quality-control-sample-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQualityControlSampleProjectController implements BusinessControllerMarker {
 
 

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

@@ -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-sample-assay-result")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleAssayResultController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java

@@ -31,6 +31,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;
@@ -46,6 +48,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchService
 @RestController
 @RequestMapping("/qms/business-sample-dispatch")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleDispatchController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java

@@ -25,6 +25,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;
@@ -41,6 +43,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailS
 @RestController
 @RequestMapping("/qms/business-sample-dispatch-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleDispatchDetailController implements BusinessControllerMarker {
 
 

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

@@ -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-sample-entrust-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustDetailController implements BusinessControllerMarker {
 
 

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

@@ -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-sample-entrust-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustProjectController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-entrust-registration")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustRegistrationController implements BusinessControllerMarker {
 
 

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

@@ -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-sample-handover")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleHandoverController {
 
 

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

@@ -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-sample-handover-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleHandoverDetailController implements BusinessControllerMarker {
 
 

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

@@ -20,6 +20,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;
@@ -33,6 +35,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-standard-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessStandardSampleController implements BusinessControllerMarker {
 
 

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

@@ -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-standard-sample-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessStandardSampleProjectController implements BusinessControllerMarker {
 
 

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

@@ -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-sub-parent-sample-assessment")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubParentSampleAssessmentController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentProjectController.java

@@ -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-sub-parent-sample-assessment-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubParentSampleAssessmentProjectController implements BusinessControllerMarker {
 
 

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

@@ -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-sub-parent-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubParentSampleController implements BusinessControllerMarker {
 
 

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

@@ -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-sub-sample-analysis-group")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleAnalysisGroupController implements BusinessControllerMarker {
 
 

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

@@ -20,6 +20,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;
@@ -33,6 +35,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sub-sample-assessment")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleAssessmentController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentProjectController.java

@@ -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-sub-sample-assessment-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleAssessmentProjectController implements BusinessControllerMarker {
 
 

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

@@ -22,9 +22,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.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDataService;
@@ -37,6 +41,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sub-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleController implements BusinessControllerMarker {
 
 
@@ -118,6 +123,10 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @Operation(summary = "获得子样分析部门分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
     public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getAnalysisGroupPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+    	if (pageReqVO.getAssayDepartmentId() == null) {
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            pageReqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
         PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getAnalysisGroupPage(pageReqVO);
         return success(pageResult);
     }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleParentRetestController.java

@@ -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-sub-sample-parent-retest")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleParentRetestController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessXRFDataController.java

@@ -20,6 +20,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;
@@ -33,6 +35,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-xrf-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessXRFDataController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
@@ -26,6 +27,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,6 +25,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleAnalysisController implements BusinessControllerMarker {
 	
 	@Resource

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleEntrustController.java

@@ -20,6 +20,7 @@ import com.yomahub.liteflow.flow.LiteflowResponse;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustParam;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
@@ -34,6 +35,7 @@ import jakarta.validation.Valid;
 @RestController
 @RequestMapping("/qms/bus/sample/entrust")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleEntrustController implements BusinessControllerMarker {
 
     @Resource

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

@@ -10,6 +10,7 @@ import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowParam;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleFlowContext;
 import com.zt.plat.module.qms.business.bus.service.SampleFlowService;
@@ -24,6 +25,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/flow")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleFlowController implements BusinessControllerMarker {
 	
 	@Resource

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleReportDataQueryController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
 import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;
 
@@ -20,6 +21,7 @@ import jakarta.annotation.Resource;
  */
 @RestController
 @RequestMapping("/qms/bus/sample/reporting-data-query")
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleReportDataQueryController {
     
     @Resource

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleResultReportingController.java

@@ -8,6 +8,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+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.service.SampleResultReportingService;
 
@@ -29,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @RestController
 @RequestMapping("/qms/bus/sample/result-reporting")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleResultReportingController implements BusinessControllerMarker {
 	
 	@Resource
@@ -37,6 +41,10 @@ public class SampleResultReportingController implements BusinessControllerMarker
 	//获取未上报的方法
 	@GetMapping("/getUnReportMethodGroupList")
 	public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+    	if (reqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
 		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
 		return success(list);
 	}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java

@@ -15,6 +15,9 @@ import java.util.List;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+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.liteflow.param.SampleTaskAssignManualParam;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
@@ -31,6 +34,7 @@ import jakarta.annotation.Resource;
 @RestController
 @RequestMapping("/qms/bus/sample/task-assign")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@Resource
@@ -52,6 +56,10 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@GetMapping("/getAssaySampleList")
 	public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
+    	if (reqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
 		List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
 		return success(list);
 	} 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/TestController.java

@@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSON;
 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 com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
 import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
 
 
 @RestController
 @RequestMapping("/qms/bus/test")
+@DeptDataPermissionIgnore(enable = "true")
 public class TestController {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataExternalInfomation.java

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+public class BusinessAssayTaskDataExternalInfomation implements Serializable {
+
+	private static final long serialVersionUID = 2740738762124170770L;
+	
+	/** 是否退回 **/
+	private Integer isRollback;
+	
+	/** 回退详情 **/
+	private List<RollbackDetail> rollbackDetailList;
+
+	@Data
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class RollbackDetail {
+
+		/**
+		 * 退回人ID
+		 */
+		private Long rollbackOperId;
+
+		/**
+		 * 退回人
+		 */
+		private String rollbackOper;
+		
+		/**
+		 * 退回原因
+		 */
+		private String rollbackReason;
+		
+		/**
+		 * 退回时间 yyyy-MM-dd HH:mm:ss
+		 */
+		private String rollbackTime;
+	}
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java

@@ -88,6 +88,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "复测次数", example = "28081")
     private Integer retestCount;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java

@@ -86,6 +86,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "复测次数", example = "28081")
     private Integer retestCount;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java

@@ -111,6 +111,9 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("复测次数")
     private Integer retestCount;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     @ExcelProperty("乐观锁")
     private Integer updateCount;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java

@@ -96,6 +96,9 @@ public class BusinessAssayTaskDataSaveReqVO {
     @Schema(description = "复测次数", example = "28081")
     private Integer retestCount;
 
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     private Integer updateCount;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java

@@ -150,6 +150,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField("RTST_CNT")
     private Integer retestCount;
     /**
+    * 扩展信息
+    */
+    @TableField("EXT_INF")
+    private String externalInfomation;
+    /**
     * 乐观锁
     */
     @TableField("UPD_CNT")

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

@@ -333,7 +333,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 			//样品类型字典与委托一致
 			businessBaseSampleDO.setDictionaryBusinessId(businessSampleEntrustDetailDO.getSampleTypeDictionaryBusinessId());
 			//生成样品编号
-			String sampleCode = sequenceUtil.genCode(configBaseSample.getCodeRule());
+			String sampleCode = businessSampleEntrustDetailDO.getEntrustSampleCode();//默认取来样编号
+			if (StringUtils.isNotBlank(configBaseSample.getCodeRule())) {//如果配置了样品编号生成规则，则以生成规则为准
+				sampleCode = sequenceUtil.genCode(configBaseSample.getCodeRule());
+			}
 			businessBaseSampleDO.setSampleCode(sampleCode);
 			//样品生成时间为当前时间
 			businessBaseSampleDO.setSampleTime(currentDateTime);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java

@@ -98,6 +98,8 @@ public class SampleTaskAssignManualCmp extends NodeComponent {
 				businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
 				businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
 				businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
+				businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
+				businessAssayTaskDO.setIngredientsStatus("initial");
 
 				businessAssayTaskDO.setTaskAssignOperator(loginRealname);
 				businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java

@@ -103,6 +103,8 @@ public class SampleTaskAssignMethodCmp extends NodeComponent {
 				businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
 				businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName());
 				businessAssayTaskDO.setAssayOperatorId(assignAssayUser.getUserId());
+				businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
+				businessAssayTaskDO.setIngredientsStatus("initial");
 				
 				businessAssayTaskDO.setTaskAssignOperator(loginRealname);
 				businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java

@@ -98,6 +98,8 @@ public class SampleTaskAssignSampleCmp extends NodeComponent {
 				businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
 				businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
 				businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
+				businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
+				businessAssayTaskDO.setIngredientsStatus("initial");
 
 				businessAssayTaskDO.setTaskAssignOperator(loginRealname);
 				businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java

@@ -327,49 +327,54 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	        List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
 	        List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
 	        
-	        for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
+	        for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) {
-	        	BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null);
-	        	
 	            Map<String, Object> map = new HashedMap<>();
-	            map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
+
-	            map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId());
-	            map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId());
-	            map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId());
-	            map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId());
 	            map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId());
 	            map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode());
 	            map.put("sampleName", businessAssayTaskDetailDO.getSampleName());
 	            map.put("analysisType", "analysis");
 	            map.put("assayTime", businessAssayTaskJson.get("assayTime"));
+	            map.put("taskDetailRemark", businessAssayTaskDetailDO.getRemark());
 	            
-	            List<BusinessAssayProjectAndParameterRespVO> businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId()));
+	        	if (!"returned".equals(businessAssayTaskDetailDO.getRollbackStatus())) {
-	            for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) {
+	        		BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataList.stream().filter(f -> businessAssayTaskDetailDO.getBusinessAssayTaskDataId().equals(f.getId())).findFirst().orElse(null);
-					map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue());
+		            map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
-				}
+		            map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId());
+		            map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId());
+		            map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId());
+		            map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId());
+		            
+		            List<BusinessAssayProjectAndParameterRespVO> businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId()));
+		            for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) {
+						map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue());
+					}
 
-	            BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
+		            BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
-	            projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+		            projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
-	            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
+		            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
-	            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
+		            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
-                	String ev = ep.getValue();
+	                	String ev = ep.getValue();
-                	if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
+	                	if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
-                		ev = ep.getSymbol() + ev;
+	                		ev = ep.getSymbol() + ev;
-					}
-	            	map.put(ep.getName(), ev);
-					if (StringUtils.isNotEmpty(ep.getFormula())) {
-		        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
-		        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
-		                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
-		                for (BusinessAssayProjectAndParameterRespVO p : plist) {
-		                	String v = p.getValue();
-		                	if (StringUtils.isNotBlank(p.getSymbol()) && !"=".equals(p.getSymbol())) {
-								v = p.getSymbol() + v;
-							}
-		                	map.put(p.getName(), v);
 						}
+		            	map.put(ep.getName(), ev);
+						if (StringUtils.isNotEmpty(ep.getFormula())) {
+			        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
+			        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
+			                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
+			                for (BusinessAssayProjectAndParameterRespVO p : plist) {
+			                	String v = p.getValue();
+			                	if (StringUtils.isNotBlank(p.getSymbol()) && !"=".equals(p.getSymbol())) {
+									v = p.getSymbol() + v;
+								}
+			                	map.put(p.getName(), v);
+							}
+						}
+						
 					}
-					
 				}
+	        	
 	            datas.add(map);
 	        }
 
@@ -451,54 +456,65 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
 	        List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
 	        
-	        for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
+	        for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) {
-	        	BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null);
+	        	//BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null);
 	        	
 	        	HashedMap<String, Object> map = new HashedMap<>();
-	            map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
-	            map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId());
-	            map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId());
-	            map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId());
-	            map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId());
 	            map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId());
 	            map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode());
 	            map.put("sampleName", businessAssayTaskDetailDO.getSampleName());
 	            map.put("analysisType", "analysis");
 	            map.put("assayTime", businessAssayTaskJson.get("assayTime"));
+	            map.put("taskDetailRemark", businessAssayTaskDetailDO.getRemark());
 	            
-	            List<BusinessAssayProjectAndParameterRespVO> businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId()));
+
-	            for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) {
+	        	if (!"returned".equals(businessAssayTaskDetailDO.getRollbackStatus())) {
-					map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue());
+	        		BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataList.stream().filter(f -> businessAssayTaskDetailDO.getBusinessAssayTaskDataId().equals(f.getId())).findFirst().orElse(null);
+
+		            map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
+		            map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId());
+		            map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId());
+		            map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId());
+		            map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId());
+		            
+		            List<BusinessAssayProjectAndParameterRespVO> businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectByBusinessAssayTaskDataIds(Arrays.asList(businessAssayTaskDataDO.getId()));
+		            for (BusinessAssayProjectAndParameterRespVO businessAssayTaskParameterDataDO : businessAssayTaskParameterDataList) {
+						map.put(businessAssayTaskParameterDataDO.getName(), businessAssayTaskParameterDataDO.getValue());
+					}
+
+		            BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
+		            projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+		            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
+		            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
+		            	HashedMap<String, Object> newMap = SerializationUtils.clone(map);
+		            	String projectSymbol = "";
+		            	if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
+		            		projectSymbol = ep.getSymbol();
+						}
+//		            	newMap.put(ep.getName(), ep.getValue());
+		            	newMap.put("projectName", ep.getShowName());
+		            	newMap.put("projectValue", ep.getValue());
+		            	newMap.put("projectSymbol", projectSymbol);
+		            	newMap.put("projectUnit", ep.getUnit());
+						if (StringUtils.isNotEmpty(ep.getFormula())) {
+			        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
+			        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
+			                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
+			                for (BusinessAssayProjectAndParameterRespVO p : plist) {
+			                	String v = p.getValue();
+			                	if (StringUtils.isNotBlank(p.getSymbol()) && !"=".equals(p.getSymbol())) {
+									v = p.getSymbol() + v;
+								}
+			                	newMap.put(p.getName(), v);
+							}
+						}
+			            datas.add(newMap);
+					}
+	        		
+	        	} else {
+	        		datas.add(map);
 				}
 
-	            BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
-	            projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
-	            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
-	            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
-	            	HashedMap<String, Object> newMap = SerializationUtils.clone(map);
-	            	String projectSymbol = "";
-	            	if (StringUtils.isNotBlank(ep.getSymbol()) && !"=".equals(ep.getSymbol())) {
-	            		projectSymbol = ep.getSymbol();
-					}
-//	            	newMap.put(ep.getName(), ep.getValue());
-	            	newMap.put("projectName", ep.getShowName());
-	            	newMap.put("projectValue", ep.getValue());
-	            	newMap.put("projectSymbol", projectSymbol);
-	            	newMap.put("projectUnit", ep.getUnit());
-					if (StringUtils.isNotEmpty(ep.getFormula())) {
-		        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
-		        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
-		                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
-		                for (BusinessAssayProjectAndParameterRespVO p : plist) {
-		                	String v = p.getValue();
-		                	if (StringUtils.isNotBlank(p.getSymbol()) && !"=".equals(p.getSymbol())) {
-								v = p.getSymbol() + v;
-							}
-		                	newMap.put(p.getName(), v);
-						}
-					}
-		            datas.add(newMap);
-				}
 	        }
 
 			List<BusinessQCManagementDataDO> businessQCManagementDataDOList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
@@ -674,8 +690,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 							Long dictionaryProjectId = businessAssayProjectDataDOEntry.getKey();
 							List<BusinessAssayProjectDataDO> val1 = businessAssayProjectDataDOEntry.getValue();
 							BusinessAssayProjectDataDO businessAssayProjectDataDO = val1.get(0);
-							List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>().eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessAssayTaskDataDO.getConfigAssayMethodId()).eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessAssayProjectDataDO.getConfigAssayMethodProjectId()));
+							List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectByConfigBaseSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(configSubSampleMethodDO.getConfigBaseSampleId(), businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
-
+							
 							//查询判定结果数据
 							BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
 							if (businessSubSampleAssessmentProjectDO == null) {
@@ -1189,9 +1205,10 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
         //设置判定值
         businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString());
         
-		List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
+//		List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
-				.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodId())
+//				.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodId())
-				.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId()));
+//				.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId()));
+        List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectByConfigBaseSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(configSubSampleMethodDO.getConfigBaseSampleId(), businessSubSampleAssessmentProjectDO.getConfigAssayMethodId(), businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId());
         
         // 查找匹配的允差规则
         ConfigAssayMethodProjectAssessmentDO matchedRule = findMatchingRule(configAssayMethodProjectAssessmentDOList, representativeValue);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java

@@ -21,8 +21,10 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.common.exception.ServiceException;
+import com.zt.plat.framework.common.util.date.DateUtils;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+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.BatchSampleAnalysisColumnRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataExtendRespVO;
@@ -34,6 +36,8 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalys
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskBackSampleReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataExtendRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataExternalInfomation;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataExternalInfomation.RollbackDetail;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCManagementParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCManagementProjectDataReqVO;
@@ -96,6 +100,8 @@ import com.zt.plat.module.qms.enums.QmsCommonConstant;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import jakarta.annotation.Resource;
 
 @Service
@@ -1317,14 +1323,56 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 
 	@Override
 	public void rollbackAnalysisSample(BusinessAssayTaskBackSampleReqVO req) {
+		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+		String loginUserNickname = SecurityFrameworkUtils.getLoginUserNickname();
 		List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByIds(req.getIdList());
 		for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) {
 			
 			businessAssayTaskDetailDO.setRollbackStatus("returned");
 			businessAssayTaskDetailDO.setRemark(req.getBackDesc());
 		}
+		List<Long> businessAssayTaskDataIdList = businessAssayTaskDetailList.stream().map(m -> m.getBusinessAssayTaskDataId()).collect(Collectors.toList());
+		List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByIds(businessAssayTaskDataIdList);
+		for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataDOList) {
+			businessAssayTaskDataDO.setBusinessAssayTaskId(null);
+	    	businessAssayTaskDataDO.setAssayOperatorId(null);
+	    	businessAssayTaskDataDO.setAssayOperator(null);
+	    	businessAssayTaskDataDO.setAssignTaskTime(null);
+	    	businessAssayTaskDataDO.setIsAssignTasked(0);
+	    	
+	    	BusinessAssayTaskDataExternalInfomation businessAssayTaskDataExternalInfomation = null;
+	    	String externalInfomation = businessAssayTaskDataDO.getExternalInfomation();
+	    	if (StringUtils.isNotBlank(externalInfomation)) {
+	    		businessAssayTaskDataExternalInfomation = JSON.parseObject(externalInfomation, BusinessAssayTaskDataExternalInfomation.class);
+			} else {
+				businessAssayTaskDataExternalInfomation = new BusinessAssayTaskDataExternalInfomation();
+			}
+	    	
+	    	businessAssayTaskDataExternalInfomation.setIsRollback(QmsCommonConstant.YES);
+	    	
+	    	List<RollbackDetail> rollbackDetailList = businessAssayTaskDataExternalInfomation.getRollbackDetailList();
+	    	if (CollUtil.isEmpty(rollbackDetailList)) {
+	    		rollbackDetailList = new ArrayList<>();
+			}
+	    	//回退详情
+	    	RollbackDetail rollbackDetail = new RollbackDetail();
+	    	rollbackDetail.setRollbackOperId(loginUser.getId());
+	    	rollbackDetail.setRollbackOper(loginUserNickname);
+	    	rollbackDetail.setRollbackReason(req.getBackDesc());
+	    	rollbackDetail.setRollbackTime(DateUtil.formatLocalDateTime(LocalDateTime.now()));
+	    	rollbackDetailList.add(rollbackDetail);
+	    	
+	    	businessAssayTaskDataExternalInfomation.setRollbackDetailList(rollbackDetailList);
+	    	businessAssayTaskDataDO.setExternalInfomation(JSON.toJSONString(businessAssayTaskDataExternalInfomation));
+	    	
+		}
 		
-		businessAssayTaskDetailMapper.updateBatch(businessAssayTaskDetailList);
+		if (CollUtil.isNotEmpty(businessAssayTaskDetailList)) {
+			businessAssayTaskDetailMapper.updateBatch(businessAssayTaskDetailList);
+		}
+		if (CollUtil.isNotEmpty(businessAssayTaskDataDOList)) {
+			businessAssayTaskDataMapper.updateBatch(businessAssayTaskDataDOList);
+		}
 	}
 
 	@Override

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

@@ -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 com.zt.plat.module.qms.business.config.service.BaseSampleService;
 @RestController
 @RequestMapping("/qms/base-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BaseSampleController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -36,6 +38,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigAssayMethodService;
 @RestController
 @RequestMapping("/qms/config-assay-method")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigAssayMethodParameterController.java

@@ -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/config-assay-method-parameter")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodParameterController implements BusinessControllerMarker {
 
 

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

@@ -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/config-assay-method-project-assessment")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodProjectAssessmentController implements BusinessControllerMarker {
 
 

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

@@ -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/config-assay-method-project-coefficient")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodProjectCoefficientController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigAssayMethodProjectSe
 @RestController
 @RequestMapping("/qms/config-assay-method-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodProjectController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigAssayMethodProjectPa
 @RestController
 @RequestMapping("/qms/config-assay-method-project-parameter")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodProjectParameterController implements BusinessControllerMarker {
 
 

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

@@ -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/config-assay-method-project-range")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigAssayMethodProjectRangeController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigBaseSampleService;
 @RestController
 @RequestMapping("/qms/config-base-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigBaseSampleController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -39,6 +41,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigEntrustSourceService
 @RestController
 @RequestMapping("/qms/config-entrust-source")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigEntrustSourceController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigEntrustSourceSampleTypeController.java

@@ -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/config-entrust-source-sample-type")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigEntrustSourceSampleTypeController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigPermissionController.java

@@ -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 com.zt.plat.module.qms.business.config.service.ConfigPermissionService;
 @RestController
 @RequestMapping("/qms/config-permission")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigPermissionController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigProjectService;
 @RestController
 @RequestMapping("/qms/config-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigProjectController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodController.java

@@ -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/config-qc-sample-method")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigQCSampleMethodController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodParameterController.java

@@ -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/config-QC-sample-method-parameter")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigQCSampleMethodParameterController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCStandardSampleController.java

@@ -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/config-qc-standard-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigQCStandardSampleController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigReportFieldService;
 @RestController
 @RequestMapping("/qms/config-report-field")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigReportFieldController implements BusinessControllerMarker {
 
 

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

@@ -20,6 +20,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;
@@ -33,6 +35,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigReportTemplateServic
 @RestController
 @RequestMapping("/qms/config-report-template")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigReportTemplateController implements BusinessControllerMarker {
 
     @Resource

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigReportTypeService;
 @RestController
 @RequestMapping("/qms/config-report-type")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigReportTypeController implements BusinessControllerMarker {
 
 

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

@@ -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/config-rule")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigRuleController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigSampleFlowService;
 @RestController
 @RequestMapping("/qms/config-sample-flow")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSampleFlowController implements BusinessControllerMarker {
 
 

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

@@ -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/config-sample-handover")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSampleHandoverController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigSampleReportService;
 @RestController
 @RequestMapping("/qms/config-sample-report")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSampleReportController implements BusinessControllerMarker {
 
 

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

@@ -20,6 +20,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;
@@ -35,6 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/config-simple-flow-code")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSimpleFlowCodeController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -39,6 +41,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/config-simple-flow-rule")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSimpleFlowRuleController implements BusinessControllerMarker {
 
     @Resource

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigStandardSampleProjec
 @RestController
 @RequestMapping("/qms/config-standard-sample-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigStandardSampleProjectController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigStandardSampleTypeSe
 @RestController
 @RequestMapping("/qms/config-standard-sample-type")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigStandardSampleTypeController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigSubSampleService;
 @RestController
 @RequestMapping("/qms/config-sub-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSubSampleController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigSubSampleMethodServi
 @RestController
 @RequestMapping("/qms/config-sub-sample-method")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSubSampleMethodController implements BusinessControllerMarker {
 
 

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

@@ -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;
@@ -38,6 +40,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigSubSampleParentServi
 @RestController
 @RequestMapping("/qms/config-sub-sample-parent")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSubSampleParentController implements BusinessControllerMarker {
 
 

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

@@ -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/config-sub-sample-parent-method")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigSubSampleParentMethodController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigUserSignatureController.java

@@ -25,6 +25,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;
@@ -39,6 +41,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigUserSignatureService
 @RestController
 @RequestMapping("/qms/config-user-signature")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 @FileUploadController(source = "qms.configusersignature")
 public class ConfigUserSignatureController extends AbstractFileUploadController implements BusinessControllerMarker{
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigWarehouseLocationController.java

@@ -31,6 +31,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;
@@ -45,6 +47,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigWarehouseLocationSer
 @RestController
 @RequestMapping("/qms/config-warehouse-location")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigWarehouseLocationController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigXRFConversionRateController.java

@@ -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/config-xrf-conversion-rate")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigXRFConversionRateController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigXRFLineController.java

@@ -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/config-xrf-line")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigXRFLineController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigXRFProjectController.java

@@ -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/config-xrf-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class ConfigXRFProjectController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/GridReportController.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.zt.plat.framework.common.exception.ServiceException;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.servlet.ServletUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.framework.security.config.SecurityProperties;
 import com.zt.plat.framework.security.core.LoginUser;
 import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
@@ -61,6 +62,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @RestController
 @RequestMapping("/qms/config-report-template")
+@DeptDataPermissionIgnore(enable = "true")
 public class GridReportController {
 
     public static final String WR_PREFIX = "_WR_";

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

@@ -27,6 +27,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;
@@ -41,6 +43,7 @@ import com.zt.plat.module.qms.business.config.service.MaterialAssayStandardServi
 @RestController
 @RequestMapping("/qms/material-assay-standard")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class MaterialAssayStandardController implements BusinessControllerMarker {
 
 

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

@@ -27,6 +27,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;
@@ -41,6 +43,7 @@ import com.zt.plat.module.qms.business.config.service.MaterialAssayStandardDetai
 @RestController
 @RequestMapping("/qms/material-assay-standard-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class MaterialAssayStandardDetailController implements BusinessControllerMarker {
 
 

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

@@ -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/material-assay-standard-forecast-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class MaterialAssayStandardForecastProjectController implements BusinessControllerMarker {
 
 

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

@@ -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 com.zt.plat.module.qms.business.config.service.MaterialAssayStandardMetho
 @RestController
 @RequestMapping("/qms/material-assay-standard-method")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class MaterialAssayStandardMethodController implements BusinessControllerMarker {
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectAssessmentPageReqVO.java

@@ -13,6 +13,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class ConfigAssayMethodProjectAssessmentPageReqVO extends PageParam {
 
+    @Schema(description = "主样配置ID", example = "30107")
+    private Long configBaseSampleId;
+
     @Schema(description = "检测方法配置ID", example = "18120")
     private Long configAssayMethodId;