fix:接口完善

# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/datapermission/QMSMultiDataPermissionHandler.java
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/mybatis/QMSDataPermissionConfig.java

pom.xml

@@ -17,7 +17,10 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
+        <!-- qms服务相关 -->
+        <zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
+        <liteflow.version>2.15.3</liteflow.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -41,6 +44,40 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            
+            <!-- liteflow -->
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-spring-boot-starter</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-javax-pro</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-groovy</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-qlexpress</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-graaljs</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            
+            <!-- tio -->
+            <dependency>
+                <groupId>tech.zzjc.tio</groupId>
+                <artifactId>zzjc-tio-spring-boot-starter</artifactId>
+                <version>${zzjc.tio.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -143,7 +180,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -161,11 +198,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
-<!--        <id>ZT</id>-->
-<!--        <name>中铜 ZStack 私服</name>-->
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
-<!--    </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ZT-snap</id>
+            <name>中铜 ZStack 私服</name>
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>

qms-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
 
   config:
     import:
-      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
+#      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
 
   # Servlet 配置
@@ -119,5 +119,9 @@ zt:
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true
-
+    ignore-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
+  security:
+    permit-all-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
 debug: false

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -37,6 +37,7 @@ public interface ErrorCodeConstants {
 	/*==============================config 配置模块 1_032_050_000 ~ 1_032_099_999 ===============================*/
 	ErrorCode CONFIG_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表模版配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法配置不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法参数配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_RANGE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目区间不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目判定不存在");
@@ -47,13 +48,14 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与检测方法配置不存在");
 	//ErrorCode CONFIG_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与复检配置不存在");
-	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与检测方法配置不存在");
+	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与分样检测方法配置表不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
 	ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
 	ErrorCode CONFIG_SAMPLE_FLOW_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程配置不存在");
 	ErrorCode CONFIG_REPORT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表类型配置不存在");
 	ErrorCode CONFIG_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目配置不存在");
 	ErrorCode CONFIG_ENTRUST_SOURCE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源配置不存在");
+	ErrorCode CONFIG_ENTRUST_SOURCE_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源与样品类型配置不存在");
 
 	ErrorCode CONFIG_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "主样配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目参数配置不存在");
@@ -100,6 +102,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_HANDOVER_RECORD_SUB_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样交接记录业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ASSAY_RESULT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记来样品位不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务业务不存在");
+	ErrorCode BUSINESS_ASSAY_TASK_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务参数业务不存在");
 	ErrorCode BUSINESS_ASSAY_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测项目数据业务不存在");
 	ErrorCode BUSINESS_ASSAY_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测参数数据业务不存在");
 	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定业务不存在");
@@ -119,7 +122,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
 	
-	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS  = new ErrorCode(1_032_100_000, "分样复测业务数据不存在");
 
 	ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
 	ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
@@ -128,6 +131,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务数据,管理样、标准样不存在");
 	ErrorCode BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
 	ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
+	ErrorCode BUSINESS_QC_MANAGEMENT_SAMPLE_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
 	
@@ -139,18 +143,64 @@ public interface ErrorCodeConstants {
 	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
 	ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
 	ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
+	ErrorCode REPORT_DOCUMENT_FILE_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告附件不存在");
 
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
 
 	/*=================================resource  资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
-	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");
-	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备大类不存在");
-	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
-	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
+//	----------设备管理----------
+	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备信息不存在");
+	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备大类不存在");
+	ErrorCode DEVICE_MAINTAIN_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护数据不存在");
+	ErrorCode DEVICE_MAINTAIN_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护项不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置项不存在");
+	ErrorCode DEVICE_PERIOD_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查数据不存在");
+
+	ErrorCode DEVICE_PERIOD_CHECK_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查计划不存在");
+	ErrorCode DEVICE_REPAIR_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修申请数据不存在");
+	ErrorCode DEVICE_REPAIR_RESULT_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修结果明细不存在");
+	ErrorCode DEVICE_REPAIR_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修明细不存在");
+	ErrorCode DEVICE_CALIBRATION_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准计划不存在");
+	ErrorCode DEVICE_CALIBRATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准数据不存在");
+	ErrorCode DEVICE_USE_RECORD_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备使用记录不存在");
+	ErrorCode DEVICE_AFFILIATION_RELATIVITY_NOT_EXISTS = new ErrorCode(1_032_150_000, "附属设备关系不存在");
+	ErrorCode DEVICE_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请明细数据不存在");
+	ErrorCode DEVICE_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请数据不存在");
+	ErrorCode DEVICE_CONFIG_FLOW_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备通用流程配置不存在");
+
+//	-------------物料试剂-------------
+	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "试剂耗材不存在");
+	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类不存在");
+	ErrorCode MATERIAL_PRODUCT_PARENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类的父类不存在");
+	ErrorCode MATERIAL_PRODUCT_CODE_EXISTED = new ErrorCode(1_032_160_000, "物料大类编码重复");
+	ErrorCode MATERIAL_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_032_160_000, "分类下含有子分类或物料大类，不可删除");
+	ErrorCode MATERIAL_PRODUCT_EXISTS_BATCH = new ErrorCode(1_032_160_000, "物料大类下存在物料批次，不可删除");
+	ErrorCode MATERIAL_PRODUCTS_EXISTS_CATEGORY = new ErrorCode(1_032_160_000, "物料大类列表中存在分类数据");
+	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程明细不存在");
+	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程不存在");
+
+	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次不存在");
+	ErrorCode MATERIAL_BATCH_ASSIGN_END = new ErrorCode(1_032_160_000, "物料批次已拆分，不可操作");
+	ErrorCode GONGDUAN_BELONG_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段所属的物料批次不一致");
+	ErrorCode GONGDUAN_QUANTITY_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段累加数量和批次数量不一致");
+
+	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次分发不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库，出库不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库明细,出库明细等不存在");
+
+	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
+
+	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "存放位置不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
+
+
 
-	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
-	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
 
 
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
@@ -159,6 +209,11 @@ public interface ErrorCodeConstants {
 
 
 	/*================================= office 办公 1_032_250_000 ~ 1_032_299_999 ==================================*/
+	ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商不存在");
+	ErrorCode SUPPLIER_PROPERTIES_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商属性不存在");
+	ErrorCode SUPPLIER_EVALUATION_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价不存在");
+	ErrorCode SUPPLIER_EVALUATION_AT_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价关系不存在");
+
 
 
 	/*================================= dzj 大质检 1_032_300_000 ~ 1_032_349_999 ==================================*/

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java

@@ -14,6 +14,9 @@ public class QmsBpmConstant {
     public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions";
     public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag";
     public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag";
+    public static final String BPM_REJECT_TO_FIRST_FLAG = "rejectToFirstActivity";
+    public static final String BPM_CUR_ACTIVITY_INS_ID = "currentActivityInsId";        //当前活动实例id
+    public static final String BPM_PROCESS_INS_ID = "processInstanceId";        //当前活动实例id
 
     //驳回标记前缀
     public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";

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

@@ -107,6 +107,15 @@ public interface QmsCommonConstant {
     /** 检验委托 **/
     String ENTRUST_INSPECTION = "entrust_inspection";
     
+    /** 委托样品类型： 委检样 **/
+    String ENTRUST_COMMISSION_INSPECTION_SAMPLE = "commissionInspectionSample";
+
+    /** 委托样品类型： 商检分析样 **/
+    String ENTRUST_INSPECTION_ANALYSIS_SAMPLE = "inspectionAnalysisSample";
+
+    /** 委托样品类型： 商检综合 **/
+    String ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE = "comprehensiveInspectionSample";
+    
     /** 中心收样 **/
     String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
     
@@ -179,6 +188,10 @@ public interface QmsCommonConstant {
     /** 检验完成状态-未完成 **/
     String UNCHECKED = "unchecked";
     
+    /** 数据回报状态 未回报 **/
+    String UNRETURNED = "unreturned";
+    
+    
     /** 自动 **/
     String AUTOMATIC = "automatic";
     
@@ -194,4 +207,9 @@ public interface QmsCommonConstant {
 
     /** 允许提交 **/
     String ALLOW_SUBMIT = "allow_submit";
+
+    /** 临时数据标识 **/
+    String TEMP_DATA_CODE = "-1";
+    
+
 }

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java

@@ -16,9 +16,12 @@ public interface QmsPermissionConstant {
     //目标权限类型-自定义
     String TARGET_TYPE_CUSTOM = "custom";
 
+    String DEPT_DATA_AND_SUB = "ytjyDeptAndSub";                       //部门
+
     //======================各业务模块权限常量=============================
 
     String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";                   //报告发起权限
     String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
+    String DEVICE_MANAGER = "qms_device_manager";                               //设备管理员
 }

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsSupplierConstant.java

@@ -0,0 +1,10 @@
+package com.zt.plat.module.qms.enums;
+
+public interface QmsSupplierConstant {
+
+    String OPERATING_ITEMS_KEY = "operatingItems";
+//    供应商属性资质key
+    String CERTIFICATION_KEY  = "certification";
+//    评价流程key
+    String  EVALUATION_FLOW_KEY= "OFFICE_SUPPLIER_EVALUATION";
+}

zt-module-qms/zt-module-qms-server/pom.xml

@@ -16,9 +16,7 @@
     <description>
         QMS模块。
     </description>
-    <properties>
-        <zzjc.tio.version>3.9.1.v20251013-RELEASE</zzjc.tio.version>
-    </properties>
+    
     <dependencies>
         <!-- Spring Cloud 基础 -->
         <dependency>
@@ -141,27 +139,22 @@
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
-            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-javax-pro</artifactId>
-            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-groovy</artifactId>
-            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-qlexpress</artifactId>
-            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-graaljs</artifactId>
-            <version>2.15.1</version>
         </dependency>
 
         <!-- pdfbox -->
@@ -198,7 +191,6 @@
         <dependency>
             <groupId>tech.zzjc.tio</groupId>
             <artifactId>zzjc-tio-spring-boot-starter</artifactId>
-            <version>${zzjc.tio.version}</version>
         </dependency>
     </dependencies>
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/api/task/QmsApiImpl.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.api.task;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.spring.SpringUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.validation.annotation.Validated;
@@ -12,6 +13,7 @@ import static com.zt.plat.module.qms.enums.QmsBpmConstant.BPM_CALLBACK_BEAN_NAME
 
 @RestController
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class QmsApiImpl implements QmsApi{
 
     @Override

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import 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.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 子样检测任务参数业务")
+@RestController
+@RequestMapping("/qms/business-assay-task-parameter-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessAssayTaskParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessAssayTaskParameterDataService businessAssayTaskParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建子样检测任务参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:create')")
+    public CommonResult<BusinessAssayTaskParameterDataRespVO> createBusinessAssayTaskParameterData(@Valid @RequestBody BusinessAssayTaskParameterDataSaveReqVO createReqVO) {
+        return success(businessAssayTaskParameterDataService.createBusinessAssayTaskParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新子样检测任务参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessAssayTaskParameterData(@Valid @RequestBody BusinessAssayTaskParameterDataSaveReqVO updateReqVO) {
+        businessAssayTaskParameterDataService.updateBusinessAssayTaskParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除子样检测任务参数业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskParameterData(@RequestParam("id") Long id) {
+        businessAssayTaskParameterDataService.deleteBusinessAssayTaskParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除子样检测任务参数业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessAssayTaskParameterDataService.deleteBusinessAssayTaskParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得子样检测任务参数业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:query')")
+    public CommonResult<BusinessAssayTaskParameterDataRespVO> getBusinessAssayTaskParameterData(@RequestParam("id") Long id) {
+        BusinessAssayTaskParameterDataDO businessAssayTaskParameterData = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterData(id);
+        return success(BeanUtils.toBean(businessAssayTaskParameterData, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得子样检测任务参数业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:query')")
+    public CommonResult<PageResult<BusinessAssayTaskParameterDataRespVO>> getBusinessAssayTaskParameterDataPage(@Valid BusinessAssayTaskParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessAssayTaskParameterDataDO> pageResult = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出子样检测任务参数业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessAssayTaskParameterDataExcel(@Valid BusinessAssayTaskParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessAssayTaskParameterDataDO> list = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "子样检测任务参数业务.xls", "数据", BusinessAssayTaskParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+}

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,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.BusinessHandoverRecordSubDO;
 import com.zt.plat.module.qms.business.bus.service.BusinessHandoverRecordSubService;
@@ -37,6 +41,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 {
 
 
@@ -89,6 +94,11 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
     @Operation(summary = "获得子样交接记录业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
     public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) {
+    	if (pageReqVO.getDeptId() == null) {
+    		//当前登录用户
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+    		pageReqVO.setDeptId(loginUser.getVisitDeptId());
+		}
         PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO);
         return success(pageResult);
     }

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 {
 
 
@@ -84,18 +87,18 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa
 
     @GetMapping("/page")
     @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
-    public CommonResult<PageResult<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
-        PageResult<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
+    public CommonResult<PageResult<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCCoefficientDataExtendRespVO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
 //    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
-    public CommonResult<List<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
-        List<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
+    public CommonResult<List<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
+        List<BusinessQCCoefficientDataExtendRespVO> listResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
+        return success(listResult);
     }
 
     @GetMapping("/export-excel")
@@ -105,7 +108,7 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa
     public void exportBusinessQCCoefficientDataExcel(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessQCCoefficientDataDO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
+        List<BusinessQCCoefficientDataExtendRespVO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "质控样检测系数任务数据,空白样、标样.xls", "数据", BusinessQCCoefficientDataRespVO.class,
                         BeanUtils.toBean(list, BusinessQCCoefficientDataRespVO.class));

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 {
 
 
@@ -85,17 +88,17 @@ public class BusinessQCManagementDataController implements BusinessControllerMar
     @GetMapping("/page")
     @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样分页")
     @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
-    public CommonResult<PageResult<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
-        PageResult<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
+    public CommonResult<PageResult<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementDataExtendRespVO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样列表")
 //    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
-    public CommonResult<List<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
-    	List<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
+    public CommonResult<List<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
+    	List<BusinessQCManagementDataExtendRespVO> listResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
+        return success(listResult);
     }
 
     @GetMapping("/export-excel")
@@ -105,7 +108,7 @@ public class BusinessQCManagementDataController implements BusinessControllerMar
     public void exportBusinessQCManagementDataExcel(@Valid BusinessQCManagementDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessQCManagementDataDO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
+        List<BusinessQCManagementDataExtendRespVO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "质控管理样检测任务数据,管理样、标准样.xls", "数据", BusinessQCManagementDataRespVO.class,
                         BeanUtils.toBean(list, BusinessQCManagementDataRespVO.class));

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import 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.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementSampleParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementSampleParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+@RestController
+@RequestMapping("/qms/business-QC-management-sample-parameter-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCManagementSampleParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCManagementSampleParameterDataService businessQCManagementSampleParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:create')")
+    public CommonResult<BusinessQCManagementSampleParameterDataRespVO> createBusinessQCManagementSampleParameterData(@Valid @RequestBody BusinessQCManagementSampleParameterDataSaveReqVO createReqVO) {
+        return success(businessQCManagementSampleParameterDataService.createBusinessQCManagementSampleParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessQCManagementSampleParameterData(@Valid @RequestBody BusinessQCManagementSampleParameterDataSaveReqVO updateReqVO) {
+        businessQCManagementSampleParameterDataService.updateBusinessQCManagementSampleParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementSampleParameterData(@RequestParam("id") Long id) {
+        businessQCManagementSampleParameterDataService.deleteBusinessQCManagementSampleParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementSampleParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCManagementSampleParameterDataService.deleteBusinessQCManagementSampleParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:query')")
+    public CommonResult<BusinessQCManagementSampleParameterDataRespVO> getBusinessQCManagementSampleParameterData(@RequestParam("id") Long id) {
+        BusinessQCManagementSampleParameterDataDO businessQCManagementSampleParameterData = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterData(id);
+        return success(BeanUtils.toBean(businessQCManagementSampleParameterData, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:query')")
+    public CommonResult<PageResult<BusinessQCManagementSampleParameterDataRespVO>> getBusinessQCManagementSampleParameterDataPage(@Valid BusinessQCManagementSampleParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementSampleParameterDataDO> pageResult = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCManagementSampleParameterDataExcel(@Valid BusinessQCManagementSampleParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCManagementSampleParameterDataDO> list = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数.xls", "数据", BusinessQCManagementSampleParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+}

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 {
 
 
@@ -110,6 +113,9 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
     @GetMapping("/queryWaitingDataForReport")
     @Operation(summary = "查询待编制数据")
     public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
+        Long configReportTypeId = pageReqVO.getConfigReportTypeId();
+        if(configReportTypeId == null)
+            return CommonResult.error(0, "缺少configReportTypeId参数，请刷新后重试！");
         PageResult<BusinessSampleEntrustRegistrationExtendRespVO> result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO);
         return success(result);
     }

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

@@ -23,9 +23,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.BusinessSampleHandoverDO;
 import com.zt.plat.module.qms.business.bus.service.BusinessSampleHandoverService;
@@ -37,6 +41,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-handover")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleHandoverController {
 
 
@@ -97,6 +102,11 @@ public class BusinessSampleHandoverController {
     @Operation(summary = "获得样品交接单业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
     public CommonResult<PageResult<BusinessSampleHandoverRespVO>> getBusinessSampleHandoverPage(@Valid BusinessSampleHandoverPageReqVO pageReqVO) {
+    	if (pageReqVO.getDeptId() == null) {
+    		//当前登录用户
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+    		pageReqVO.setDeptId(loginUser.getVisitDeptId());
+		}
         PageResult<BusinessSampleHandoverDO> pageResult = businessSampleHandoverService.getBusinessSampleHandoverPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverRespVO.class));
     }

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,86 +21,89 @@ 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.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleParentRecheckService;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRetestDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleParentRetestService;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-@Tag(name = "管理后台 - 分样复检业务数据")
+@Tag(name = "管理后台 - 分样复测业务数据")
 @RestController
-@RequestMapping("/qms/business-sub-sample-parent-recheck")
+@RequestMapping("/qms/business-sub-sample-parent-retest")
 @Validated
-public class BusinessSubSampleParentRecheckController implements BusinessControllerMarker {
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSubSampleParentRetestController implements BusinessControllerMarker {
 
 
     @Resource
-    private BusinessSubSampleParentRecheckService businessSubSampleParentRecheckService;
+    private BusinessSubSampleParentRetestService businessSubSampleParentRetestService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建分样复检业务数据")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:create')")
-    public CommonResult<BusinessSubSampleParentRecheckRespVO> createBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO createReqVO) {
-        return success(businessSubSampleParentRecheckService.createBusinessSubSampleParentRecheck(createReqVO));
+    @Operation(summary = "创建分样复测业务数据")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:create')")
+    public CommonResult<BusinessSubSampleParentRetestRespVO> createBusinessSubSampleParentRetest(@Valid @RequestBody BusinessSubSampleParentRetestSaveReqVO createReqVO) {
+        return success(businessSubSampleParentRetestService.createBusinessSubSampleParentRetest(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新分样复检业务数据")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:update')")
-    public CommonResult<Boolean> updateBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO updateReqVO) {
-        businessSubSampleParentRecheckService.updateBusinessSubSampleParentRecheck(updateReqVO);
+    @Operation(summary = "更新分样复测业务数据")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:update')")
+    public CommonResult<Boolean> updateBusinessSubSampleParentRetest(@Valid @RequestBody BusinessSubSampleParentRetestSaveReqVO updateReqVO) {
+        businessSubSampleParentRetestService.updateBusinessSubSampleParentRetest(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除分样复检业务数据")
+    @Operation(summary = "删除分样复测业务数据")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
-    public CommonResult<Boolean> deleteBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
-        businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheck(id);
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleParentRetest(@RequestParam("id") Long id) {
+        businessSubSampleParentRetestService.deleteBusinessSubSampleParentRetest(id);
         return success(true);
     }
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除分样复检业务数据")
-                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
-    public CommonResult<Boolean> deleteBusinessSubSampleParentRecheckList(@RequestBody BatchDeleteReqVO req) {
-        businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheckListByIds(req.getIds());
+    @Operation(summary = "批量删除分样复测业务数据")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleParentRetestList(@RequestBody BatchDeleteReqVO req) {
+        businessSubSampleParentRetestService.deleteBusinessSubSampleParentRetestListByIds(req.getIds());
         return success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得分样复检业务数据")
+    @Operation(summary = "获得分样复测业务数据")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:query')")
-    public CommonResult<BusinessSubSampleParentRecheckRespVO> getBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
-        BusinessSubSampleParentRecheckDO businessSubSampleParentRecheck = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheck(id);
-        return success(BeanUtils.toBean(businessSubSampleParentRecheck, BusinessSubSampleParentRecheckRespVO.class));
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:query')")
+    public CommonResult<BusinessSubSampleParentRetestRespVO> getBusinessSubSampleParentRetest(@RequestParam("id") Long id) {
+        BusinessSubSampleParentRetestDO businessSubSampleParentRetest = businessSubSampleParentRetestService.getBusinessSubSampleParentRetest(id);
+        return success(BeanUtils.toBean(businessSubSampleParentRetest, BusinessSubSampleParentRetestRespVO.class));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得分样复检业务数据分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:query')")
-    public CommonResult<PageResult<BusinessSubSampleParentRecheckRespVO>> getBusinessSubSampleParentRecheckPage(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO) {
-        PageResult<BusinessSubSampleParentRecheckDO> pageResult = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessSubSampleParentRecheckRespVO.class));
+    @Operation(summary = "获得分样复测业务数据分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:query')")
+    public CommonResult<PageResult<BusinessSubSampleParentRetestRespVO>> getBusinessSubSampleParentRetestPage(@Valid BusinessSubSampleParentRetestPageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleParentRetestDO> pageResult = businessSubSampleParentRetestService.getBusinessSubSampleParentRetestPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubSampleParentRetestRespVO.class));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出分样复检业务数据 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:export')")
+    @Operation(summary = "导出分样复测业务数据 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-retest:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessSubSampleParentRecheckExcel(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO,
+    public void exportBusinessSubSampleParentRetestExcel(@Valid BusinessSubSampleParentRetestPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessSubSampleParentRecheckDO> list = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO).getList();
+        List<BusinessSubSampleParentRetestDO> list = businessSubSampleParentRetestService.getBusinessSubSampleParentRetestPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "分样复检业务数据.xls", "数据", BusinessSubSampleParentRecheckRespVO.class,
-                        BeanUtils.toBean(list, BusinessSubSampleParentRecheckRespVO.class));
+        ExcelUtils.write(response, "分样复测业务数据.xls", "数据", BusinessSubSampleParentRetestRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubSampleParentRetestRespVO.class));
     }
 
 }

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,7 +10,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.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.controller.vo.BatchAssessmentDataReportingReqVO.BusinessSubSampleIdAndRetestCount;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
 
@@ -26,30 +28,25 @@ 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
 	private SampleAnalysisAuditService sampleAnalysisAuditService;
 	
-	@GetMapping("/crossAuditByTaskId")
-	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
-		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
-		return success(result);
-	}
-
 	/**
 	 * 交叉审核
 	 * @return
 	 */
 	@PostMapping("/crossAudit")
 	public CommonResult<?> crossAudit(Long businessAssayTaskId, String auditStatus) {
-		sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
+		sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId, auditStatus);
 		return success("成功");
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus);
+	public CommonResult<JSONObject> getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO);
 		return success(result);
 	}
 	
@@ -92,23 +89,23 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	//判定数据上报
 	@PostMapping("/assessmentDataReporting")
-	public CommonResult<?> assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId) {
-		sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, configAssayMethodId);
+	public CommonResult<?> assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId, Integer retestCount) {
+		sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, configAssayMethodId, retestCount);
 		return success("成功"); 
 	}
 	
 	@PostMapping("/batchAssessmentDataReporting")
 	public CommonResult<?> batchAssessmentDataReporting(@RequestBody BatchAssessmentDataReportingReqVO reqVO) {
-		for (Long businessSubSampleId : reqVO.getBusinessSubSampleIds()) {
-			sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, reqVO.getConfigAssayMethodId());
+		for (BusinessSubSampleIdAndRetestCount businessSubSampleIdAndRetestCount : reqVO.getBusinessSubSampleIdAndRetestCounts()) {
+			sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleIdAndRetestCount.getBusinessSubSampleId(), reqVO.getConfigAssayMethodId(), businessSubSampleIdAndRetestCount.getRetestCount());
 		}
 		return success("成功"); 
 	}
 	
 	//重新创建复检委托
 	@PostMapping("/createReAnalysis")
-	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId) {
-		sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId);
+	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId, Integer retestCount) {
+		sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId, retestCount);
 		return success("成功"); 
 	}
 	

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,17 +25,20 @@ 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
 	private SampleAnalysisService sampleAnalysisService ;
 	
+	@Deprecated
 	@GetMapping("/batchSampleAnalysisByTaskId")
 	public CommonResult<?> batchSampleAnalysisByTaskId(Long businessAssayTaskId) {
 		BusinessAssayTaskAnalysisSampleProjectRespVO businessAssayTaskAnalysisSampleProject = sampleAnalysisService.batchSampleAnalysisByTaskId(businessAssayTaskId);
 		return success(businessAssayTaskAnalysisSampleProject);
 	}
-	
+
+	@Deprecated
 	@PostMapping("/saveBatchSampleAnalysis")
 	public CommonResult<?> saveBatchSampleAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleProjectRespVO vo) {
 		sampleAnalysisService.saveBatchSampleAnalysis(vo);

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
@@ -59,14 +61,6 @@ public class SampleEntrustController implements BusinessControllerMarker {
     	BusinessSampleEntrustRegistrationExtendRespVO sampleEntrustRegistration = sampleEntrustService.detail(id);
     	return success(sampleEntrustRegistration);
     }
-
-    @GetMapping("/reportDetail")
-    @Operation(summary = "委托单详情数据")
-    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
-    	JSONObject jsonObject = sampleEntrustService.reportDetail(id);
-    	return success(jsonObject);
-    	
-    }
     
     @PostMapping("/update")
     @Operation(summary = "修改委托登记")

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

@@ -1,38 +1,31 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson2.JSON;
 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.common.util.object.BeanUtils;
-import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
-import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
+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;
-import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
-import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.pojo.CommonResult.error;
 
 @Tag(name = "管理后台 - 样品流转")
 @RestController
 @RequestMapping("/qms/bus/sample/flow")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleFlowController implements BusinessControllerMarker {
 	
 	@Resource
@@ -45,138 +38,22 @@ public class SampleFlowController implements BusinessControllerMarker {
     public CommonResult<?> sampleFlow(@Validated @RequestBody SampleFlowParam sampleFlowParam) {
     	LiteflowResponse response = sampleFlowService.sampleFlow(sampleFlowParam);
     	return success(response.getContextBean(SampleFlowContext.class));
-    }    
-
-    @GetMapping("/test")
-    public CommonResult<?> test() {
-    	
-    	SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
-    	sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
-    	sampleFlowDefinition.setFlowName("子样样品流转流程");
-    	List<SampleFlowNode> flowNodeList = new ArrayList<>();
-    	
-    	SampleFlowNode zxr = new SampleFlowNode();
-    	zxr.setNodeName("中心收样");
-    	zxr.setNodeKey("flw_center_receive");
-    	zxr.setSort(3100);
-
-    	SampleFlowNode zxs = new SampleFlowNode();
-    	zxs.setNodeName("中心送样");
-    	zxs.setNodeKey("flw_center_send");
-    	zxs.setSort(3200);
-
-    	SampleFlowNode bzr = new SampleFlowNode();
-    	bzr.setNodeName("班组收样");
-    	bzr.setNodeKey("flw_team_receive");
-    	bzr.setSort(3300);
-
-    	SampleFlowNode ypbm = new SampleFlowNode();
-    	ypbm.setNodeName("样品编密");
-    	ypbm.setNodeKey("flw_sample_encrypt");
-    	ypbm.setSort(3400);
-
-//    	SampleFlowNode fxr = new SampleFlowNode();
-//    	fxr.setNodeName("分析收样");
-//    	fxr.setNodeKey("flw_analysis_receive");
-//    	fxr.setSort(3500);
-//
-    	SampleFlowNode fx = new SampleFlowNode();
-    	fx.setNodeName("样品分析");
-    	fx.setNodeKey("flw_analysis");
-    	fx.setSort(3550);
-//
-//    	SampleFlowNode fxs = new SampleFlowNode();
-//    	fxs.setNodeName("分析送样");
-//    	fxs.setNodeKey("flw_analysis_send");
-//    	fxs.setSort(3600);
-
-    	SampleFlowNode bzs = new SampleFlowNode();
-    	bzs.setNodeName("班组送样");
-    	bzs.setNodeKey("flw_team_send");
-    	bzs.setSort(3700);
-
-    	SampleFlowNode ypgk = new SampleFlowNode();
-    	ypgk.setNodeName("样品归库");
-    	ypgk.setNodeKey("flw_sample_storage");
-    	ypgk.setSort(3800);
-    	ypgk.setNextFlowNodeList(null);
-    	flowNodeList.add(ypgk);
-    	
-
-    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
-    		{
-    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
-    		}
-    	});
-    	flowNodeList.add(zxr);
-    	
-
-    	zxs.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(zxs);
-
-    	bzr.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
-    	}});
-    	flowNodeList.add(bzr);
-    	
-
-    	ypbm.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(ypbm);
-    	
-
-//    	fxr.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
-//    	}});
-//    	flowNodeList.add(fxr);
-//    	
-//
-//    	fxs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-//    	}});
-//    	flowNodeList.add(fxs);
-    	
-    	fx.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-    	}});
-    	flowNodeList.add(fx);
-
-    	bzs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
-    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
-    	}});
-    	flowNodeList.add(bzs);
-    	
-    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
-    	
-    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
-    	
-    	System.out.println(jsonSampleFlowDefinition);
-    	
-    	Long tenantId = TenantContextHolder.getRequiredTenantId();
-    	
-    	List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
-    	sampleFlowInfoList.add(new SampleFlowInfo().setId(1967550576457330690L).setIsWeighing(0));
-    	
-    	SampleFlowParam sampleFlowParam = new SampleFlowParam();
-    	sampleFlowParam.setSampleSourceType(2);
-    	sampleFlowParam.setCurrentSampleFlowKey("P3000");
-    	sampleFlowParam.setSampleFlowInfoList(sampleFlowInfoList);
-    	
-    	
-    	
-    	LiteflowResponse response = flowExecutor.execute2Resp("sampleFlowChain" + tenantId, sampleFlowParam, SampleFlowContext.class);
-    	if (response.isSuccess()) {
-			return success(response.getContextBean(SampleFlowContext.class));
-		} else {
-			return error(1_032_100_000, response.getMessage());
-		}
-    	//return success(FlowBus.getNodeMap());
-	}
+    }
 
+    /**
+     * 中心收样并送样
+     * @param sampleFlowParam
+     * @return
+     */
+    @PostMapping("/centerReceiveAndSend")
+    public CommonResult<?> centerReceiveAndSend(@Validated @RequestBody SampleFlowParam sampleFlowParam) {
+    	//中心收样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_RECEIVE);
+    	LiteflowResponse response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	//中心送样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_SEND);
+    	sampleFlowParam.setSendSampleOper(null);
+    	response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	return success(response.getContextBean(SampleFlowContext.class));
+    }
 }

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

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+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;
+
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+
+/**
+ * 报表数据查询接口，不继承BusinessControllerMarker
+ */
+@RestController
+@RequestMapping("/qms/bus/sample/reporting-data-query")
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleReportDataQueryController {
+    
+    @Resource
+    private SampleEntrustService sampleEntrustService;
+    
+	@Resource
+	private SampleAnalysisAuditService sampleAnalysisAuditService;
+
+    @GetMapping("/entrust-report-detail")
+    @Operation(summary = "委托单详情数据")
+    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
+    	JSONObject jsonObject = sampleEntrustService.reportDetail(id);
+    	return success(jsonObject);
+    	
+    }
+
+    @Operation(summary = "委托单详情数据")
+	@GetMapping("/crossAuditByTaskId")
+	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
+		JSONObject result = sampleAnalysisAuditService.getCrossAuditDataByTaskId(businessAssayTaskId);
+		return success(result);
+	}
+}

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,14 +41,18 @@ 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);
 	}
 	
 	//获取方法对应的样品
 	@GetMapping("/getSampleResultReportingList")
-	public CommonResult<?> getSampleResultReportingList(Long configAssayMethodId) {
-		JSONObject result = sampleResultReportingService.getSampleResultReportingList(configAssayMethodId);
+	public CommonResult<?> getSampleResultReportingList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+		JSONObject result = sampleResultReportingService.getSampleResultReportingList(reqVO);
 		return success(result);
 	}
 	

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

@@ -9,17 +9,23 @@ import org.springframework.web.bind.annotation.RestController;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
+import java.util.Arrays;
 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;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
 import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
 import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
+
+import cn.hutool.core.collection.CollUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -28,6 +34,7 @@ import jakarta.annotation.Resource;
 @RestController
 @RequestMapping("/qms/bus/sample/task-assign")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@Resource
@@ -39,16 +46,35 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
 		List<AdminUserRespDTO> list = sampleTaskAssignService.getAssignUserList();
 		return success(list);
 	}
+
+	@Operation(description = "根据用户id获取用户信息")
+	@GetMapping("/getUserInfoById")
+	public CommonResult<?> getUserInfoById(Long userId) {
+		AdminUserRespDTO userRespDTO = sampleTaskAssignService.getUserInfoById(userId);
+		return success(userRespDTO);
+	}
 	
 	@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);
 	} 
 	
-	@GetMapping("/getAssayMethodList")
-	public CommonResult<?> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId) {
-		List<Object> list = sampleTaskAssignService.getAssayMethodList(businessSubSampleId, configAssayMethodId);
+	@GetMapping("/getAssayMethodProjectList")
+	public CommonResult<?> getAssayMethodProjectList(String businessSubSampleIds, Long configAssayMethodId) {
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getAssayMethodProjectList(businessSubSampleIdList, configAssayMethodId);
+		return success(list);
+	}
+	
+	@GetMapping("/getMaterialAssayStandardMethodProjectList")
+	public CommonResult<?> getMaterialAssayStandardMethodProjectList(String businessSubSampleIds, Long baseSampleId, Long configAssayMethodId) {
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getMaterialAssayStandardMethodProjectList(businessSubSampleIdList, baseSampleId, configAssayMethodId);
 		return success(list);
 	}
 
@@ -100,6 +126,11 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
     	return success("成功");
     }
     
+    /**
+     * 作废
+     * @param id
+     * @return
+     */
     @PostMapping("/voidAssign")
     public CommonResult<?> voidAssign(Long id) {
     	sampleTaskAssignService.voidAssign(id);

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

@@ -0,0 +1,160 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+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 {
+
+
+    @GetMapping("/testSampleFlow")
+    public CommonResult<?> testSampleFlow() {
+    	
+    	SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
+    	sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
+    	sampleFlowDefinition.setFlowName("子样样品流转流程");
+    	List<SampleFlowNode> flowNodeList = new ArrayList<>();
+    	
+    	SampleFlowNode zxr = new SampleFlowNode();
+    	zxr.setNodeName("中心收样");
+    	zxr.setNodeKey("flw_center_receive");
+    	zxr.setSort(3100);
+
+    	SampleFlowNode zxs = new SampleFlowNode();
+    	zxs.setNodeName("中心送样");
+    	zxs.setNodeKey("flw_center_send");
+    	zxs.setSort(3200);
+
+    	SampleFlowNode bzr = new SampleFlowNode();
+    	bzr.setNodeName("班组收样");
+    	bzr.setNodeKey("flw_team_receive");
+    	bzr.setSort(3300);
+
+//    	SampleFlowNode ypbm = new SampleFlowNode();
+//    	ypbm.setNodeName("样品编密");
+//    	ypbm.setNodeKey("flw_sample_encrypt");
+//    	ypbm.setSort(3400);
+
+//    	SampleFlowNode fxr = new SampleFlowNode();
+//    	fxr.setNodeName("分析收样");
+//    	fxr.setNodeKey("flw_analysis_receive");
+//    	fxr.setSort(3500);
+//
+    	
+//    	SampleFlowNode fx = new SampleFlowNode();
+//    	fx.setNodeName("样品分析");
+//    	fx.setNodeKey("flw_analysis");
+//    	fx.setSort(3550);
+    	
+//
+//    	SampleFlowNode fxs = new SampleFlowNode();
+//    	fxs.setNodeName("分析送样");
+//    	fxs.setNodeKey("flw_analysis_send");
+//    	fxs.setSort(3600);
+
+    	SampleFlowNode bzs = new SampleFlowNode();
+    	bzs.setNodeName("班组送样");
+    	bzs.setNodeKey("flw_team_send");
+    	bzs.setSort(3700);
+
+    	SampleFlowNode ypgk = new SampleFlowNode();
+    	ypgk.setNodeName("样品归库");
+    	ypgk.setNodeKey("flw_sample_storage");
+    	ypgk.setSort(3800);
+    	ypgk.setNextFlowNodeList(null);
+    	flowNodeList.add(ypgk);
+    	
+
+    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
+			private static final long serialVersionUID = 6146393613606839512L;
+
+			{
+    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
+    		}
+    	});
+    	flowNodeList.add(zxr);
+    	
+
+    	zxs.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 5357543125760924047L;
+
+		{
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(zxs);
+
+    	bzr.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 6376704859477839016L;
+
+		{
+    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true));//
+//    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
+    	}});
+    	flowNodeList.add(bzr);
+    	
+
+//    	ypbm.setNextFlowNodeList(new ArrayList<>() {
+//			private static final long serialVersionUID = 1014984817516902869L;
+//
+//		{
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true));
+//    	}});
+//    	flowNodeList.add(ypbm);
+    	
+
+//    	fxr.setNextFlowNodeList(new ArrayList<>() {{
+//    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
+//    	}});
+//    	flowNodeList.add(fxr);
+//    	
+//
+//    	fxs.setNextFlowNodeList(new ArrayList<>() {{
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+//    	}});
+//    	flowNodeList.add(fxs);
+    	
+//    	fx.setNextFlowNodeList(new ArrayList<>() {
+//			private static final long serialVersionUID = -610440034210287957L;
+//
+//		{
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+//    	}});
+//    	flowNodeList.add(fx);
+
+    	bzs.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = -5057434004685743838L;
+
+		{
+//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
+    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
+    	}});
+    	flowNodeList.add(bzs);
+    	
+    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
+    	
+    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
+    	
+    	System.out.println(jsonSampleFlowDefinition);
+    	
+    	return success(jsonSampleFlowDefinition);
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AssayMethodProjectRespVO {
+
+	private Long dictionaryProjectId;
+	
+	private String dictionaryProjectName;
+	
+	private String dictionaryProjectSimpleName;
+	
+	private String dictionaryProjectShowName;
+	
+	private Long configAssayMethodId;
+	
+	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
+	private List<ConfigAssayMethodProjectExtendRespVO> methodList;
+}

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

@@ -1,13 +1,35 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 public class BatchAssessmentDataReportingReqVO {
 
-	private List<Long> businessSubSampleIds;
+	private List<BusinessSubSampleIdAndRetestCount> businessSubSampleIdAndRetestCounts;
+	
+	public List<Long> getBusinessSubSampleIds() {
+		if (CollUtil.isEmpty(this.businessSubSampleIdAndRetestCounts)) {
+			return null;
+		}
+		return this.businessSubSampleIdAndRetestCounts.stream().map(m -> m.getBusinessSubSampleId()).collect(Collectors.toList());
+	}
 	
 	private Long configAssayMethodId;
+	
+
+	@Data
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class BusinessSubSampleIdAndRetestCount {
+		
+		private Long businessSubSampleId;
+		
+		private Integer retestCount;
+	}
 }

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

@@ -1,13 +1,34 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 public class BatchResultDataReportingReqVO {
 	
-	private List<Long> businessSubParentSampleIds;
-	
+	private List<BusinessSubParentSampleIdAndRetestCount> businessSubParentSampleIdAndRetestCounts;
+		
 	private Long configAssayMethodId;
+	
+	public List<Long> getBusinessSubParentSampleIds() {
+		if (CollUtil.isEmpty(this.businessSubParentSampleIdAndRetestCounts)) {
+			return null;
+		}
+		return this.businessSubParentSampleIdAndRetestCounts.stream().map(m -> m.getBusinessSubParentSampleId()).collect(Collectors.toList());
+	}
+	
+	@Data
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class BusinessSubParentSampleIdAndRetestCount {
+		
+		private Long businessSubParentSampleId;
+		
+		private Integer retestCount;
+	}
 }

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

@@ -44,4 +44,7 @@ public class BusinessAssayParameterDataReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    //===================扩展字段====================
+    @Schema(description = "检测项目业务ID列表")
+    private List<Long> businessAssayProjectDataIdList;
 }

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

@@ -16,6 +16,9 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
 	/** id主键 **/
     private Long id;
     
+    /** 业务数据id 如：T_BSN_ASY_PRJ_DAT表，则为BSN_ASY_TSK_DAT_ID，T_BSN_ASY_PRM_DAT表，则为BSN_ASY_PRJ_DAT_ID **/
+    private Long bizId;
+    
     /** 元素或参数字典id **/
     private Long dicId;
     
@@ -42,6 +45,10 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     /** 结果值 **/
     @Schema(description = "结果值")
     private String value;
+
+    /** 符号,=、>、<、等 **/
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
     
     @Schema(description = "是否允许为空")
     private Integer isNull; 

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

@@ -44,7 +44,10 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
 
     @Schema(description = "单位")
     private String dictionaryProjectUnit;
-    
-    @Schema(description = "分析次数")
-    private Integer analysisCount;
+
+    @Schema(description = "复检次数")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数")
+    private Integer retestCount;
 }

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

@@ -18,6 +18,9 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     @Schema(description = "子样配置id")
     private Long configSubSampleId;
 

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/BusinessAssayTaskDataGroupRespVO.java

@@ -5,9 +5,16 @@ import lombok.Data;
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	
+	/** 方法id **/
 	private Long configAssayMethodId;
 	
+	/** 方法名称 **/
 	private String configAssayMethodName;
+	
+	private String configAssayMethodDictionaryBusinessKey;
+	
+	/** 方法名称及类别 **/
+	private String configAssayMethodNameAndCategory;
 
     private String assayType;
 	

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

@@ -82,8 +82,14 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @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

@@ -1,9 +1,7 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
@@ -82,8 +80,14 @@ public class BusinessAssayTaskDataReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", example = "13073")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
+
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
 
     @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;
@@ -105,4 +109,25 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "样品状态")
     private String sampleStatus;
 
+    @Schema(description = "检测方法配置名称")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
 }

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

@@ -103,9 +103,16 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("样品流程节点时间")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
-    @ExcelProperty("分析次数,复检的累加次数")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    @ExcelProperty("复测次数")
+    private Integer recheckCount;
+
+    @Schema(description = "复测次数", example = "28081")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
+
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
 
     @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     @ExcelProperty("乐观锁")

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

@@ -90,9 +90,14 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotNull(message = "样品流程节点时间不能为空")
     private LocalDateTime sampleFlowNodeTime;
 
-    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
-    @NotNull(message = "分析次数,复检的累加次数不能为空")
-    private Integer analysisCount;
+    @Schema(description = "复检次数", example = "7312")
+    private Integer recheckCount;
+
+    @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/controller/vo/BusinessAssayTaskExtendRespVO.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -20,10 +21,16 @@ import lombok.Data;
  */
 @Data
 public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
+	
+	/** 任务单数据类型,横向：horizontal，纵向：‌vertical **/
+    private String reportDataType;
 
 	/** 分析方法名称 **/
     private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     /** 分析方法对应的分析项目 **/
     private String configAssayMethodProjectShowNames;
     

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

@@ -100,10 +100,10 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")
@@ -121,4 +121,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     
     @Schema(description = "部门id")
     private Long deptId;
+    
+    //=========扩展字段==========
+
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 }

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

@@ -0,0 +1,44 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 子样检测任务参数业务分页 Request VO")
+@Data
+public class BusinessAssayTaskParameterDataPageReqVO extends PageParam {
+
+    @Schema(description = "检测任务ID", example = "11383")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", example = "9000")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", example = "3750")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,55 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 子样检测任务参数业务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessAssayTaskParameterDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2727")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11383")
+    @ExcelProperty("检测任务ID")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
+    @ExcelProperty("检测方法参数配置ID")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    @ExcelProperty("值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "3750")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 子样检测任务参数业务新增/修改 Request VO")
+@Data
+public class BusinessAssayTaskParameterDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2727")
+    private Long id;
+
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11383")
+    @NotNull(message = "检测任务ID不能为空")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
+    @NotNull(message = "检测方法参数配置ID不能为空")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "3750")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -99,10 +99,10 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 检测任务分配业务 Response VO")
 @Data
@@ -116,12 +117,13 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
-    @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
+    @ExcelProperty("完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
-    @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @Dict(dicCode = "flow_status")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
+    @ExcelProperty("流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -102,10 +102,10 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -64,5 +64,16 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //==============扩展字段================
+    
     private Long deptId;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
 }

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

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessQCCoefficientDataExtendRespVO extends BusinessQCCoefficientDataRespVO {
+
+	private String dictionaryBusinessName;
+
+	private String parentDictionaryBusinessId;
+
+	private String parentDictionaryBusinessName;
+
+	private String parentDictionaryBusinesskey;
+
+}

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

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessQCManagementDataExtendRespVO extends BusinessQCManagementDataRespVO {
+
+	private String dictionaryBusinessName;
+
+	private String parentDictionaryBusinessId;
+
+	private String parentDictionaryBusinessName;
+
+	private String parentDictionaryBusinesskey;
+
+}

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

@@ -0,0 +1,44 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数分页 Request VO")
+@Data
+public class BusinessQCManagementSampleParameterDataPageReqVO extends PageParam {
+
+    @Schema(description = "质控管理样检测任务ID", example = "100")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", example = "10419")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", example = "2766")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,55 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessQCManagementSampleParameterDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1205")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "质控管理样检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @ExcelProperty("质控管理样检测任务ID")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10419")
+    @ExcelProperty("检测方法参数配置ID")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    @ExcelProperty("值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2766")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数新增/修改 Request VO")
+@Data
+public class BusinessQCManagementSampleParameterDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1205")
+    private Long id;
+
+    @Schema(description = "质控管理样检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "质控管理样检测任务ID不能为空")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10419")
+    @NotNull(message = "检测方法参数配置ID不能为空")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2766")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -17,6 +17,11 @@ import lombok.Data;
 @Data
 public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntrustDetailRespVO {
 	
+	/**
+	 * 样品类型key
+	 */
+    private String sampleTypeDictionaryBusinessKey;
+	
 	/** 样品大类名称 **/
 	private String baseSampleName;
 

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

@@ -156,4 +156,7 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     //====================扩展字段======================
     @Schema(description = "委托来源名称")
     private String configEntrustSourceName;
+
+    @Schema(description = "报表配置id")
+    private Long configReportTypeId;
 }

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

@@ -6,6 +6,7 @@ import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 委检登记业务 Response VO")
 @Data
@@ -144,10 +145,12 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("数据校验状态,success-数据校验成功、fail-数据校验失败")
     private String dataCheckStatus;
 
+    @Dict(dicCode = "entrust_assay_status")
     @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
     @ExcelProperty("检验状态,unchecked-未检验；checked-已检验")
     private String assayStatus;
 
+    @Dict(dicCode = "entrust_data_status")
     @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1")
     @ExcelProperty("数据回报状态,unreturned-未回报；returned-已回报")
     private String dataStatus;

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

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class BusinessSubParentSampleAssessmentExtendRespVO extends BusinessSubParentSampleAssessmentRespVO {
+	
+	@Schema(description = "主样id")
+    private Long businessBaseSampleId;
+	
+	@Schema(description = "分样配置id")
+    private Long configSubSampleParentId;
 
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;

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

@@ -1,5 +1,11 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+import java.time.LocalDateTime;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,10 +17,17 @@ public class BusinessSubParentSampleAssessmentGroupReqVO {
 	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;
 
     @Schema(description = "分析部门名称")
     private String assayDepartmentName;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
 }

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

@@ -9,8 +9,14 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	@Schema(description = "分析方法id")
 	private Long configAssayMethodId;
 	
+	@Schema(description = "方法大类")
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;

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

@@ -28,6 +28,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
 
+    @Schema(description = "复测次数", example = "28081")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     private Integer isReported;
 

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

@@ -5,6 +5,9 @@ import lombok.Data;
 
 @Data
 public class BusinessSubParentSampleAssessmentProjectExtendRespVO extends BusinessSubParentSampleAssessmentProjectRespVO {
+	
+	@Schema(description = "复测次数")
+    private Integer retestCount;
 
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;

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

@@ -15,6 +15,9 @@ public class BusinessSubParentSampleAssessmentProjectPageReqVO extends PageParam
 
     @Schema(description = "样品分样ID", example = "23188")
     private Long businessSubParentSampleId;
+    
+    @Schema(description = "班组判定数据业务ID")
+    private Long businessSubParentSampleAssessmentId;
 
     @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
     private Long dictionaryProjectId;

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

@@ -19,6 +19,9 @@ public class BusinessSubParentSampleAssessmentProjectRespVO {
     @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
+    
+    @Schema(description = "班组判定数据业务ID")
+    private Long businessSubParentSampleAssessmentId;
 
     @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
     @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")

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

@@ -36,6 +36,10 @@ public class BusinessSubParentSampleAssessmentRespVO {
     @ExcelProperty("判定状态,in_progress-进行中 normal-正常")
     private String assessmentStatus;
 
+    @Schema(description = "复测次数", example = "28081")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
+
     @Schema(description = "是否已上报")
     @ExcelProperty("是否已上报")
     private Integer isReported;

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

@@ -32,6 +32,9 @@ public class BusinessSubParentSampleAssessmentSaveReqVO {
 
     @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
+    
+    @Schema(description = "复测次数")
+    private Integer retestCount;
 
     @Schema(description = "是否已上报")
     private Integer isReported;

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

@@ -31,6 +31,9 @@ public class BusinessSubSampleAnalysisGroupPageReqVO extends PageParam {
     @Schema(description = "样品状态", example = "1")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     private String sampleReceiver;
 

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

@@ -40,6 +40,9 @@ public class BusinessSubSampleAnalysisGroupRespVO {
     @ExcelProperty("样品状态")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     @ExcelProperty("收样人")
     private String sampleReceiver;

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

@@ -37,6 +37,9 @@ public class BusinessSubSampleAnalysisGroupSaveReqVO {
     @NotEmpty(message = "样品状态不能为空")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     private String sampleReceiver;
 

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

@@ -30,8 +30,11 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
 
     @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
+    
+    @Schema(description = "复测次数")
+    private Integer retestCount;
 
-    @Schema(description = "是否复测,1-是，0-否")
+    @Schema(description = "是否复检,1-是，0-否")
     private Integer isRecheck;
 
     @Schema(description = "是否已上报,1-是，0-否")