荧光线、分析时间等修改

# 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 配置

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

@@ -122,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, "质控样检测项目数据业务不存在");
@@ -150,8 +150,8 @@ public interface ErrorCodeConstants {
 
 	/*=================================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 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, "设备业务配置不存在");
@@ -168,27 +168,36 @@ public interface ErrorCodeConstants {
 	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_150_000, "试剂耗材不存在");
-	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
-	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
-	ErrorCode MATERIAL_LIFECYCLE_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_150_000, "物料批次不存在");
-	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次分发不存在");
-	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库，出库不存在");
-	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_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_NOT_ASSIGN_FOR_SUBMIT = 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_150_000, "客户端版本管理不存在");
+	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
 
-	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "存放位置不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点项不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点明细不存在");
-	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库不存在");
-	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_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, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
 
 
 

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

@@ -207,7 +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,10 +16,7 @@
     <description>
         QMS模块。
     </description>
-    <properties>
-        <zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
-        <liteflow.version>2.15.2</liteflow.version>
-    </properties>
+    
     <dependencies>
         <!-- Spring Cloud 基础 -->
         <dependency>
@@ -142,27 +139,22 @@
         <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>
 
         <!-- pdfbox -->
@@ -199,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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-assay-task-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessAssayTaskParameterDataController implements BusinessControllerMarker {
 
 

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

@@ -23,6 +23,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-base-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessBaseSampleController implements BusinessControllerMarker {
 
 

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

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

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-coefficient-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCCoefficientParameterDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-management-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-management-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementParameterDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-management-project-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementProjectDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-QC-management-sample-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCManagementSampleParameterDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-parameter-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCParameterDataController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-qc-project-data")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQCProjectDataController implements BusinessControllerMarker {
 
 

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

@@ -23,6 +23,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-quality-control-sample-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessQualityControlSampleProjectController implements BusinessControllerMarker {
 
 

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

@@ -23,6 +23,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-assay-result")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleAssayResultController implements BusinessControllerMarker {
 
 

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

@@ -31,6 +31,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -46,6 +48,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchService
 @RestController
 @RequestMapping("/qms/business-sample-dispatch")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleDispatchController implements BusinessControllerMarker {
 
 

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

@@ -25,6 +25,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -41,6 +43,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailS
 @RestController
 @RequestMapping("/qms/business-sample-dispatch-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleDispatchDetailController implements BusinessControllerMarker {
 
 

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

@@ -21,6 +21,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -34,6 +36,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-entrust-detail")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustDetailController implements BusinessControllerMarker {
 
 

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

@@ -23,6 +23,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-entrust-project")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustProjectController implements BusinessControllerMarker {
 
 

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

@@ -24,6 +24,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -38,6 +40,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-entrust-registration")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSampleEntrustRegistrationController implements BusinessControllerMarker {
 
 

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

@@ -23,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,6 +28,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource
@@ -37,7 +40,7 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	 */
 	@PostMapping("/crossAudit")
 	public CommonResult<?> crossAudit(Long businessAssayTaskId, String auditStatus) {
-		sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
+		sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId, auditStatus);
 		return success("成功");
 	}
 	
@@ -86,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,6 +25,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleAnalysisController implements BusinessControllerMarker {
 	
 	@Resource
@@ -55,13 +57,21 @@ public class SampleAnalysisController implements BusinessControllerMarker {
 		return success("成功");
 	}
 	
-	//下发配料
+	//下发配料(自动火试金配料)
 	@PostMapping("/issuedIngredients")
 	public CommonResult<?> issuedIngredients(Long businessAssayTaskId) {
 		sampleAnalysisService.issuedIngredients(businessAssayTaskId);
 		return success("成功");
 	}
 	
+	//人工配料
+	@PostMapping("/manualIngredients")
+	public CommonResult<?> manualIngredients(Long businessAssayTaskId) {
+		sampleAnalysisService.manualIngredients(businessAssayTaskId);
+		return success("成功");
+	}
+	
+	//提交分析
 	@PostMapping("/submitSampleAnalysisByTaskId")
 	public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
 		sampleAnalysisService.submitSampleAnalysisByTaskId(businessAssayTaskId);

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

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

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

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

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
 import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;
 
@@ -20,6 +21,7 @@ import jakarta.annotation.Resource;
  */
 @RestController
 @RequestMapping("/qms/bus/sample/reporting-data-query")
+@DeptDataPermissionIgnore(enable = "true")
 public class SampleReportDataQueryController {
     
     @Resource
@@ -39,7 +41,7 @@ public class SampleReportDataQueryController {
     @Operation(summary = "委托单详情数据")
 	@GetMapping("/crossAuditByTaskId")
 	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
-		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(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,6 +41,10 @@ public class SampleResultReportingController implements BusinessControllerMarker
 	//获取未上报的方法
 	@GetMapping("/getUnReportMethodGroupList")
 	public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+    	if (reqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
 		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
 		return success(list);
 	}

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

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

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

@@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSON;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
 import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
 
 
 @RestController
 @RequestMapping("/qms/bus/test")
+@DeptDataPermissionIgnore(enable = "true")
 public class TestController {
 
 
@@ -44,20 +46,22 @@ public class TestController {
     	bzr.setNodeKey("flw_team_receive");
     	bzr.setSort(3300);
 
-    	SampleFlowNode ypbm = new SampleFlowNode();
-    	ypbm.setNodeName("样品编密");
-    	ypbm.setNodeKey("flw_sample_encrypt");
-    	ypbm.setSort(3400);
+//    	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 fx = new SampleFlowNode();
+//    	fx.setNodeName("样品分析");
+//    	fx.setNodeKey("flw_analysis");
+//    	fx.setSort(3550);
+    	
 //
 //    	SampleFlowNode fxs = new SampleFlowNode();
 //    	fxs.setNodeName("分析送样");
@@ -99,19 +103,20 @@ public class TestController {
 			private static final long serialVersionUID = 6376704859477839016L;
 
 		{
-    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
+    		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(fx,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(ypbm);
+//    	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<>() {{
@@ -125,13 +130,13 @@ public class TestController {
 //    	}});
 //    	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);
+//    	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;

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

@@ -17,6 +17,8 @@ public class AssayMethodProjectRespVO {
 	
 	private String dictionaryProjectShowName;
 	
+	private String assayType;
+	
 	private Long configAssayMethodId;
 	
 	private String configAssayMethodName;

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

@@ -8,6 +8,9 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
 	
     @Schema(description = "样品主样ID", example = "23293")
     private Long businessBaseSampleId;
+    
+    @Schema(description = "主样配置ID")
+    private Long configBaseSampleId;
 
     @Schema(description = "样品分样ID", example = "15024")
     private Long businessSubParentSampleId;
@@ -44,7 +47,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/BusinessAssayProjectDataPageReqVO.java

@@ -5,6 +5,8 @@ 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.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -31,6 +33,15 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
     @Schema(description = "值")
     private String value;
 
+    @Schema(description = "补正系数ID", example = "1008")
+    private Long configAssayMethodProjectCoefficientId;
+
+    @Schema(description = "补正系数")
+    private BigDecimal coefficient;
+
+    @Schema(description = "补正后的值")
+    private String valueAfter;
+
     @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
     private String dataType;
 

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

@@ -5,6 +5,8 @@ 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.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -37,6 +39,15 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "值")
     private String value;
 
+    @Schema(description = "补正系数ID", example = "1008")
+    private Long configAssayMethodProjectCoefficientId;
+
+    @Schema(description = "补正系数")
+    private BigDecimal coefficient;
+
+    @Schema(description = "补正后的值")
+    private String valueAfter;
+
     @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
     private String dataType;
 

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

@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
@@ -38,6 +40,15 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("值")
     private String value;
 
+    @Schema(description = "补正系数ID", example = "1008")
+    private Long configAssayMethodProjectCoefficientId;
+
+    @Schema(description = "补正系数")
+    private BigDecimal coefficient;
+
+    @Schema(description = "补正后的值")
+    private String valueAfter;
+
     @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;

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

@@ -2,6 +2,8 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
@@ -27,6 +29,15 @@ public class BusinessAssayProjectDataSaveReqVO {
     @Schema(description = "值")
     private String value;
 
+    @Schema(description = "补正系数ID", example = "1008")
+    private Long configAssayMethodProjectCoefficientId;
+
+    @Schema(description = "补正系数")
+    private BigDecimal coefficient;
+
+    @Schema(description = "补正后的值")
+    private String valueAfter;
+
     @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;

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

@@ -47,6 +47,9 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
     @Schema(description = "是否配料,1-是，0-否")
     private Integer isIngredients;
 
+    @Schema(description = "配料方式,初始状态-initial、自动配料-automatic、人工配料-manual")
+    private String ingredientsWay;
+
     @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
     private String ingredientsStatus;
 

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

@@ -21,6 +21,9 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     @Schema(description = "检测方法配置名称及类别")
 	private String configAssayMethodNameAndCategory;
     
+    @Schema(description = "主样配置id")
+    private Long configBaseSampleId;
+    
     @Schema(description = "子样配置id")
     private Long configSubSampleId;
 
@@ -41,4 +44,7 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     private Integer  asmtIsRecheck;
 
     private String  asmtReportedStatus;
+    
+    @Schema(description = "配料信息")
+    private String ingredientInfo;
 }

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

@@ -11,6 +11,8 @@ public class BusinessAssayTaskDataGroupRespVO {
 	/** 方法名称 **/
 	private String configAssayMethodName;
 	
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	/** 方法名称及类别 **/
 	private String configAssayMethodNameAndCategory;
 

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;

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

@@ -50,6 +50,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
 
     @Schema(description = "是否配料,1-是，0-否")
     private Integer isIngredients;
+    
+    @Schema(description = "配料方式,初始状态-initial、自动配料-automatic、人工配料-manual")
+    private String ingredientsWay;
 
     @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
     private String ingredientsStatus;
@@ -121,4 +124,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/BusinessAssayTaskParameterDataExtendRespVO.java

@@ -0,0 +1,30 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayTaskParameterDataExtendRespVO extends BusinessAssayTaskParameterDataRespVO {
+
+    @Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29823")
+    @ExcelProperty("检测方法ID")
+    private Long configAssayMethodId;
+
+    @Schema(description = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("参数名称")
+    private String parameterName;
+
+    @Schema(description = "参数简称", example = "张三")
+    @ExcelProperty("参数简称")
+    private String shortName;
+
+    @Schema(description = "参数序号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("参数序号")
+    private Integer no;
+
+    @Schema(description = "键值")
+    @ExcelProperty("键值")
+    private String key;
+}

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

@@ -49,6 +49,9 @@ public class BusinessAssayTaskReqVO {
 
     @Schema(description = "是否配料,1-是，0-否")
     private Integer isIngredients;
+    
+    @Schema(description = "配料方式,初始状态-initial、自动配料-automatic、人工配料-manual")
+    private String ingredientsWay;
 
     @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
     private String ingredientsStatus;

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

@@ -61,6 +61,9 @@ public class BusinessAssayTaskRespVO {
 
     @Schema(description = "是否配料,1-是，0-否")
     private Integer isIngredients;
+    
+    @Schema(description = "配料方式,初始状态-initial、自动配料-automatic、人工配料-manual")
+    private String ingredientsWay;
 
     @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
     private String ingredientsStatus;

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

@@ -59,6 +59,9 @@ public class BusinessAssayTaskSaveReqVO {
 
     @Schema(description = "是否配料,1-是，0-否")
     private Integer isIngredients;
+    
+    @Schema(description = "配料方式,初始状态-initial、自动配料-automatic、人工配料-manual")
+    private String ingredientsWay;
 
     @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
     private String ingredientsStatus;

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

@@ -9,6 +9,9 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	@Schema(description = "分析方法id")
 	private Long configAssayMethodId;
 	
+	@Schema(description = "方法大类")
+	private String configAssayMethodDictionaryBusinessKey;
+	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     

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/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-否")

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

@@ -5,6 +5,9 @@ import lombok.Data;
 
 @Data
 public class BusinessSubSampleAssessmentProjectExtendRespVO extends BusinessSubSampleAssessmentProjectRespVO {
+	
+	@Schema(description = "复测次数")
+    private Integer retestCount;
 
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")

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

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

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

@@ -34,8 +34,11 @@ public class BusinessSubSampleAssessmentSaveReqVO {
 
     @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-否")

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

@@ -145,6 +145,9 @@ public class BusinessSubSamplePageReqVO extends PageParam {
 	@Schema(description = "分析部门状态")
 	private String assayDepartmentStatus;
 	
+	@Schema(description = "分析部门状态列表")
+	private List<String> assayDepartmentStatusList;
+	
 	@Schema(description = "是否已送样")
 	private Integer isSendSample;
 	

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

@@ -1,50 +0,0 @@
-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 BusinessSubSampleParentRecheckPageReqVO extends PageParam {
-
-    @Schema(description = "样品ID", example = "19065")
-    private Long sampleId;
-
-    @Schema(description = "样品主样ID", example = "26605")
-    private Long businessBaseSampleId;
-
-    @Schema(description = "样品分样ID", example = "29386")
-    private Long businessSubParentSampleId;
-
-    @Schema(description = "检测方法配置ID", example = "19087")
-    private Long configAssayMethodId;
-
-    @Schema(description = "复检样品主样ID", example = "12742")
-    private Long recheckBusinessBaseSampleId;
-
-    @Schema(description = "复检样品分样ID", example = "24043")
-    private Long recheckBusinessSubParentSampleId;
-
-    @Schema(description = "复检检测方法配置ID", example = "4026")
-    private Long recheckConfigAssayMethodId;
-
-    @Schema(description = "所属部门")
-    private String systemDepartmentCode;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "乐观锁", example = "18382")
-    private Integer updateCount;
-
-    @Schema(description = "备注")
-    private String remark;
-
-}

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

@@ -0,0 +1,59 @@
+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 BusinessSubSampleParentRetestPageReqVO extends PageParam {
+
+    @Schema(description = "样品ID", example = "28939")
+    private Long sampleId;
+
+    @Schema(description = "样品主样ID", example = "3389")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "6831")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "23450")
+    private Long configAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", example = "12365")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", example = "23172")
+    private Long retestBusinessBaseSampleId;
+
+    @Schema(description = "复检样品分样ID", example = "11648")
+    private Long retestBusinessSubParentSampleId;
+
+    @Schema(description = "复检检测方法配置ID", example = "7801")
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    private Long retestBusinessSubParentSampleAssessmentId;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "30845")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -7,42 +7,54 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 分样复检业务数据 Response VO")
+@Schema(description = "管理后台 - 分样复测业务数据 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class BusinessSubSampleParentRecheckRespVO {
+public class BusinessSubSampleParentRetestRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4631")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20948")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品ID", example = "19065")
+    @Schema(description = "样品ID", example = "28939")
     @ExcelProperty("样品ID")
     private Long sampleId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26605")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3389")
     @ExcelProperty("样品主样ID")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29386")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6831")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19087")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23450")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12742")
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    @ExcelProperty("班组判定数据业务ID")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "12365")
+    @ExcelProperty("复测次数")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23172")
     @ExcelProperty("复检样品主样ID")
-    private Long recheckBusinessBaseSampleId;
+    private Long retestBusinessBaseSampleId;
 
-    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24043")
+    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11648")
     @ExcelProperty("复检样品分样ID")
-    private Long recheckBusinessSubParentSampleId;
+    private Long retestBusinessSubParentSampleId;
 
-    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4026")
+    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7801")
     @ExcelProperty("复检检测方法配置ID")
-    private Long recheckConfigAssayMethodId;
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    @ExcelProperty("班组判定数据业务ID")
+    private Long retestBusinessSubParentSampleAssessmentId;
 
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
@@ -52,7 +64,7 @@ public class BusinessSubSampleParentRecheckRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18382")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30845")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -5,44 +5,54 @@ import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
-@Schema(description = "管理后台 - 分样复检业务数据新增/修改 Request VO")
+@Schema(description = "管理后台 - 分样复测业务数据新增/修改 Request VO")
 @Data
-public class BusinessSubSampleParentRecheckSaveReqVO {
+public class BusinessSubSampleParentRetestSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4631")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20948")
     private Long id;
 
-    @Schema(description = "样品ID", example = "19065")
+    @Schema(description = "样品ID", example = "28939")
     private Long sampleId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26605")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3389")
     @NotNull(message = "样品主样ID不能为空")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29386")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6831")
     @NotNull(message = "样品分样ID不能为空")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19087")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23450")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12742")
+    @Schema(description = "班组判定数据业务ID", example = "32694")
+    private Long businessSubParentSampleAssessmentId;
+
+    @Schema(description = "复测次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "12365")
+    @NotNull(message = "复测次数不能为空")
+    private Integer retestCount;
+
+    @Schema(description = "复检样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23172")
     @NotNull(message = "复检样品主样ID不能为空")
-    private Long recheckBusinessBaseSampleId;
+    private Long retestBusinessBaseSampleId;
 
-    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24043")
+    @Schema(description = "复检样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11648")
     @NotNull(message = "复检样品分样ID不能为空")
-    private Long recheckBusinessSubParentSampleId;
+    private Long retestBusinessSubParentSampleId;
 
-    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4026")
+    @Schema(description = "复检检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7801")
     @NotNull(message = "复检检测方法配置ID不能为空")
-    private Long recheckConfigAssayMethodId;
+    private Long retestConfigAssayMethodId;
+
+    @Schema(description = "班组判定数据业务ID", example = "21169")
+    private Long retestBusinessSubParentSampleAssessmentId;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18382")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30845")
     @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 

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

@@ -32,6 +32,14 @@ public class BusinessXRFDataPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleTime;
 
+    @Schema(description = "样品开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleStartTime;
+
+    @Schema(description = "样品结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleEndTime;
+
     @Schema(description = "分析人")
     private String assayOperator;
 

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

@@ -35,6 +35,14 @@ public class BusinessXRFDataReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleTime;
 
+    @Schema(description = "样品开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleStartTime;
+
+    @Schema(description = "样品结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleEndTime;
+
     @Schema(description = "分析人")
     private String assayOperator;
 

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

@@ -40,6 +40,14 @@ public class BusinessXRFDataRespVO {
     @ExcelProperty("样品时间")
     private LocalDateTime sampleTime;
 
+    @Schema(description = "样品开始时间")
+    @ExcelProperty("样品开始时间")
+    private LocalDateTime sampleStartTime;
+
+    @Schema(description = "样品结束时间")
+    @ExcelProperty("样品结束时间")
+    private LocalDateTime sampleEndTime;
+
     @Schema(description = "分析人")
     @ExcelProperty("分析人")
     private String assayOperator;

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

@@ -34,6 +34,12 @@ public class BusinessXRFDataSaveReqVO {
     @Schema(description = "样品时间")
     private LocalDateTime sampleTime;
 
+    @Schema(description = "样品开始时间")
+    private LocalDateTime sampleStartTime;
+
+    @Schema(description = "样品结束时间")
+    private LocalDateTime sampleEndTime;
+
     @Schema(description = "分析人")
     private String assayOperator;
 

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

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class ModifySampleResultReportingReqVO {
 
-	private String businessSubParentSampleAssessmentIds;
+	private String businessSubParentSampleAssessmentProjectIds;
 	
 	private String businessSubSampleAssessmentIds;
 }

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

@@ -6,6 +6,8 @@ import lombok.Data;
 
 @Data
 public class NoReportSubParentSampleAssessmentRespVO {
+	
+	private Long businessSubParentSampleAssessmentId;
 
     private Long baseSampleId;
 	
@@ -25,6 +27,7 @@ public class NoReportSubParentSampleAssessmentRespVO {
     
     private String assayType;
 
+    private Integer retestCount;
     
     private LocalDateTime sampleReceiveTime;
 }

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

@@ -19,8 +19,9 @@ public class RecheckSubSampleParentCreateReqVO {
     
     private Long businessSubSampleId;
     
-    
 	private Long configAssayMethodId;
+	
+	private Long businessSubParentSampleAssessmentId;
 
 	List<RecheckSubSampleParentMethodRespVO> recheckProjectList;
 }

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

@@ -54,7 +54,7 @@ public class BusinessAssayParameterDataDO extends BusinessBaseDO {
     /**
     * 值
     */
-    @TableField("VAL")
+    @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
     private String value;
     /**
     * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间