荧光线、分析时间等修改

# 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

deployment.yaml

@@ -11,7 +11,7 @@ metadata:
     description: DESC_PLACEHOLDER
     rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: qms-server
@@ -23,18 +23,21 @@ spec:
       containers:
         - name: qms-server
           image: 172.16.46.66:10043/yudao/qms-server:VERSION_PLACEHOLDER
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           readinessProbe:
             httpGet:
               path: /actuator/health
               port: 48104
-            initialDelaySeconds: 10
+            initialDelaySeconds: 50
             periodSeconds: 5
             failureThreshold: 3
           livenessProbe:
             httpGet:
               path: /actuator/health
               port: 48104
-            initialDelaySeconds: 30
+            initialDelaySeconds: 50
             periodSeconds: 10
             failureThreshold: 5
           resources:
@@ -61,11 +64,23 @@ spec:
   selector:
     app: qms-server
   ports:
-    - protocol: TCP
+    - name: http-health
+      protocol: TCP
       port: 48104
       targetPort: 48104
       nodePort: 30100
-    - protocol: TCP
+    - name: tcp-9999
+      protocol: TCP
       port: 9999
       targetPort: 9999
-      nodePort: 30200
+      nodePort: 30194
+    - name: websocket-8320
+      protocol: TCP
+      port: 8320
+      targetPort: 8320
+      nodePort: 30320
+    - name: tcp-8330
+      protocol: TCP
+      port: 8330
+      targetPort: 8330
+      nodePort: 30330

doc/中铜技术文档/Seata分布式事务集成参考.md

@@ -0,0 +1,158 @@
+[Seata分布式事务集成参考.md](Seata%E5%88%86%E5%B8%83%E5%BC%8F%E4%BA%8B%E5%8A%A1%E9%9B%86%E6%88%90%E5%8F%82%E8%80%83.md)# Seata 分布式事务集成参考
+
+## 一、架构说明
+
+### 多环境 Seata 配置管理
+
+所有环境的 Seata 配置统一通过 Nacos 管理，本地配置文件不包含 Seata 配置。
+
+```
+├── dev 环境:   base-server-dev.yaml (dev_tx_group, namespace: dev)
+├── test 环境:  base-server-test.yaml (test_tx_group, namespace: test)
+└── prod 环境:  base-server-prod.yaml (prod_tx_group, namespace: prod)
+
+Seata Server: 172.16.46.63:30088
+```
+
+### 为什么使用 IP 直连？
+
+Nacos 的 namespace 隔离机制导致不同命名空间的应用无法跨 namespace 发现服务。Seata Server 通过 IP 直连（`registry.type=file`）避免此限制，所有环境共享同一个 Seata Server，通过不同的 `tx-service-group` 实现逻辑隔离。
+
+---
+
+## 二、Nacos 配置
+
+在对应环境的 Nacos 配置中心创建配置文件。以 `base-server-dev.yaml` 为例（其他环境只需修改 `tx-service-group`）：
+
+```yaml
+seata:
+  enabled: true
+  application-id: base-server
+  tx-service-group: dev_tx_group
+  enable-auto-data-source-proxy: true
+  data-source-proxy-mode: AT
+  registry:
+    type: file
+  config:
+    type: file
+  service:
+    vgroupMapping:
+      default_tx_group: default
+      dev_tx_group: default
+      test_tx_group: default
+      prod_tx_group: default
+    default:
+      grouplist: 172.16.46.63:30088
+  client:
+    tm:
+      defaultGlobalTransactionTimeout: 60000
+    undo:
+      logTable: undo_log
+      dataValidation: true
+      logSerialization: jackson
+```
+
+---
+
+## 三、业务集成步骤
+
+### 步骤 1：在 pom.xml 中添加依赖
+
+Seata 2.4.0 版本已在 `zt-dependencies` 中统一管理。业务模块只需在 `pom.xml` 中添加：
+
+```xml
+<dependency>
+    <groupId>io.seata</groupId>
+    <artifactId>seata-spring-boot-starter</artifactId>
+</dependency>
+```
+
+版本号会从 `zt-dependencies` 继承。
+
+### 步骤 2：创建 undo_log 表
+
+在业务数据库执行：
+
+```sql
+CREATE TABLE "UNDO_LOG" (
+    "BRANCH_ID"     BIGINT       NOT NULL,
+    "XID"           VARCHAR(128) NOT NULL,
+    "CONTEXT"       VARCHAR(128) NOT NULL,
+    "ROLLBACK_INFO" BLOB         NOT NULL,
+    "LOG_STATUS"    INT          NOT NULL,
+    "LOG_CREATED"   DATETIME     DEFAULT SYSDATE,
+    "LOG_MODIFIED"  DATETIME     DEFAULT SYSDATE,
+    PRIMARY KEY ("BRANCH_ID")
+);
+
+CREATE UNIQUE INDEX "UX_UNDO_LOG" ON "UNDO_LOG" ("XID", "BRANCH_ID");
+```
+
+### 步骤 3：在 Service 方法上添加 @GlobalTransactional 注解
+
+```java
+import io.seata.spring.annotation.GlobalTransactional;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+
+    @GlobalTransactional(name = "create-order", rollbackFor = Exception.class)
+    @Override
+    public Long createOrder(OrderCreateReqVO req) {
+        // 本地操作
+        orderMapper.insert(order);
+
+        // 跨服务调用自动参与分布式事务
+        inventoryApi.deduct(productId, quantity);
+
+        return order.getId();
+    }
+}
+```
+
+**说明**:
+- 只在事务发起方添加注解
+- 被调用的其他服务自动参与，无需额外配置
+- Seata 自动通过 HTTP Header 传递事务 ID
+
+---
+
+## 四、配置汇总
+
+| 配置项 | 开发环境 | 测试环境 | 生产环境 |
+|--------|---------|---------|---------|
+| **tx-service-group** | `dev_tx_group` | `test_tx_group` | `prod_tx_group` |
+| **Nacos 命名空间** | `hwc` | `test` | `prod` |
+| **Seata Server** | `172.16.46.63:30088` | `172.16.46.63:30088` | `172.16.46.63:30088` |
+
+---
+
+## 五、其他事务模式
+
+当前配置默认使用 **AT 模式**（自动事务模式）。Seata 还支持其他事务模式，需要业务自己实现：
+
+### TCC 模式
+
+需要实现 Try、Confirm、Cancel 三个业务方法，使用 `@TwoPhaseBusinessAction` 注解标记。详见官方文档。
+
+### Saga 模式
+
+需要定义 Saga 流程和状态机。详见官方文档。
+
+### XA 模式
+
+需要数据库支持 XA 事务，配置中修改 `data-source-proxy-mode: XA`。
+
+**详见**: https://seata.apache.org/zh-cn/docs/overview/what-is-seata
+
+---
+
+## 六、Seata 控制台
+
+**地址**: `http://172.16.46.63:30087`
+
+可查看全局事务、分支事务、全局锁等监控信息。
+
+---
+
+**官方文档**: https://seata.apache.org/zh-cn/docs/overview/what-is-seata

doc/中铜技术文档/计量单位转换使用文档.md

@@ -0,0 +1,212 @@
+# 计量单位转换业务使用文档
+
+## 一、系统概述
+
+计量单位转换提供统一的计量单位转换服务，支持同一量纲内的单位自动转换。采用**单向配置、双向生效**机制，只需配置"非基准单位 → 基准单位"的转换规则，自动推导反向和间接转换。
+
+**核心特性**：
+- 单向配置、双向生效的转换机制
+- 支持按单位ID、符号、名称进行转换
+- 高精度计算，支持批量操作
+- 跨模块统一服务
+
+## 二、内容配置
+
+### 2.1 管理菜单路径
+后台管理 → 基础管理 → 计量单位 → 计量单位管理
+
+### 2.2 配置功能
+
+#### 计量量纲管理
+- **功能**：创建和管理不同的量纲类型（如重量、长度、体积等）
+- **操作**：新增量纲、编辑量纲信息、删除量纲
+- **每个量纲只能设置一个基准单位**
+
+#### 计量单位管理
+- **功能**：创建和管理具体的计量单位
+- **操作**：新增单位、编辑单位信息、删除单位
+- **关联量纲**：将单位归属到具体的量纲下
+
+#### 转换规则配置
+- **功能**：配置单位间的转换规则
+- **配置原则**：只需配置"非基准单位 → 基准单位"
+- **自动推导**：系统自动推导反向转换和间接转换
+
+### 2.3 配置建议
+
+1. **量纲规划**：提前规划好业务需要的量纲类型
+2. **基准单位选择**：选择业务中最常用、最稳定的单位作为基准
+3. **转换规则**：优先使用整数转换系数，提高计算精度
+4. **定期校验**：使用转换路径校验功能确保配置正确性
+5. **转换完整性校验**：系统提供同一量纲内所有单位能否互相转换的校验功能，确保转换配置的完整性
+
+## 三、API接口清单
+
+### 3.1 单位管理接口
+
+| 接口 | 方法 | 路径 | 说明 | API文档 |
+|------|------|------|------|---------|
+| 获取量纲树 | GET | `/admin-api/base/unit-management/unit-quantity/tree` | 获取量纲和单位树形结构 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E8%AE%A1%E9%87%8F%E5%8D%95%E4%BD%8D%E9%87%8F/getUnitQuantityTree) |
+| 获取单位列表 | GET | `/admin-api/base/unit-management/unt-info/page` | 获取单位列表（用于下拉选择） | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E8%AE%A1%E9%87%8F%E5%8D%95%E4%BD%8D/getUntInfoPage) |
+
+### 3.2 单位转换接口
+
+| 接口 | 方法 | 路径 | 说明 | API文档 |
+|------|------|------|------|---------|
+| 按ID转换单位 | POST | `/admin-api/base/unit-management/unit-conversion/convert` | 通过单位ID转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/convert) |
+| 按符号转换单位 | POST | `/admin-api/base/unit-management/unit-conversion/convert-by-symbol` | 通过单位符号转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/convertBySymbol) |
+| 按名称转换单位 | POST | `/admin-api/base/unit-management/unit-conversion/convert-by-name` | 通过单位名称转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/convertByName) |
+| 批量ID转换 | POST | `/admin-api/base/unit-management/unit-conversion/batch-convert` | 按ID批量转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/batchConvert) |
+| 批量符号转换 | POST | `/admin-api/base/unit-management/unit-conversion/batch-convert-by-symbol` | 按符号批量转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/batchConvertBySymbol) |
+| 批量名称转换 | POST | `/admin-api/base/unit-management/unit-conversion/batch-convert-by-name` | 按名称批量转换 | [文档](http://172.16.46.63:30081/doc.html#/base-server/%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0%20-%20%E5%8D%95%E4%BD%8D%E8%BD%AC%E6%8D%A2/batchConvertByName) |
+
+
+---
+
+## 三、后端业务调用示例
+
+### base模块内使用
+
+```java
+@Service
+public class PurchaseOrderServiceImpl {
+
+    @Resource
+    private UnitConversionService unitConversionService;
+
+    /**
+     * 处理采购订单，统一转换为千克计算
+     */
+    public void processPurchaseOrder(PurchaseOrderSaveReqVO orderVO) {
+        for (PurchaseOrderDetailVO detail : orderVO.getDetails()) {
+            // 方式1：按符号转换
+            UnitConvertBySymbolReqVO convertReq = new UnitConvertBySymbolReqVO();
+            convertReq.setSrcUnitSymbol(detail.getUnt());
+            convertReq.setTgtUnitSymbol("kg");
+            convertReq.setValue(detail.getQty());
+            convertReq.setPrecision(6);
+
+            UnitConvertRespVO result = unitConversionService.convertBySymbol(convertReq);
+            BigDecimal standardQuantity = result.getConvertedValue();
+
+            // 方式2：按ID转换（如果有单位ID）
+            // UnitConvertReqVO convertReq = new UnitConvertReqVO();
+            // convertReq.setSrcUntId(detail.getUntId());
+            // convertReq.setTgtUntId(kgUnitId);
+            // ...
+        }
+    }
+}
+```
+
+---
+
+## 四、跨模块调用
+
+### 4.1 直接Service调用（推荐）
+
+在同一服务内直接注入使用：
+```java
+@Resource
+private UnitConversionService unitConversionService;
+```
+
+### 4.2 跨服务调用（按需使用）
+
+**1. 在 API 模块中定义 Feign 接口：**
+
+```java
+package com.zt.plat.module.base.api;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.base.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 单位转换")
+public interface UnitConversionApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/unit-conversion";
+
+    @PostMapping(PREFIX + "/convert")
+    @Operation(summary = "按ID转换单位")
+    CommonResult<UnitConvertRespVO> convert(@RequestBody UnitConvertReqVO reqVO);
+
+    @PostMapping(PREFIX + "/convert-by-symbol")
+    @Operation(summary = "按符号转换单位")
+    CommonResult<UnitConvertRespVO> convertBySymbol(@RequestBody UnitConvertBySymbolReqVO reqVO);
+}
+```
+
+**2. 在其他服务中调用：**
+
+```java
+@Service
+public class PurchaseServiceImpl {
+
+    @Resource
+    private UnitConversionApi unitConversionApi;
+
+    public void processPurchase(PurchaseVO purchase) {
+        UnitConvertBySymbolReqVO convertReq = new UnitConvertBySymbolReqVO();
+        convertReq.setSrcUnitSymbol(purchase.getUnit());
+        convertReq.setTgtUnitSymbol("kg");
+        convertReq.setValue(purchase.getQuantity());
+        convertReq.setPrecision(6);
+
+        CommonResult<UnitConvertRespVO> result = unitConversionApi.convertBySymbol(convertReq);
+        if (result.isSuccess()) {
+            BigDecimal standardQty = result.getData().getConvertedValue();
+            // 业务处理
+        }
+    }
+}
+```
+
+---
+
+## 五、前端使用
+
+### 5.1 基本API调用
+
+```typescript
+// 获取量纲树
+export const getUnitQuantityTree = () => {
+  return request.get('/admin-api/base/unit-management/unit-quantity/tree')
+}
+
+// 获取单位列表
+export const getUntInfoPage = (params: any) => {
+  return request.get('/admin-api/base/unit-management/unt-info/page', { params })
+}
+
+// 单位转换
+export const convertUnitBySymbol = (data: any) => {
+  return request.post('/admin-api/base/unit-management/unit-conversion/convert-by-symbol', data)
+}
+```
+
+---
+
+## 六、常见问题
+
+**Q1: 前端如何获取单位选项？**
+
+A: 使用 `/admin-api/base/unit-management/unit-quantity/tree` 获取量纲树，然后根据选择的量纲调用 `/admin-api/base/unit-management/unt-info/page` 获取单位列表。
+
+**Q2: 按ID转换和按符号转换哪个更好？**
+
+A: 按ID转换更稳定，因为数据库ID不会变化。建议在前端保存单位ID，在业务转换时使用ID调用。
+
+**Q3: 跨服务调用需要特殊配置吗？**
+
+A: 不需要，项目已经统一配置好。所有Feign客户端都使用 `name = "base-server"`，路径使用 `/rpc-api` 前缀。
+
+**Q4: 批量转换性能问题？**
+
+A: 使用批量接口，设置ignoreErrors=true。
+

doc/外部对接/iwork/iwork电子用印后回调.md

@@ -0,0 +1,290 @@
+# 检验检测模块 IWork电子用印后回调
+
+**简介**:检测报告在用印环节会调用iwork接口发起用印流程。iwork在用印完毕后，调用接口返回结果。
+
+**基础地址**
+
+测试系统地址：http://172.16.46.63:30081/admin-api/databus/api/portal
+
+生产系统地址：待定
+
+**版本**:V1
+
+## 1.总体说明
+
+先调用【上传附件】接口，上传盖章后的文件。然后调用【用印回调】接口，返回用印结果。接口调用时需要进行签名和加密，详见【接口签名】章节。
+
+## 2.上传附件接口
+**接口地址**:`/qms_uploadAtt/v1`
+
+**请求方式**:`POST`
+
+**请求数据类型**:`application/json`
+
+**请求参数**:
+
+| 参数名称        | 参数说明          | 数据类型   | 是否必须 | 
+|---------------|---------------|--------|------|
+| base64Content      | 文件内容          | string | 是    | 
+| fileName        | 文件名称          | string | 是    | 
+| directory    | 文件目录          | long   | 否    | 
+| encrypt    | 是否加密（默认false） | bool   | 否    | 
+
+
+**响应参数**:
+
+| 参数名称                 | 参数说明    | 类型             | 
+|----------------------|---------|----------------| 
+| code                 | 返回代码    | integer(int32) | 
+| msg                  | 返回处理消息  | string         | 
+| data                 | 返回数据对象  | object         | 
+| $\qquad$ id          | id      | string        |  
+| $\qquad$ path        | 文件存储路径  |       string         |   
+| $\qquad$ name        | 文件名     |        string        |   
+| $\qquad$ url         | 文件访问url |       string         |   
+| $\qquad$ previewUrl  | 文件预览url |       string         |   
+| $\qquad$ isEncrypted | 是否加密    | bool           |   
+| $\qquad$ type        | 类型      | string         |   
+| $\qquad$ size        | 大小      | long           |   
+| $\qquad$ createTime  | 创建时间    | 时间戳            |
+
+
+
+## 3.用印回调接口
+**接口地址**:`/qms_sealReply/v1`
+
+**请求方式**:`POST`
+
+**请求数据类型**:`application/json`
+
+**请求参数**:
+
+| 参数名称       | 参数说明           | 请求类型   | 是否必须 |
+|------------|----------------|--------|------|
+| mainId     | 报告id           | string | 是    |
+| fileIds    | 附件id，多值用半角逗号分隔 | string | 是    |
+
+**响应参数**:
+
+| 参数名称                 | 参数说明            | 类型             | 
+|----------------------|-----------------|----------------| 
+| code                 | 错误码：0-成功，其他值-失败 | integer(int32) | 
+| msg                  | 返回处理消息          | string         | 
+
+
+
+## 4.接口签名
+接口签名和加密参考以下代码：
+
+APP_ID和APP_SECRET请联系相关人员获取
+
+
+```java
+public class ApiForIworkExample {
+    public static final String TIMESTAMP = Long.toString(System.currentTimeMillis());
+    private static final String APP_ID = "";
+    private static final String APP_SECRET = "";
+    private static final String ENCRYPTION_TYPE = CryptoSignatureUtils.ENCRYPT_TYPE_AES;
+    private static final String TARGET_API = "http://172.16.46.63:30081/admin-api/databus/api/portal/";
+    private static final HttpClient HTTP_CLIENT = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).build();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final PrintStream OUT = buildConsolePrintStream();
+    public static final String ZT_APP_ID = "ZT-App-Id";
+    public static final String ZT_TIMESTAMP = "ZT-Timestamp";
+    public static final String ZT_NONCE = "ZT-Nonce";
+    public static final String ZT_SIGNATURE = "ZT-Signature";
+    public static final String ZT_AUTH_TOKEN = "ZT-Auth-Token";
+    public static final String CONTENT_TYPE = "Content-Type";
+
+    private ApiForIworkExample() {}
+
+    public static void main(String[] args) throws Exception {
+        executePostExample();
+    }
+
+    private static void executePostExample() throws Exception {
+        Map<String, Object> queryParams = new LinkedHashMap<>();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("mainId", "1983446576685900000");
+        jsonObject.put("fileIds", "1983446576685900001,1983446576685900002");
+        String bodyJson = jsonObject.toJSONString();
+        Map<String, Object> bodyParams = parseBodyJson(bodyJson);
+        String signature = generateSignature(queryParams, bodyParams);
+        String url = TARGET_API + "qms_sealReply/v1";
+        URI requestUri = buildUri(url, queryParams);
+        String nonce = randomNonce();
+        String cipherBody = encryptPayload(bodyJson);
+        OUT.println("原始 Request Body: " + bodyJson);
+        OUT.println("加密 Request Body: " + cipherBody);
+        HttpRequest request = HttpRequest.newBuilder(requestUri)
+                .timeout(Duration.ofSeconds(10))
+                .header(ZT_APP_ID, APP_ID)
+                .header(ZT_TIMESTAMP, TIMESTAMP)
+                .header(ZT_NONCE, nonce)
+                .header(ZT_SIGNATURE, signature)
+//                .header(ZT_AUTH_TOKEN, "82e5c281ddfa4386988fa4074e8794d7")
+                .header(CONTENT_TYPE, "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(cipherBody, StandardCharsets.UTF_8))
+                .build();
+        HttpResponse<String> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
+        printResponse(response);
+    }
+
+    private static String encryptPayload(String plaintext) {
+        try {
+            return CryptoSignatureUtils.encrypt(plaintext, APP_SECRET, ENCRYPTION_TYPE);
+        } catch (Exception ex) {
+            throw new IllegalStateException("Failed to encrypt request body", ex);
+        }
+    }
+
+    private static void printResponse(HttpResponse<String> response) {
+        OUT.println("HTTP Status: " + response.statusCode());
+        String cipherText = response.body();
+        OUT.println("加密 Response: " + cipherText);
+        String plain = tryDecrypt(cipherText);
+        OUT.println("原始 Response: " + normalizePotentialMojibake(plain));
+    }
+
+    private static String randomNonce() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    private static URI buildUri(String baseUrl, Map<String, Object> queryParams) {
+        if (queryParams == null || queryParams.isEmpty()) {
+            return URI.create(baseUrl);
+        }
+        StringBuilder builder = new StringBuilder(baseUrl);
+        builder.append(baseUrl.contains("?") ? '&' : '?');
+        boolean first = true;
+        for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
+            if (!first) {
+                builder.append('&');
+            }
+            first = false;
+            builder.append(URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8));
+            builder.append('=');
+            builder.append(URLEncoder.encode(String.valueOf(entry.getValue()), StandardCharsets.UTF_8));
+        }
+        return URI.create(builder.toString());
+    }
+
+    private static String generateSignature(Map<String, Object> queryParams, Map<String, Object> bodyParams) {
+        TreeMap<String, Object> sorted = new TreeMap<>();
+        if (queryParams != null) {
+            queryParams.forEach((key, value) -> sorted.put(key, normalizeValue(value)));
+        }
+        if (bodyParams != null) {
+            bodyParams.forEach((key, value) -> sorted.put(key, normalizeValue(value)));
+        }
+        sorted.put(ZT_APP_ID, APP_ID);
+        sorted.put(ZT_TIMESTAMP, TIMESTAMP);
+        StringBuilder canonical = new StringBuilder();
+        sorted.forEach((key, value) -> {
+            if (value == null) {
+                return;
+            }
+            if (canonical.length() > 0) {
+                canonical.append('&');
+            }
+            canonical.append(key).append('=').append(value);
+        });
+        OUT.println("原始 签名串: " + canonical);
+        String md5Hex = md5Hex(canonical.toString());
+        OUT.println("原始签名: " + md5Hex);
+        return md5Hex;
+    }
+
+    private static Object normalizeValue(Object value) {
+        if (value == null) {
+            return null;
+        }
+        if (value instanceof Map || value instanceof Iterable) {
+            try {
+                return OBJECT_MAPPER.writeValueAsString(value);
+            } catch (JsonProcessingException ignored) {
+                return value.toString();
+            }
+        }
+        return value;
+    }
+
+    private static Map<String, Object> parseBodyJson(String bodyJson) {
+        if (bodyJson == null || bodyJson.isBlank()) {
+            return Map.of();
+        }
+        try {
+            return OBJECT_MAPPER.readValue(bodyJson, new TypeReference<Map<String, Object>>() { });
+        } catch (IOException ex) {
+            throw new IllegalArgumentException("Failed to parse request body JSON", ex);
+        }
+    }
+
+    private static String md5Hex(String input) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("MD5");
+            byte[] bytes = digest.digest(input.getBytes(StandardCharsets.UTF_8));
+            StringBuilder hex = new StringBuilder(bytes.length * 2);
+            for (byte b : bytes) {
+                String segment = Integer.toHexString(b & 0xFF);
+                if (segment.length() == 1) {
+                    hex.append('0');
+                }
+                hex.append(segment);
+            }
+            return hex.toString();
+        } catch (NoSuchAlgorithmException ex) {
+            throw new IllegalStateException("MD5 algorithm not available", ex);
+        }
+    }
+
+    private static String tryDecrypt(String cipherText) {
+        if (cipherText == null || cipherText.isBlank()) {
+            return cipherText;
+        }
+        try {
+            // Databus 会在凭证开启加密时返回密文，这里做一次解密展示真实响应。
+            return CryptoSignatureUtils.decrypt(cipherText, APP_SECRET, ENCRYPTION_TYPE);
+        } catch (Exception ex) {
+            return "<unable to decrypt> " + ex.getMessage();
+        }
+    }
+
+    // 解决控制台打印 乱码问题
+    private static String normalizePotentialMojibake(String value) {
+        if (value == null || value.isEmpty()) {
+            return value;
+        }
+        long suspectCount = value.chars().filter(ch -> ch >= 0x80 && ch <= 0xFF).count();
+        long highCount = value.chars().filter(ch -> ch > 0xFF).count();
+        if (suspectCount > 0 && highCount == 0) {
+            try {
+                byte[] decoded = value.getBytes(StandardCharsets.ISO_8859_1);
+                String converted = new String(decoded, StandardCharsets.UTF_8);
+                if (converted.chars().anyMatch(ch -> ch > 0xFF)) {
+                    return converted;
+                }
+            } catch (Exception ignored) {
+                return value;
+            }
+        }
+        return value;
+    }
+
+    /**
+     * 输出流编码与当前控制台保持一致，避免中文字符再次出现编码差异。
+     */
+    private static PrintStream buildConsolePrintStream() {
+        try {
+            String consoleEncoding = System.getProperty("sun.stdout.encoding");
+            if (consoleEncoding != null && !consoleEncoding.isBlank()) {
+                return new PrintStream(System.out, true, Charset.forName(consoleEncoding));
+            }
+            return new PrintStream(System.out, true, Charset.defaultCharset());
+        } catch (Exception ignored) {
+            return System.out;
+        }
+    }
+}
+
+```

pom.xml

@@ -17,7 +17,10 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.41</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,10 +180,15 @@
         <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>
-                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -156,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>
@@ -172,8 +214,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -185,8 +227,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -198,8 +240,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>local</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>

qms-server/Dockerfile

@@ -1,4 +1,6 @@
 FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
+#ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
+#FROM ${BASE_IMAGE}
 RUN mkdir -p /appdata/server
 WORKDIR /appdata/server
 ## 将后端项目的 Jar 文件，复制到镜像中
@@ -6,9 +8,14 @@ COPY ./target/qms-server.jar app.jar
 
 ## 设置 TZ 时区
 ENV TZ=Asia/Shanghai
+ENV JAVA_OPTS="-Xms512m -Xmx512m"
+#ENV SW_AGENT_HOME=/opt/skywalking/agent
+#ENV SW_AGENT_NAME=qms-server
+#ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
+#ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
 
 # 暴露端口
 EXPOSE 48205
 
 ## 启动后端项目
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

qms-server/build-docker-push.bat

@@ -0,0 +1,11 @@
+call docker build -t zgty-qms:v6.0.0 .
+
+call docker tag zgty-qms:v6.0.0 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker push 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker rmi 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker rmi zgty-qms:v6.0.0
+
+pause

qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java

@@ -2,6 +2,9 @@ package com.zt.plat.qms;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+import tech.zzjc.tio.starter.TioServerAutoConfiguration;
+import tech.zzjc.tio.starter.annotation.EnableTioServerServer;
 
 /**
  * Qms 服务器的启动类
@@ -11,6 +14,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${zt.info.base-package}
 @SpringBootApplication(scanBasePackages = {"${zt.info.base-package}.qms", "${zt.info.base-package}.module"},
         excludeName = {})
+@EnableTioServerServer
+@Import(TioServerAutoConfiguration.class)
 public class QmsServerApplication {
 
     public static void main(String[] args) {

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

@@ -105,3 +105,87 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
+
+--- #################### liteflow相关配置 ####################
+liteflow:
+  #规则文件路径
+  rule-source: el_xml:com.zt.plat.module.qms.core.liteflow.parser.QmsXmlFlowELParser
+  #-----------------以下非必须-----------------
+  #liteflow是否开启，默认为true
+  enable: true
+  #liteflow的banner打印是否开启，默认为true
+  print-banner: true
+  #上下文的初始数量槽，默认值为1024，这个值不用刻意配置，这个值会自动扩容
+  slot-size: 1024
+  #FlowExecutor的execute2Future的线程数，默认为64
+  main-executor-works: 64
+  #FlowExecutor的execute2Future的自定义线程池Builder，LiteFlow提供了默认的Builder
+  main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder
+  #自定义请求ID的生成类，LiteFlow提供了默认的生成类
+  request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator
+  #全局异步节点线程池大小，默认为64
+  global-thread-pool-size: 64
+  #全局异步节点线程池队列大小，默认为512
+  global-thread-pool-queue-size: 512
+  #全局异步节点线程池自定义Builder，LiteFlow提供了默认的线程池Builder
+  global-thread-pool-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultGlobalExecutorBuilder
+  #异步线程最长的等待时间(只用于when)，默认值为15000
+  when-max-wait-time: 15000
+  #异步线程最长的等待时间(只用于when)，默认值为MILLISECONDS，毫秒
+  when-max-wait-time-unit: MILLISECONDS
+  #每个WHEN是否用单独的线程池
+  when-thread-pool-isolate: false
+  #设置解析模式，一共有三种模式，PARSE_ALL_ON_START | PARSE_ALL_ON_FIRST_EXEC | PARSE_ONE_ON_FIRST_EXEC
+  parse-mode: PARSE_ONE_ON_FIRST_EXEC
+  #全局重试次数，默认为0
+  retry-count: 0
+  #是否支持不同类型的加载方式混用，默认为false
+  support-multiple-type: false
+  #全局默认节点执行器
+  node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor
+  #是否打印执行中过程中的日志，默认为true
+  print-execution-log: true
+  #是否开启本地文件监听，默认为false
+  enable-monitor-file: false
+  #是否开启快速解析模式，默认为false
+  fast-load: false
+  #是否开启Node节点实例ID持久化，默认为false
+  enable-node-instance-id: false
+  #是否开启虚拟线程(只在JDK21+环境有效)，默认为true
+  enable-virtual-thread: true
+  #简易监控配置选项
+  monitor:
+    #监控是否开启，默认不开启
+    enable-log: false
+    #监控队列存储大小，默认值为200
+    queue-limit: 200
+    #监控一开始延迟多少执行，默认值为300000毫秒，也就是5分钟
+    delay: 300000
+    #监控日志打印每过多少时间执行一次，默认值为300000毫秒，也就是5分钟
+    period: 300000
+
+zzjc:
+  druid:
+    sql-log: true
+  snowflake:
+    data-center-id: 30
+  tio:
+    server:
+      # port
+      port: 8320
+      # 心跳时间
+      heartbeat-timeout: 20000
+    websocket:
+      # enable websocket default false
+      enable: true
+      # websocket port
+      port: 8330
+    # 集群配置 默认关闭，集群开启需要redis
+    cluster:
+      enabled: true
+      group: true
+      redis:
+        mode: single
+        ip: 172.16.46.63 # 地址
+        port: 30379 # 端口
+        database: 0 # 数据库索引

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

@@ -56,6 +56,12 @@ spring:
       database: 0 # 数据库索引
 #    password: 123456 # 密码，建议生产环境开启
 
+--- #################### MQ 消息队列相关配置 ####################
+
+# rocketmq 配置项，对应 RocketMQProperties 配置类
+rocketmq:
+  name-server: 172.16.46.63:30876 # RocketMQ Namesrv
+
 xxl:
   job:
     admin:
@@ -85,6 +91,32 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+justauth:
+  enabled: true
+  type:
+    DINGTALK: # 钉钉
+      client-id: dingvrnreaje3yqvzhxg
+      client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI
+      ignore-check-redirect-uri: true
+    WECHAT_ENTERPRISE: # 企业微信
+      client-id: wwd411c69a39ad2e54
+      client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
+      agent-id: 1000004
+      ignore-check-redirect-uri: true
+    # noinspection SpringBootApplicationYaml
+    WECHAT_MINI_PROGRAM: # 微信小程序
+      client-id: ${dollar}{wx.miniapp.appid}
+      client-secret: ${dollar}{wx.miniapp.secret}
+      ignore-check-redirect-uri: true
+      ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验
+    WECHAT_MP: # 微信公众号
+      client-id: ${dollar}{wx.mp.app-id}
+      client-secret: ${dollar}{wx.mp.secret}
+      ignore-check-redirect-uri: true
+  cache:
+    type: REDIS
+    prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
+    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
 # 芋道配置项，设置当前项目所有自定义的配置
 zt:
@@ -95,3 +127,87 @@ zt:
   access-log: # 访问日志的配置项
     enable: true
 
+
+--- #################### liteflow相关配置 ####################
+liteflow:
+  #规则文件路径
+  rule-source: el_xml:com.zt.plat.module.qms.core.liteflow.parser.QmsXmlFlowELParser
+  #-----------------以下非必须-----------------
+  #liteflow是否开启，默认为true
+  enable: true
+  #liteflow的banner打印是否开启，默认为true
+  print-banner: true
+  #上下文的初始数量槽，默认值为1024，这个值不用刻意配置，这个值会自动扩容
+  slot-size: 1024
+  #FlowExecutor的execute2Future的线程数，默认为64
+  main-executor-works: 64
+  #FlowExecutor的execute2Future的自定义线程池Builder，LiteFlow提供了默认的Builder
+  main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder
+  #自定义请求ID的生成类，LiteFlow提供了默认的生成类
+  request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator
+  #全局异步节点线程池大小，默认为64
+  global-thread-pool-size: 64
+  #全局异步节点线程池队列大小，默认为512
+  global-thread-pool-queue-size: 512
+  #全局异步节点线程池自定义Builder，LiteFlow提供了默认的线程池Builder
+  global-thread-pool-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultGlobalExecutorBuilder
+  #异步线程最长的等待时间(只用于when)，默认值为15000
+  when-max-wait-time: 15000
+  #异步线程最长的等待时间(只用于when)，默认值为MILLISECONDS，毫秒
+  when-max-wait-time-unit: MILLISECONDS
+  #每个WHEN是否用单独的线程池
+  when-thread-pool-isolate: false
+  #设置解析模式，一共有三种模式，PARSE_ALL_ON_START | PARSE_ALL_ON_FIRST_EXEC | PARSE_ONE_ON_FIRST_EXEC
+  parse-mode: PARSE_ONE_ON_FIRST_EXEC
+  #全局重试次数，默认为0
+  retry-count: 0
+  #是否支持不同类型的加载方式混用，默认为false
+  support-multiple-type: false
+  #全局默认节点执行器
+  node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor
+  #是否打印执行中过程中的日志，默认为true
+  print-execution-log: true
+  #是否开启本地文件监听，默认为false
+  enable-monitor-file: false
+  #是否开启快速解析模式，默认为false
+  fast-load: false
+  #是否开启Node节点实例ID持久化，默认为false
+  enable-node-instance-id: false
+  #是否开启虚拟线程(只在JDK21+环境有效)，默认为true
+  enable-virtual-thread: true
+  #简易监控配置选项
+  monitor:
+    #监控是否开启，默认不开启
+    enable-log: false
+    #监控队列存储大小，默认值为200
+    queue-limit: 200
+    #监控一开始延迟多少执行，默认值为300000毫秒，也就是5分钟
+    delay: 300000
+    #监控日志打印每过多少时间执行一次，默认值为300000毫秒，也就是5分钟
+    period: 300000
+
+zzjc:
+  druid:
+    sql-log: true
+  snowflake:
+    data-center-id: 30
+  tio:
+    server:
+      # port
+      port: 8320
+      # 心跳时间
+      heartbeat-timeout: 20000
+    websocket:
+      # enable websocket default false
+      enable: true
+      # websocket port
+      port: 8330
+    # 集群配置 默认关闭，集群开启需要redis
+    cluster:
+      enabled: true
+      group: true
+      redis:
+        mode: single
+        ip: 172.16.46.63 # 地址
+        port: 30379 # 端口
+        database: 0 # 数据库索引

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 配置
@@ -114,10 +114,14 @@ zt:
       - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   swagger:
-    title: 管理后台
-    description: 提供管理员管理的所有功能
+    title: Qms 模块
+    description: 提供 Qms 管理的所有功能
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true
-
+    ignore-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
+  security:
+    permit-all-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
 debug: false

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

@@ -29,6 +29,7 @@ public interface ErrorCodeConstants {
 	ErrorCode DATA_FORM_NOT_EXISTS = new ErrorCode(1_032_001_000, "通用数据不存在");
 	ErrorCode DATA_FORM_EMPTY_COLLECTION_ID = new ErrorCode(1_032_001_000, "未指定数据集ID");
 	ErrorCode DICTIONARY_BUSINESS_NOT_EXISTS = new ErrorCode(1_032_001_000, "业务参数字典不存在");
+	ErrorCode DATA_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_001_000, "表单设计器模板不存在");
 	ErrorCode DICTIONARY_BUSINESS_DATA_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[数据]key重名，请联系管理员处理！");
 	ErrorCode DICTIONARY_BUSINESS_CATEGORY_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[分类]key重名，请联系管理员处理！");
 	ErrorCode DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE = new ErrorCode(1_032_001_000, "分类名称重复，请重新输入");
@@ -36,25 +37,36 @@ public interface ErrorCodeConstants {
 	/*==============================config 配置模块 1_032_050_000 ~ 1_032_099_999 ===============================*/
 	ErrorCode CONFIG_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表模版配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法配置不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法参数配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_RANGE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目区间不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目判定不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_COEFFICIENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目补正系数不存在");
 	ErrorCode CONFIG_REPORT_FIELD_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表字段配置不存在");
 	ErrorCode CONFIG_STANDARD_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样类型配置不存在");
 	ErrorCode CONFIG_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样检测项目配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样配置不存在");
-	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与检测方法配置不存在");
+	ErrorCode CONFIG_SUB_SAMPLE_PARENT_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与检测方法配置不存在");
+	//ErrorCode CONFIG_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与复检配置不存在");
+	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与分样检测方法配置表不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
 	ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
 	ErrorCode CONFIG_SAMPLE_FLOW_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程配置不存在");
 	ErrorCode CONFIG_REPORT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表类型配置不存在");
 	ErrorCode CONFIG_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目配置不存在");
 	ErrorCode CONFIG_ENTRUST_SOURCE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源配置不存在");
-	ErrorCode CONFIG_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报告类型配置不存在");
+	ErrorCode CONFIG_ENTRUST_SOURCE_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源与样品类型配置不存在");
+
 	ErrorCode CONFIG_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "主样配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目参数配置不存在");
 	ErrorCode CONFIG_WAREHOUSE_LOCATION_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品库位信息不存在");
 	ErrorCode CONFIG_SIMPLE_FLOW_RULE_NOT_EXISTS = new ErrorCode(1_032_050_000, "LiteFlow规则配置不存在");
 	ErrorCode CONFIG_SIMPLE_FLOW_CODE_NOT_EXISTS = new ErrorCode(1_032_050_000, "LiteFlow脚本配置不存在");
+	ErrorCode CONFIG_RULE_NOT_EXISTS = new ErrorCode(1_032_050_000, "规则配置不存在");
+	
+	ErrorCode CONFIG_XRF_LINE_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光分析线不存在");
+	ErrorCode CONFIG_XRF_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光采集检测项目配置不存在");
+	ErrorCode CONFIG_XRF_CONVERSION_RATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光数据采集特殊检测项目转换率配置不存在");
 
 	ErrorCode BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品大类管理不存在");
 	ErrorCode MATERIAL_ASSAY_STANDARD_DETAIL_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测标准明细不存在");
@@ -63,6 +75,7 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_ASSAY_STANDARD_FORECAST_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "物料检测标准来样品位配置不存在");
 	
 	ErrorCode CONFIG_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品交接配置不存在");
+	ErrorCode CONFIG_USER_SIGNATURE_NOT_EXISTS = new ErrorCode(1_032_050_000, "手写签名不存在");
 
 	//dictionary
 	ErrorCode DICTIONARY_SAMPLE_FLOW_NODE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程节点字典不存在");
@@ -70,6 +83,14 @@ public interface ErrorCodeConstants {
 	ErrorCode DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目字典不存在");
 	ErrorCode DICTIONARY_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品类型字典不存在");
 	
+	ErrorCode CONFIG_QC_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样与检测方法配置不存在");
+	ErrorCode CONFIG_QC_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控与定值样关系不存在");
+	ErrorCode CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样检测方法参数配置不存在");
+	ErrorCode CONFIG_PERMISSION_NOT_EXISTS = new ErrorCode(1_032_050_000, "权限配置不存在");
+	ErrorCode CONFIG_PERMISSION_DUPLICATE = new ErrorCode(1_032_050_000, "权限配置数据有误");
+	ErrorCode CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "存放位置不存在");
+	ErrorCode CONFIG_WAREHOUSE_LOCATION_CODE_DUPLICATE = new ErrorCode(1_032_050_000, "库位编码重复，请检查！");
+
 	/*=================================bus 检验业务  1_032_100_000 ~ 1_032_149_999==================================*/
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品明细不存在");
@@ -81,9 +102,11 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_HANDOVER_RECORD_SUB_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样交接记录业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ASSAY_RESULT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记来样品位不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务业务不存在");
+	ErrorCode BUSINESS_ASSAY_TASK_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务参数业务不存在");
 	ErrorCode BUSINESS_ASSAY_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测项目数据业务不存在");
 	ErrorCode BUSINESS_ASSAY_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测参数数据业务不存在");
-	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定数据业务不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定业务不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定检测项目数据业务不存在");
 	ErrorCode BUSINESS_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品交接单业务不存在");
 	ErrorCode BUSINESS_SAMPLE_HANDOVER_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品交接明细不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测任务分配业务不存在");
@@ -96,16 +119,88 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样业务不存在");
 	ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样检测项目业务不存在");
 	
-	ErrorCode BUSINESS_TEAM_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
+	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_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
-	ErrorCode BUSINESS_DOCUMENT_DATA_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, "质控样检测项目数据业务不存在");
+	ErrorCode BUSINESS_QC_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
+
+	ErrorCode BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务数据,管理样、标准样不存在");
+	ErrorCode BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
+	ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
+	ErrorCode BUSINESS_QC_MANAGEMENT_SAMPLE_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数不存在");
+	ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
+	ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
+	
+	ErrorCode BUSINESS_XRF_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "荧光采集记录不存在");
+
+
+	//检测报告
+	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
+	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
+	ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
+	ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
+	ErrorCode REPORT_DOCUMENT_FILE_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告附件不存在");
+
+	ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
+	ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
 
 	/*=================================resource  资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
-	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");
-	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备大类不存在");
-	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
-	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
+//	----------设备管理----------
+	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备信息不存在");
+	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备大类不存在");
+	ErrorCode DEVICE_MAINTAIN_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护数据不存在");
+	ErrorCode DEVICE_MAINTAIN_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护项不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置项不存在");
+	ErrorCode DEVICE_PERIOD_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查数据不存在");
+
+	ErrorCode DEVICE_PERIOD_CHECK_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查计划不存在");
+	ErrorCode DEVICE_REPAIR_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修申请数据不存在");
+	ErrorCode DEVICE_REPAIR_RESULT_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修结果明细不存在");
+	ErrorCode DEVICE_REPAIR_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修明细不存在");
+	ErrorCode DEVICE_CALIBRATION_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准计划不存在");
+	ErrorCode DEVICE_CALIBRATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准数据不存在");
+	ErrorCode DEVICE_USE_RECORD_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备使用记录不存在");
+	ErrorCode DEVICE_AFFILIATION_RELATIVITY_NOT_EXISTS = new ErrorCode(1_032_150_000, "附属设备关系不存在");
+	ErrorCode DEVICE_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请明细数据不存在");
+	ErrorCode DEVICE_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请数据不存在");
+	ErrorCode DEVICE_CONFIG_FLOW_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备通用流程配置不存在");
+
+//	-------------物料试剂-------------
+	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "试剂耗材不存在");
+	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类不存在");
+	ErrorCode MATERIAL_PRODUCT_PARENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类的父类不存在");
+	ErrorCode MATERIAL_PRODUCT_CODE_EXISTED = new ErrorCode(1_032_160_000, "物料大类编码重复");
+	ErrorCode MATERIAL_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_032_160_000, "分类下含有子分类或物料大类，不可删除");
+	ErrorCode MATERIAL_PRODUCT_EXISTS_BATCH = new ErrorCode(1_032_160_000, "物料大类下存在物料批次，不可删除");
+	ErrorCode MATERIAL_PRODUCTS_EXISTS_CATEGORY = new ErrorCode(1_032_160_000, "物料大类列表中存在分类数据");
+	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程明细不存在");
+	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程不存在");
+
+	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次不存在");
+	ErrorCode MATERIAL_BATCH_ASSIGN_END = new ErrorCode(1_032_160_000, "物料批次已拆分，不可操作");
+	ErrorCode GONGDUAN_BELONG_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段所属的物料批次不一致");
+	ErrorCode GONGDUAN_QUANTITY_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段累加数量和批次数量不一致");
+	ErrorCode MATERIAL_BATCH_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_160_000, "客户端版本管理不存在");
+
+	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "存放位置不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
+
+
+
 
 
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
@@ -114,6 +209,11 @@ public interface ErrorCodeConstants {
 
 
 	/*================================= office 办公 1_032_250_000 ~ 1_032_299_999 ==================================*/
+	ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商不存在");
+	ErrorCode SUPPLIER_PROPERTIES_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商属性不存在");
+	ErrorCode SUPPLIER_EVALUATION_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价不存在");
+	ErrorCode SUPPLIER_EVALUATION_AT_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价关系不存在");
+
 
 
 	/*================================= dzj 大质检 1_032_300_000 ~ 1_032_349_999 ==================================*/

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

@@ -7,6 +7,20 @@ public class QmsBpmConstant {
      * */
     public static final String BPM_CALLBACK_BEAN_NAME = "bpmCallbackBean";
 
+    /**
+     * 流程回调时使用的ActivityId Key
+     * */
+    public static final String BPM_CALLBACK_ACTIVITY_ID = "bpmCallbackActivityId";
+    public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions";
+    public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag";
+    public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag";
+    public static final String BPM_REJECT_TO_FIRST_FLAG = "rejectToFirstActivity";
+    public static final String BPM_CUR_ACTIVITY_INS_ID = "currentActivityInsId";        //当前活动实例id
+    public static final String BPM_PROCESS_INS_ID = "processInstanceId";        //当前活动实例id
+
+    //驳回标记前缀
+    public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";
+
     /**
      * 流程回调时使用的beanName Key
      * */

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

@@ -27,19 +27,25 @@ public interface QmsCommonConstant {
     String FAILURE = "failure";
     
     /** 已失败 **/
-    String FAILED = "failed";
+    //String FAILED = "failed";
     
     /** 正常 **/
     String NORMAL = "normal";
     
+    /** 超差 **/
+    String EXCEEDS_TOLERANCE = "exceeds_tolerance";
+    
     /** 隔离 **/
     String ISOLATION = "isolation";
     
     /** 进行中 **/
     String IN_PROGRESS = "in_progress";
     
+    /** 已保存 **/
+    String SAVED = "saved";
+    
     /** 提交 **/
-    String SUBMIT = "submit";
+    //String SUBMIT = "submit";
     
     /** 已提交 **/
     String SUBMITTED = "submitted";
@@ -47,6 +53,9 @@ public interface QmsCommonConstant {
     /** 未开始 **/
     String NOT_START = "not_start";
     
+    /** 审核中 **/
+    String RUNNING = "running";
+    
     /** 待处理 **/
     String PENDING = "pending";
     
@@ -73,6 +82,24 @@ public interface QmsCommonConstant {
     
     /** 已完成 **/
     String COMPLETED = "completed";
+
+    /** 已下架 **/
+    String TAKEN_OFF = "taken_off";
+
+    /** 分配任务 **/
+    String TASK_ASSIGN = "task_assign";
+    
+    /** 领取任务 **/
+    String TASK_CLAIM = "task_claim";
+    
+    /** 固定字段 **/
+    String FIELD_FIXED = "field_fixed";
+    
+    /** 动态字段 **/
+    String FIELD_DYNAMIC = "field_dynamic";
+    
+    /** 计算字段 **/
+    String FIELD_CALCULATED = "field_calculated";
     
     /** 委托登记 **/
     String ENTRUST_REGISTRATION = "entrust_registration";
@@ -80,4 +107,109 @@ public interface QmsCommonConstant {
     /** 检验委托 **/
     String ENTRUST_INSPECTION = "entrust_inspection";
     
+    /** 委托样品类型： 委检样 **/
+    String ENTRUST_COMMISSION_INSPECTION_SAMPLE = "commissionInspectionSample";
+
+    /** 委托样品类型： 商检分析样 **/
+    String ENTRUST_INSPECTION_ANALYSIS_SAMPLE = "inspectionAnalysisSample";
+
+    /** 委托样品类型： 商检综合 **/
+    String ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE = "comprehensiveInspectionSample";
+    
+    /** 中心收样 **/
+    String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
+    
+    /** 中心送样 **/
+    String FLOW_NODE_CENTER_SEND = "flw_center_send";
+    
+    /** 班组收样 **/
+    String FLOW_NODE_TEAM_RECEIVE = "flw_team_receive";
+    
+    /** 样品编密(内部简码) **/
+    String FlOW_NODE_SAMPLE_ENCRYPT = "flw_sample_encrypt";
+    
+    /** 分析收样 **/
+    String FLOW_NODE_ANALYSIS_RECEIVE = "flw_analysis_receive";
+    
+    /** 分析 **/
+    String FLOW_NODE_ANALYSIS = "flw_analysis";
+    
+    /** 分析送样 **/
+    String FLOW_NODE_ANALYSIS_SEND = "flw_analysis_send";
+    
+    /** 班组送样 **/
+    String FLOW_NODE_TEAM_SEND = "flw_team_send";
+
+    /** 样品归库 **/
+    String FLOW_SAMPLE_STORAGE = "flw_sample_storage";
+
+    /** 结束 **/
+    String FLOW_NODE_END = "flw_end";
+    
+    /** 单杯 **/
+    String ASSAY_TYPE_SINGLE_CUP = "single_cup";
+    
+    /** 双杯 **/
+    String ASSAY_TYPE_DOUBLE_CUP = "double_cup";
+    
+    /** 平行 **/
+    String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
+    
+    /** 配料 **/
+    String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient";
+    
+    /** 报出 **/
+    String ASSAY_PROJECT_USAGE_REPORT = "report";
+    
+    /** 配料和报出 **/
+    String ASSAY_PROJECT_USAGE_INGREDIENT_REPORT = "ingredient_report";
+    
+    /** 品质控制 **/
+    String ASSAY_PROJECT_USAGE_QUALITY_CONTROL = "quality_control";
+    
+    /** 结果判定-初始值 **/
+    String ASMT_INITIAL = "initial";
+    
+    /** 结果判定-待上报 **/
+    String ASMT_PENDING_REPORT = "pending_report";
+    
+    /** 结果判定-待判定 **/
+    String ASMT_PENDING_ASSESSMENT = "pending_assessment";
+    
+    /** 结果判定-复测中 **/
+    String ASMT_RE_INSPECTED = "re_inspected";
+    
+    /** 结果判定-已上报 */
+    String ASMT_REPORTED = "reported";
+
+    /** 检验完成状态-完成 **/
+    String CHECKED = "checked";
+
+    /** 检验完成状态-未完成 **/
+    String UNCHECKED = "unchecked";
+    
+    /** 数据回报状态 未回报 **/
+    String UNRETURNED = "unreturned";
+    
+    
+    /** 自动 **/
+    String AUTOMATIC = "automatic";
+    
+    /** 手动 **/
+    String MANUAL = "manual";
+
+
+    /** 样品库操作类型： 归库、调拨、下架 **/
+    String SAMPLE_STORAGE_OPERATION_TYPE_STORAGE = "storage";
+    String SAMPLE_STORAGE_OPERATION_TYPE_TRANSFER = "dispatch";
+    String SAMPLE_STORAGE_OPERATION_TYPE_TAKEN_OFF = "take_off";
+
+
+    /** 允许提交 **/
+    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

@@ -0,0 +1,27 @@
+package com.zt.plat.module.qms.enums;
+
+/**
+ * 权限模块常量
+ */
+public interface QmsPermissionConstant {
+    //目标权限类型-角色
+    String TARGET_TYPE_ROLE = "role";
+
+    //目标权限类型-用户
+    String TARGET_TYPE_USER = "user";
+
+    //目标权限类型-部门
+    String TARGET_TYPE_DEPT = "dept";
+
+    //目标权限类型-自定义
+    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-api/src/main/java/com/zt/plat/module/qms/enums/QmsWarehouseLocationConstant.java

@@ -0,0 +1,21 @@
+package com.zt.plat.module.qms.enums;
+
+/**
+ * 权限模块常量
+ */
+public interface QmsWarehouseLocationConstant {
+    //数据类型
+    String DATA_TYPE_LOCATION = "库位";
+
+    String DATA_TYPE_WAREHOUSE = "仓库";
+
+
+    //仓库分类
+    String WAREHOUSE_TYPE_SAMPLE = "样品库";
+    String WAREHOUSE_TYPE_MATERIAL = "物料试剂";
+
+    //样品下架操作方式
+    String SAMPLE_TAKE_OFF_ACTION_WAY_SAMPLE = "sample";
+    String SAMPLE_TAKE_OFF_ACTION_WAY_LOCATION = "warehouseLocation";
+
+}

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

@@ -16,9 +16,7 @@
     <description>
         QMS模块。
     </description>
-    <properties>
-        <zzjc.tio.version>3.8.3.v20230112-RELEASE</zzjc.tio.version>
-    </properties>
+    
     <dependencies>
         <!-- Spring Cloud 基础 -->
         <dependency>
@@ -110,6 +108,12 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 工具类相关 -->
@@ -135,27 +139,22 @@
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
-            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-javax-pro</artifactId>
-            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-groovy</artifactId>
-            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-qlexpress</artifactId>
-            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-graaljs</artifactId>
-            <version>2.15.0</version>
         </dependency>
 
         <!-- pdfbox -->
@@ -192,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 {
 
 
@@ -44,14 +46,14 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
 
     @PostMapping("/create")
     @Operation(summary = "创建检测参数数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
     public CommonResult<BusinessAssayParameterDataRespVO> createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) {
         return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检测参数数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
     public CommonResult<Boolean> updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) {
         businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO);
         return success(true);
@@ -60,7 +62,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
     @DeleteMapping("/delete")
     @Operation(summary = "删除检测参数数据业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayParameterData(@RequestParam("id") Long id) {
         businessAssayParameterDataService.deleteBusinessAssayParameterData(id);
         return success(true);
@@ -69,7 +71,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除检测参数数据业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) {
         businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds());
         return success(true);
@@ -78,7 +80,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
     @GetMapping("/get")
     @Operation(summary = "获得检测参数数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
     public CommonResult<BusinessAssayParameterDataRespVO> getBusinessAssayParameterData(@RequestParam("id") Long id) {
         BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id);
         return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class));
@@ -86,7 +88,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
 
     @GetMapping("/page")
     @Operation(summary = "获得检测参数数据业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
     public CommonResult<PageResult<BusinessAssayParameterDataRespVO>> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) {
         PageResult<BusinessAssayParameterDataDO> pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class));
@@ -94,7 +96,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测参数数据业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -45,14 +48,14 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
 
     @PostMapping("/create")
     @Operation(summary = "创建检测项目数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
     public CommonResult<BusinessAssayProjectDataRespVO> createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) {
         return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检测项目数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
     public CommonResult<Boolean> updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) {
         businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO);
         return success(true);
@@ -61,7 +64,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
     @DeleteMapping("/delete")
     @Operation(summary = "删除检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayProjectData(@RequestParam("id") Long id) {
         businessAssayProjectDataService.deleteBusinessAssayProjectData(id);
         return success(true);
@@ -70,7 +73,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除检测项目数据业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) {
         businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds());
         return success(true);
@@ -79,7 +82,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
     @GetMapping("/get")
     @Operation(summary = "获得检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
     public CommonResult<BusinessAssayProjectDataRespVO> getBusinessAssayProjectData(@RequestParam("id") Long id) {
         BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id);
         return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class));
@@ -87,7 +90,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
 
     @GetMapping("/page")
     @Operation(summary = "获得检测项目数据业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
     public CommonResult<PageResult<BusinessAssayProjectDataRespVO>> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) {
         PageResult<BusinessAssayProjectDataDO> pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class));
@@ -95,7 +98,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测项目数据业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
 
     @PostMapping("/create")
     @Operation(summary = "创建检测报表数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')")
     public CommonResult<BusinessAssayReportDataRespVO> createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) {
         return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检测报表数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')")
     public CommonResult<Boolean> updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) {
         businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
     @DeleteMapping("/delete")
     @Operation(summary = "删除检测报表数据业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayReportData(@RequestParam("id") Long id) {
         businessAssayReportDataService.deleteBusinessAssayReportData(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除检测报表数据业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) {
         businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
     @GetMapping("/get")
     @Operation(summary = "获得检测报表数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
     public CommonResult<BusinessAssayReportDataRespVO> getBusinessAssayReportData(@RequestParam("id") Long id) {
         BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id);
         return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
 
     @GetMapping("/page")
     @Operation(summary = "获得检测报表数据业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
     public CommonResult<PageResult<BusinessAssayReportDataRespVO>> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) {
         PageResult<BusinessAssayReportDataDO> pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测报表数据业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -105,4 +108,13 @@ public class BusinessAssayReportDataController implements BusinessControllerMark
                         BeanUtils.toBean(list, BusinessAssayReportDataRespVO.class));
     }
 
+    @GetMapping("/queryWaitingToAddData")
+    @Operation(summary = "待编制报表数据查询")
+    @Parameter(name = "mainId", description = "报告id", required = true, example = "1024")
+    public CommonResult<PageResult<BusinessAssayReportDataRespVO>> queryWaitingToAddData(BusinessAssayReportDataPageReqVO pageReqVO) {
+        PageResult<BusinessAssayReportDataDO> page = businessAssayReportDataService.queryWaitingDataForReport(pageReqVO);
+
+        return success(BeanUtils.toBean(page, BusinessAssayReportDataRespVO.class));
+    }
+
 }

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 {
 
 
@@ -45,14 +50,14 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建检测任务分配业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')")
     public CommonResult<BusinessAssayTaskRespVO> createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) {
         return success(businessAssayTaskService.createBusinessAssayTask(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检测任务分配业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')")
     public CommonResult<Boolean> updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) {
         businessAssayTaskService.updateBusinessAssayTask(updateReqVO);
         return success(true);
@@ -61,7 +66,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除检测任务分配业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTask(@RequestParam("id") Long id) {
         businessAssayTaskService.deleteBusinessAssayTask(id);
         return success(true);
@@ -70,7 +75,7 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除检测任务分配业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) {
         businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds());
         return success(true);
@@ -79,23 +84,35 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得检测任务分配业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
-    public CommonResult<BusinessAssayTaskRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
-        BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
-        return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class));
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
+    public CommonResult<BusinessAssayTaskExtendRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
+    	BusinessAssayTaskExtendRespVO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
+        return success(businessAssayTask);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得检测任务分配业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
+    //@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);
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得检测任务分配业务分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
+    public CommonResult<List<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskList(@Valid BusinessAssayTaskPageReqVO reqVO) {
+        List<BusinessAssayTaskExtendRespVO> listResult = businessAssayTaskService.getBusinessAssayTaskList(reqVO);
+        return success(listResult);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测任务分配业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -42,14 +47,14 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
 
     @PostMapping("/create")
     @Operation(summary = "创建子样检测任务业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
     public CommonResult<BusinessAssayTaskDataRespVO> createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) {
         return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新子样检测任务业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
     public CommonResult<Boolean> updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) {
         businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO);
         return success(true);
@@ -58,7 +63,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
     @DeleteMapping("/delete")
     @Operation(summary = "删除子样检测任务业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTaskData(@RequestParam("id") Long id) {
         businessAssayTaskDataService.deleteBusinessAssayTaskData(id);
         return success(true);
@@ -67,7 +72,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除子样检测任务业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) {
         businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds());
         return success(true);
@@ -76,7 +81,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
     @GetMapping("/get")
     @Operation(summary = "获得子样检测任务业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
     public CommonResult<BusinessAssayTaskDataRespVO> getBusinessAssayTaskData(@RequestParam("id") Long id) {
         BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id);
         return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class));
@@ -84,23 +89,31 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
     
     @GetMapping("/getUnAssayTaskGroupList")
     @Operation(summary = "获得未指派的子样检测任务业务分组列表")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    //@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);
 	}
 
     @GetMapping("/getUnAuditTaskGroupList")
     @Operation(summary = "获得未审核的子样检测任务业务分组列表")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    //@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);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得子样检测任务业务列表")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
     public CommonResult<List<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataReqVO reqVO) {
         List<BusinessAssayTaskDataExtendRespVO> listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO);
         return success(listResult);
@@ -108,7 +121,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
 
     @GetMapping("/page")
     @Operation(summary = "获得子样检测任务业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
     public CommonResult<PageResult<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) {
         PageResult<BusinessAssayTaskDataExtendRespVO> pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO);
         return success(pageResult);
@@ -116,7 +129,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出子样检测任务业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
 
     @PostMapping("/create")
     @Operation(summary = "创建检测任务分配明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')")
     public CommonResult<BusinessAssayTaskDetailRespVO> createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) {
         return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检测任务分配明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')")
     public CommonResult<Boolean> updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) {
         businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
     @DeleteMapping("/delete")
     @Operation(summary = "删除检测任务分配明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) {
         businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除检测任务分配明细")
-                @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
     public CommonResult<Boolean> deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) {
         businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
     @GetMapping("/get")
     @Operation(summary = "获得检测任务分配明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
     public CommonResult<BusinessAssayTaskDetailRespVO> getBusinessAssayTaskDetail(@RequestParam("id") Long id) {
         BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id);
         return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class));
@@ -86,20 +89,28 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
 
     @GetMapping("/page")
     @Operation(summary = "获得检测任务分配明细分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
-    public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
-        PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    public CommonResult<PageResult<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
+        PageResult<BusinessAssayTaskDetailExtendRespVO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得检测任务分配明细分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    public CommonResult<List<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) {
+        List<BusinessAssayTaskDetailExtendRespVO> resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO);
+        return success(resultList);
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测任务分配明细 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessAssayTaskDetailDO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
+        List<BusinessAssayTaskDetailExtendRespVO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "检测任务分配明细.xls", "数据", BusinessAssayTaskDetailRespVO.class,
                         BeanUtils.toBean(list, BusinessAssayTaskDetailRespVO.class));

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

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

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

@@ -23,6 +23,8 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -36,6 +38,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-base-sample")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessBaseSampleController implements BusinessControllerMarker {
 
 
@@ -44,14 +47,14 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建主样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
     public CommonResult<BusinessBaseSampleRespVO> createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) {
         return success(businessBaseSampleService.createBusinessBaseSample(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新主样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
     public CommonResult<Boolean> updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) {
         businessBaseSampleService.updateBusinessBaseSample(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除主样业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
     public CommonResult<Boolean> deleteBusinessBaseSample(@RequestParam("id") Long id) {
         businessBaseSampleService.deleteBusinessBaseSample(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除主样业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
     public CommonResult<Boolean> deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) {
         businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得主样业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
     public CommonResult<BusinessBaseSampleRespVO> getBusinessBaseSample(@RequestParam("id") Long id) {
         BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id);
         return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得主样业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
     public CommonResult<PageResult<BusinessBaseSampleRespVO>> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) {
         PageResult<BusinessBaseSampleDO> pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出主样业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -1,108 +0,0 @@
-package com.zt.plat.module.qms.business.bus.controller.admin;
-
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentDataPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentDataRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentDataSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import 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.BusinessDocumentDataDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessDocumentDataService;
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-@Tag(name = "管理后台 - 检测报告明细")
-@RestController
-@RequestMapping("/qms/business-document-data")
-@Validated
-public class BusinessDocumentDataController implements BusinessControllerMarker {
-
-
-    @Resource
-    private BusinessDocumentDataService businessDocumentDataService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建检测报告明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:create')")
-    public CommonResult<BusinessDocumentDataRespVO> createBusinessDocumentData(@Valid @RequestBody BusinessDocumentDataSaveReqVO createReqVO) {
-        return success(businessDocumentDataService.createBusinessDocumentData(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新检测报告明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:update')")
-    public CommonResult<Boolean> updateBusinessDocumentData(@Valid @RequestBody BusinessDocumentDataSaveReqVO updateReqVO) {
-        businessDocumentDataService.updateBusinessDocumentData(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除检测报告明细")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:delete')")
-    public CommonResult<Boolean> deleteBusinessDocumentData(@RequestParam("id") Long id) {
-        businessDocumentDataService.deleteBusinessDocumentData(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete-list")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除检测报告明细")
-                @PreAuthorize("@ss.hasPermission('qms:business-document-data:delete')")
-    public CommonResult<Boolean> deleteBusinessDocumentDataList(@RequestBody BatchDeleteReqVO req) {
-        businessDocumentDataService.deleteBusinessDocumentDataListByIds(req.getIds());
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得检测报告明细")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:query')")
-    public CommonResult<BusinessDocumentDataRespVO> getBusinessDocumentData(@RequestParam("id") Long id) {
-        BusinessDocumentDataDO businessDocumentData = businessDocumentDataService.getBusinessDocumentData(id);
-        return success(BeanUtils.toBean(businessDocumentData, BusinessDocumentDataRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得检测报告明细分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:query')")
-    public CommonResult<PageResult<BusinessDocumentDataRespVO>> getBusinessDocumentDataPage(@Valid BusinessDocumentDataPageReqVO pageReqVO) {
-        PageResult<BusinessDocumentDataDO> pageResult = businessDocumentDataService.getBusinessDocumentDataPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessDocumentDataRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出检测报告明细 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-data:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessDocumentDataExcel(@Valid BusinessDocumentDataPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessDocumentDataDO> list = businessDocumentDataService.getBusinessDocumentDataPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "检测报告明细.xls", "数据", BusinessDocumentDataRespVO.class,
-                        BeanUtils.toBean(list, BusinessDocumentDataRespVO.class));
-    }
-
-}

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

@@ -1,108 +0,0 @@
-package com.zt.plat.module.qms.business.bus.controller.admin;
-
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentMainPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentMainRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessDocumentMainSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import 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.BusinessDocumentMainDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessDocumentMainService;
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-@Tag(name = "管理后台 - 检测报告业务")
-@RestController
-@RequestMapping("/qms/business-document-main")
-@Validated
-public class BusinessDocumentMainController implements BusinessControllerMarker {
-
-
-    @Resource
-    private BusinessDocumentMainService businessDocumentMainService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建检测报告业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:create')")
-    public CommonResult<BusinessDocumentMainRespVO> createBusinessDocumentMain(@Valid @RequestBody BusinessDocumentMainSaveReqVO createReqVO) {
-        return success(businessDocumentMainService.createBusinessDocumentMain(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新检测报告业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:update')")
-    public CommonResult<Boolean> updateBusinessDocumentMain(@Valid @RequestBody BusinessDocumentMainSaveReqVO updateReqVO) {
-        businessDocumentMainService.updateBusinessDocumentMain(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除检测报告业务")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:delete')")
-    public CommonResult<Boolean> deleteBusinessDocumentMain(@RequestParam("id") Long id) {
-        businessDocumentMainService.deleteBusinessDocumentMain(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete-list")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除检测报告业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-document-main:delete')")
-    public CommonResult<Boolean> deleteBusinessDocumentMainList(@RequestBody BatchDeleteReqVO req) {
-        businessDocumentMainService.deleteBusinessDocumentMainListByIds(req.getIds());
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得检测报告业务")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:query')")
-    public CommonResult<BusinessDocumentMainRespVO> getBusinessDocumentMain(@RequestParam("id") Long id) {
-        BusinessDocumentMainDO businessDocumentMain = businessDocumentMainService.getBusinessDocumentMain(id);
-        return success(BeanUtils.toBean(businessDocumentMain, BusinessDocumentMainRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得检测报告业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:query')")
-    public CommonResult<PageResult<BusinessDocumentMainRespVO>> getBusinessDocumentMainPage(@Valid BusinessDocumentMainPageReqVO pageReqVO) {
-        PageResult<BusinessDocumentMainDO> pageResult = businessDocumentMainService.getBusinessDocumentMainPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessDocumentMainRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出检测报告业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-document-main:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessDocumentMainExcel(@Valid BusinessDocumentMainPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessDocumentMainDO> list = businessDocumentMainService.getBusinessDocumentMainPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "检测报告业务.xls", "数据", BusinessDocumentMainRespVO.class,
-                        BeanUtils.toBean(list, BusinessDocumentMainRespVO.class));
-    }
-
-}

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 {
 
 
@@ -45,14 +50,14 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
 
     @PostMapping("/create")
     @Operation(summary = "创建子样交接记录业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
     public CommonResult<BusinessHandoverRecordSubRespVO> createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) {
         return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新子样交接记录业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
     public CommonResult<Boolean> updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) {
         businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO);
         return success(true);
@@ -61,7 +66,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
     @DeleteMapping("/delete")
     @Operation(summary = "删除子样交接记录业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
     public CommonResult<Boolean> deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) {
         businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id);
         return success(true);
@@ -70,7 +75,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除子样交接记录业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
     public CommonResult<Boolean> deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) {
         businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds());
         return success(true);
@@ -79,7 +84,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
     @GetMapping("/get")
     @Operation(summary = "获得子样交接记录业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
     public CommonResult<BusinessHandoverRecordSubRespVO> getBusinessHandoverRecordSub(@RequestParam("id") Long id) {
         BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id);
         return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class));
@@ -87,15 +92,20 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
 
     @GetMapping("/page")
     @Operation(summary = "获得子样交接记录业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
     public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) {
+    	if (pageReqVO.getDeptId() == null) {
+    		//当前登录用户
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+    		pageReqVO.setDeptId(loginUser.getVisitDeptId());
+		}
         PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO);
         return success(pageResult);
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出子样交接记录业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -0,0 +1,117 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测系数任务数据,空白样、标样")
+@RestController
+@RequestMapping("/qms/business-qc-coefficient-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCCoefficientDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCCoefficientDataService businessQCCoefficientDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测系数任务数据,空白样、标样")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:create')")
+    public CommonResult<BusinessQCCoefficientDataRespVO> createBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO createReqVO) {
+        return success(businessQCCoefficientDataService.createBusinessQCCoefficientData(createReqVO));
+    }
+
+    @PostMapping("/update")
+    @Operation(summary = "更新质控样检测系数任务数据,空白样、标样")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:update')")
+    public CommonResult<Boolean> updateBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO updateReqVO) {
+        businessQCCoefficientDataService.updateBusinessQCCoefficientData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测系数任务数据,空白样、标样")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCCoefficientData(@RequestParam("id") Long id) {
+        businessQCCoefficientDataService.deleteBusinessQCCoefficientData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测系数任务数据,空白样、标样")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCCoefficientDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCCoefficientDataService.deleteBusinessQCCoefficientDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测系数任务数据,空白样、标样")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
+    public CommonResult<BusinessQCCoefficientDataRespVO> getBusinessQCCoefficientData(@RequestParam("id") Long id) {
+        BusinessQCCoefficientDataDO businessQCCoefficientData = businessQCCoefficientDataService.getBusinessQCCoefficientData(id);
+        return success(BeanUtils.toBean(businessQCCoefficientData, BusinessQCCoefficientDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
+    public CommonResult<PageResult<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCCoefficientDataExtendRespVO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
+    public CommonResult<List<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
+        List<BusinessQCCoefficientDataExtendRespVO> listResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
+        return success(listResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测系数任务数据,空白样、标样 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCCoefficientDataExcel(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCCoefficientDataExtendRespVO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测系数任务数据,空白样、标样.xls", "数据", BusinessQCCoefficientDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCCoefficientDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测系数参数业务")
+@RestController
+@RequestMapping("/qms/business-qc-coefficient-parameter-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCCoefficientParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCCoefficientParameterDataService businessQCCoefficientParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测系数参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:create')")
+    public CommonResult<BusinessQCCoefficientParameterDataRespVO> createBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO createReqVO) {
+        return success(businessQCCoefficientParameterDataService.createBusinessQCCoefficientParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测系数参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO updateReqVO) {
+        businessQCCoefficientParameterDataService.updateBusinessQCCoefficientParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测系数参数业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCCoefficientParameterData(@RequestParam("id") Long id) {
+        businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测系数参数业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCCoefficientParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测系数参数业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')")
+    public CommonResult<BusinessQCCoefficientParameterDataRespVO> getBusinessQCCoefficientParameterData(@RequestParam("id") Long id) {
+        BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterData = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterData(id);
+        return success(BeanUtils.toBean(businessQCCoefficientParameterData, BusinessQCCoefficientParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测系数参数业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')")
+    public CommonResult<PageResult<BusinessQCCoefficientParameterDataRespVO>> getBusinessQCCoefficientParameterDataPage(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCCoefficientParameterDataDO> pageResult = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测系数参数业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCCoefficientParameterDataExcel(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCCoefficientParameterDataDO> list = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测系数参数业务.xls", "数据", BusinessQCCoefficientParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCCoefficientParameterDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,116 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样业务")
+@RestController
+@RequestMapping("/qms/business-qc-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCDataService businessQCDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:create')")
+    public CommonResult<BusinessQCDataRespVO> createBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO createReqVO) {
+        return success(businessQCDataService.createBusinessQCData(createReqVO));
+    }
+
+    @PostMapping("/update")
+    @Operation(summary = "更新质控样业务")
+    //@PreAuthorize("@ss.hasPermission('qms:business-QC-data:update')")
+    public CommonResult<Boolean> updateBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO updateReqVO) {
+        businessQCDataService.updateBusinessQCData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCData(@RequestParam("id") Long id) {
+        businessQCDataService.deleteBusinessQCData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCDataService.deleteBusinessQCDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:query')")
+    public CommonResult<BusinessQCDataRespVO> getBusinessQCData(@RequestParam("id") Long id) {
+        BusinessQCDataDO businessQCData = businessQCDataService.getBusinessQCData(id);
+        return success(BeanUtils.toBean(businessQCData, BusinessQCDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:query')")
+    public CommonResult<PageResult<BusinessQCDataExtendRespVO>> getBusinessQCDataPage(@Valid BusinessQCDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCDataExtendRespVO> pageResult = businessQCDataService.getBusinessQCDataPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得质控样业务列表")
+    public CommonResult<List<BusinessQCDataExtendRespVO>> getBusinessQCDataList(BusinessQCDataReqVO reqVO) {
+		List<BusinessQCDataExtendRespVO> list = businessQCDataService.getBusinessQCDataList(reqVO);
+		return success(list);
+	}
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCDataExcel(@Valid BusinessQCDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCDataExtendRespVO> list = businessQCDataService.getBusinessQCDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样业务.xls", "数据", BusinessQCDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,117 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控管理样检测任务数据,管理样、标准样")
+@RestController
+@RequestMapping("/qms/business-qc-management-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCManagementDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCManagementDataService businessQCManagementDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控管理样检测任务数据,管理样、标准样")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:create')")
+    public CommonResult<BusinessQCManagementDataRespVO> createBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO createReqVO) {
+        return success(businessQCManagementDataService.createBusinessQCManagementData(createReqVO));
+    }
+
+    @PostMapping("/update")
+    @Operation(summary = "更新质控管理样检测任务数据,管理样、标准样")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:update')")
+    public CommonResult<Boolean> updateBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO updateReqVO) {
+        businessQCManagementDataService.updateBusinessQCManagementData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控管理样检测任务数据,管理样、标准样")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementData(@RequestParam("id") Long id) {
+        businessQCManagementDataService.deleteBusinessQCManagementData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控管理样检测任务数据,管理样、标准样")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCManagementDataService.deleteBusinessQCManagementDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
+    public CommonResult<BusinessQCManagementDataRespVO> getBusinessQCManagementData(@RequestParam("id") Long id) {
+        BusinessQCManagementDataDO businessQCManagementData = businessQCManagementDataService.getBusinessQCManagementData(id);
+        return success(BeanUtils.toBean(businessQCManagementData, BusinessQCManagementDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
+    public CommonResult<PageResult<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementDataExtendRespVO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样列表")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
+    public CommonResult<List<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
+    	List<BusinessQCManagementDataExtendRespVO> listResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
+        return success(listResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控管理样检测任务数据,管理样、标准样 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCManagementDataExcel(@Valid BusinessQCManagementDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCManagementDataExtendRespVO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控管理样检测任务数据,管理样、标准样.xls", "数据", BusinessQCManagementDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCManagementDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测参数数据业务")
+@RestController
+@RequestMapping("/qms/business-qc-management-parameter-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCManagementParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCManagementParameterDataService businessQCManagementParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测参数数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:create')")
+    public CommonResult<BusinessQCManagementParameterDataRespVO> createBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO createReqVO) {
+        return success(businessQCManagementParameterDataService.createBusinessQCManagementParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测参数数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO updateReqVO) {
+        businessQCManagementParameterDataService.updateBusinessQCManagementParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测参数数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementParameterData(@RequestParam("id") Long id) {
+        businessQCManagementParameterDataService.deleteBusinessQCManagementParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测参数数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCManagementParameterDataService.deleteBusinessQCManagementParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测参数数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')")
+    public CommonResult<BusinessQCManagementParameterDataRespVO> getBusinessQCManagementParameterData(@RequestParam("id") Long id) {
+        BusinessQCManagementParameterDataDO businessQCManagementParameterData = businessQCManagementParameterDataService.getBusinessQCManagementParameterData(id);
+        return success(BeanUtils.toBean(businessQCManagementParameterData, BusinessQCManagementParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测参数数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')")
+    public CommonResult<PageResult<BusinessQCManagementParameterDataRespVO>> getBusinessQCManagementParameterDataPage(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementParameterDataDO> pageResult = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCManagementParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测参数数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCManagementParameterDataExcel(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCManagementParameterDataDO> list = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测参数数据业务.xls", "数据", BusinessQCManagementParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCManagementParameterDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementProjectDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测项目数据业务")
+@RestController
+@RequestMapping("/qms/business-qc-management-project-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCManagementProjectDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCManagementProjectDataService businessQCManagementProjectDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测项目数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:create')")
+    public CommonResult<BusinessQCManagementProjectDataRespVO> createBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO createReqVO) {
+        return success(businessQCManagementProjectDataService.createBusinessQCManagementProjectData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测项目数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:update')")
+    public CommonResult<Boolean> updateBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO updateReqVO) {
+        businessQCManagementProjectDataService.updateBusinessQCManagementProjectData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementProjectData(@RequestParam("id") Long id) {
+        businessQCManagementProjectDataService.deleteBusinessQCManagementProjectData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测项目数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementProjectDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCManagementProjectDataService.deleteBusinessQCManagementProjectDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')")
+    public CommonResult<BusinessQCManagementProjectDataRespVO> getBusinessQCManagementProjectData(@RequestParam("id") Long id) {
+        BusinessQCManagementProjectDataDO businessQCManagementProjectData = businessQCManagementProjectDataService.getBusinessQCManagementProjectData(id);
+        return success(BeanUtils.toBean(businessQCManagementProjectData, BusinessQCManagementProjectDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测项目数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')")
+    public CommonResult<PageResult<BusinessQCManagementProjectDataRespVO>> getBusinessQCManagementProjectDataPage(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementProjectDataDO> pageResult = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCManagementProjectDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测项目数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCManagementProjectDataExcel(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCManagementProjectDataDO> list = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测项目数据业务.xls", "数据", BusinessQCManagementProjectDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCManagementProjectDataRespVO.class));
+    }
+
+}

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

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

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测参数数据业务")
+@RestController
+@RequestMapping("/qms/business-qc-parameter-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCParameterDataService businessQCParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测参数数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:create')")
+    public CommonResult<BusinessQCParameterDataRespVO> createBusinessQCParameterData(@Valid @RequestBody BusinessQCParameterDataSaveReqVO createReqVO) {
+        return success(businessQCParameterDataService.createBusinessQCParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测参数数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessQCParameterData(@Valid @RequestBody BusinessQCParameterDataSaveReqVO updateReqVO) {
+        businessQCParameterDataService.updateBusinessQCParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测参数数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCParameterData(@RequestParam("id") Long id) {
+        businessQCParameterDataService.deleteBusinessQCParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测参数数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCParameterDataService.deleteBusinessQCParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测参数数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:query')")
+    public CommonResult<BusinessQCParameterDataRespVO> getBusinessQCParameterData(@RequestParam("id") Long id) {
+        BusinessQCParameterDataDO businessQCParameterData = businessQCParameterDataService.getBusinessQCParameterData(id);
+        return success(BeanUtils.toBean(businessQCParameterData, BusinessQCParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测参数数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:query')")
+    public CommonResult<PageResult<BusinessQCParameterDataRespVO>> getBusinessQCParameterDataPage(@Valid BusinessQCParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCParameterDataDO> pageResult = businessQCParameterDataService.getBusinessQCParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测参数数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCParameterDataExcel(@Valid BusinessQCParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCParameterDataDO> list = businessQCParameterDataService.getBusinessQCParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测参数数据业务.xls", "数据", BusinessQCParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCParameterDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCProjectDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控样检测项目数据业务")
+@RestController
+@RequestMapping("/qms/business-qc-project-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessQCProjectDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCProjectDataService businessQCProjectDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测项目数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:create')")
+    public CommonResult<BusinessQCProjectDataRespVO> createBusinessQCProjectData(@Valid @RequestBody BusinessQCProjectDataSaveReqVO createReqVO) {
+        return success(businessQCProjectDataService.createBusinessQCProjectData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测项目数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:update')")
+    public CommonResult<Boolean> updateBusinessQCProjectData(@Valid @RequestBody BusinessQCProjectDataSaveReqVO updateReqVO) {
+        businessQCProjectDataService.updateBusinessQCProjectData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCProjectData(@RequestParam("id") Long id) {
+        businessQCProjectDataService.deleteBusinessQCProjectData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测项目数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCProjectDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCProjectDataService.deleteBusinessQCProjectDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:query')")
+    public CommonResult<BusinessQCProjectDataRespVO> getBusinessQCProjectData(@RequestParam("id") Long id) {
+        BusinessQCProjectDataDO businessQCProjectData = businessQCProjectDataService.getBusinessQCProjectData(id);
+        return success(BeanUtils.toBean(businessQCProjectData, BusinessQCProjectDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测项目数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:query')")
+    public CommonResult<PageResult<BusinessQCProjectDataRespVO>> getBusinessQCProjectDataPage(@Valid BusinessQCProjectDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCProjectDataDO> pageResult = businessQCProjectDataService.getBusinessQCProjectDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCProjectDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测项目数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCProjectDataExcel(@Valid BusinessQCProjectDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCProjectDataDO> list = businessQCProjectDataService.getBusinessQCProjectDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测项目数据业务.xls", "数据", BusinessQCProjectDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCProjectDataRespVO.class));
+    }
+
+}

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
 
     @PostMapping("/create")
     @Operation(summary = "创建质控样检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')")
     public CommonResult<BusinessQualityControlSampleProjectRespVO> createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) {
         return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新质控样检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')")
     public CommonResult<Boolean> updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) {
         businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
     @DeleteMapping("/delete")
     @Operation(summary = "删除质控样检测项目业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
     public CommonResult<Boolean> deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
         businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除质控样检测项目业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
     public CommonResult<Boolean> deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) {
         businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
     @GetMapping("/get")
     @Operation(summary = "获得质控样检测项目业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
     public CommonResult<BusinessQualityControlSampleProjectRespVO> getBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
         BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id);
         return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
 
     @GetMapping("/page")
     @Operation(summary = "获得质控样检测项目业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
     public CommonResult<PageResult<BusinessQualityControlSampleProjectRespVO>> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) {
         PageResult<BusinessQualityControlSampleProjectDO> pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessQualityControlSampleProjectController implements BusinessCo
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出质控样检测项目业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
 
     @PostMapping("/create")
     @Operation(summary = "创建委检登记来样品位")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')")
     public CommonResult<BusinessSampleAssayResultRespVO> createBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO createReqVO) {
         return success(businessSampleAssayResultService.createBusinessSampleAssayResult(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新委检登记来样品位")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')")
     public CommonResult<Boolean> updateBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO updateReqVO) {
         businessSampleAssayResultService.updateBusinessSampleAssayResult(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
     @DeleteMapping("/delete")
     @Operation(summary = "删除委检登记来样品位")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
     public CommonResult<Boolean> deleteBusinessSampleAssayResult(@RequestParam("id") Long id) {
         businessSampleAssayResultService.deleteBusinessSampleAssayResult(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除委检登记来样品位")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
     public CommonResult<Boolean> deleteBusinessSampleAssayResultList(@RequestBody BatchDeleteReqVO req) {
         businessSampleAssayResultService.deleteBusinessSampleAssayResultListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
     @GetMapping("/get")
     @Operation(summary = "获得委检登记来样品位")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
     public CommonResult<BusinessSampleAssayResultRespVO> getBusinessSampleAssayResult(@RequestParam("id") Long id) {
         BusinessSampleAssayResultDO businessSampleAssayResult = businessSampleAssayResultService.getBusinessSampleAssayResult(id);
         return success(BeanUtils.toBean(businessSampleAssayResult, BusinessSampleAssayResultRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
 
     @GetMapping("/page")
     @Operation(summary = "获得委检登记来样品位分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
     public CommonResult<PageResult<BusinessSampleAssayResultRespVO>> getBusinessSampleAssayResultPage(@Valid BusinessSampleAssayResultPageReqVO pageReqVO) {
         PageResult<BusinessSampleAssayResultDO> pageResult = businessSampleAssayResultService.getBusinessSampleAssayResultPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSampleAssayResultRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出委检登记来样品位 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleAssayResultExcel(@Valid BusinessSampleAssayResultPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -0,0 +1,199 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDetailDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailService;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationPageReqVO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationRespVO;
+import com.zt.plat.module.qms.business.config.service.ConfigWarehouseLocationService;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SUB_SAMPLE_NOT_EXISTS;
+
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchService;
+
+@Tag(name = "管理后台 - 样品调拨")
+@RestController
+@RequestMapping("/qms/business-sample-dispatch")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSampleDispatchController implements BusinessControllerMarker {
+
+
+    @Resource private BusinessSampleDispatchService businessSampleDispatchService;
+    @Resource private BusinessSampleDispatchDetailService businessSampleDispatchDetailService;
+    @Resource private BusinessSubSampleService businessSubSampleService;
+    @Resource private ConfigWarehouseLocationService configWarehouseLocationService;
+
+    @PostMapping("/createTempData")
+    @Operation(summary = "创建临时数据")
+    public CommonResult<BusinessSampleDispatchRespVO> createTempData() {
+        BusinessSampleDispatchSaveReqVO vo = new BusinessSampleDispatchSaveReqVO();
+        vo.setCancelStatus("-1");
+        return success(businessSampleDispatchService.createBusinessSampleDispatch(vo));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新样品调拨")
+    public CommonResult<Boolean> updateBusinessSampleDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
+        updateReqVO.setCancelStatus("0");
+        updateReqVO.setFlowStatus(QmsCommonConstant.NOT_START);
+        businessSampleDispatchService.updateBusinessSampleDispatch(updateReqVO);
+        return success(true);
+    }
+
+    @PostMapping("/addOrRemoveSample")
+    @Operation(summary = "增加或移除样品")
+    public CommonResult<Boolean> addOrRemoveSample(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, true);
+        return success(true);
+    }
+
+    @PostMapping("/addBySampleReturnCode")
+    @Operation(summary = "按归库码增加样品")
+    public CommonResult<Boolean> addBySampleReturnCode(@RequestBody JSONObject param) {
+        String id = param.getString("id");
+        String sampleReturnCode = param.getString("sampleReturnCode");
+        String warehouseCode = param.getString("warehouseCode");
+        if(ObjectUtils.isEmpty(warehouseCode)){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "请选择仓库，再扫描样品！");
+        }
+        BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleReturnCode(sampleReturnCode);
+        if(businessSubSampleDO == null)
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到此样品！");
+        //判断样品状态、库位
+//        String sampleWarehouseCode = businessSubSampleDO.getWarehouseCode();  //todo 判断库位
+        ConfigWarehouseLocationPageReqVO warehouseReqVO = new ConfigWarehouseLocationPageReqVO();
+        warehouseReqVO.setId(businessSubSampleDO.getConfigWarehouseLocationInfomationId());
+        PageResult<ConfigWarehouseLocationRespVO> warehousePage = configWarehouseLocationService.getConfigWarehouseLocationPage(warehouseReqVO);
+        if(warehousePage.getTotal() == 0){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到样品所在仓库，请检查样品码是否正确！");
+        }
+        ConfigWarehouseLocationRespVO warehouse = warehousePage.getList().get(0);
+        if(!warehouseCode.equals(warehouse.getWarehouseCode())){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "此样品所在仓库为："+warehouse.getWarehouseName()+"，请检查样品码是否正确！");
+        }
+
+        String returnStatus = businessSubSampleDO.getReturnStatus();
+        if(!QmsCommonConstant.COMPLETED.equals(returnStatus)){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品状态为："+returnStatus+"，不能调拨！");
+        }
+        String dispatchStatus = businessSubSampleDO.getDispatchStatus();
+        if("1".equals(dispatchStatus)){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品已被调拨：请归还后再调拨！");
+        }
+        BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
+        reqVO.setParentId(Long.valueOf(id));
+        reqVO.setSampleReturnCode(sampleReturnCode);
+        PageResult<BusinessSampleDispatchDetailExtendRespVO> pageDetailList = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(reqVO);
+        if(pageDetailList.getTotal() > 0){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "次样品已添加，请勿重复添加！");
+        }
+        List<Long> sampleIds = new ArrayList<>();
+        sampleIds.add(businessSubSampleDO.getId());
+        BusinessSampleDispatchSaveReqVO updateReqVO = new BusinessSampleDispatchSaveReqVO();
+        updateReqVO.setId(Long.valueOf(id));
+        updateReqVO.setAddSubSampleIds(sampleIds);
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, false);
+        return success(true);
+    }
+
+    @PostMapping("/createProcessInstance")
+    @Operation(summary = "发起流程")
+    public CommonResult<BusinessSampleDispatchRespVO> createProcessInstance(@Valid @RequestBody BusinessSampleDispatchSaveReqVO vo) {
+        return businessSampleDispatchService.createProcessInstance(vo);
+    }
+
+    @PostMapping("/execDispatch")
+    @Operation(summary = "执行调拨")
+    public CommonResult<String> execDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO vo) {
+        return businessSampleDispatchService.execDispatch(vo);
+    }
+
+    @PostMapping("/execGiveback")
+    @Operation(summary = "调拨归还")
+    public CommonResult<String> execGiveback(@RequestBody JSONObject vo) {
+        return businessSampleDispatchService.execGiveback(vo);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除样品调拨")
+    @Parameter(name = "id", description = "编号", required = true)
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:delete')")
+    public CommonResult<Boolean> deleteBusinessSampleDispatch(@RequestParam("id") Long id) {
+        businessSampleDispatchService.deleteBusinessSampleDispatch(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除样品调拨")
+    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:delete')")
+    public CommonResult<Boolean> deleteBusinessSampleDispatchList(@RequestBody BatchDeleteReqVO req) {
+        businessSampleDispatchService.deleteBusinessSampleDispatchListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得样品调拨")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:query')")
+    public CommonResult<BusinessSampleDispatchRespVO> getBusinessSampleDispatch(@RequestParam("id") Long id) {
+        BusinessSampleDispatchDO businessSampleDispatch = businessSampleDispatchService.getBusinessSampleDispatch(id);
+        return success(BeanUtils.toBean(businessSampleDispatch, BusinessSampleDispatchRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得样品调拨分页")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:query')")
+    public CommonResult<PageResult<BusinessSampleDispatchRespVO>> getBusinessSampleDispatchPage(@Valid BusinessSampleDispatchPageReqVO pageReqVO) {
+        PageResult<BusinessSampleDispatchDO> pageResult = businessSampleDispatchService.getBusinessSampleDispatchPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSampleDispatchRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出样品调拨 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSampleDispatchExcel(@Valid BusinessSampleDispatchPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSampleDispatchDO> list = businessSampleDispatchService.getBusinessSampleDispatchPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "样品调拨.xls", "数据", BusinessSampleDispatchRespVO.class,
+                        BeanUtils.toBean(list, BusinessSampleDispatchRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,136 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+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.BusinessSubSampleService;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS;
+import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SUB_SAMPLE_NOT_EXISTS;
+
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDetailDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailService;
+
+@Tag(name = "管理后台 - 样品调拨明细")
+@RestController
+@RequestMapping("/qms/business-sample-dispatch-detail")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSampleDispatchDetailController implements BusinessControllerMarker {
+
+
+    @Resource private BusinessSampleDispatchDetailService businessSampleDispatchDetailService;
+    @Resource private BusinessSubSampleService businessSubSampleService;
+
+    @GetMapping("/searchBySampleCode")
+    @Operation(summary = "扫码查询待归还样品")
+    public CommonResult<BusinessSampleDispatchDetailExtendRespVO> searchBySampleCode(HttpServletRequest request) {
+        String sampleReturnCode = request.getParameter("sampleReturnCode");
+        if(ObjectUtils.isEmpty(sampleReturnCode))
+            return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "请输入样品编号！");
+        BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
+        reqVO.setSampleReturnCode(sampleReturnCode);
+        reqVO.setBorrowStatus("1");
+        reqVO.setGivebackStatus("0");
+
+        PageResult<BusinessSampleDispatchDetailExtendRespVO> pageResult = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(reqVO);
+        if(pageResult.getTotal() == 0)
+            return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "未查询到此样品！");
+        if(pageResult.getList().size() > 1)
+            return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "样品编号重复，请联系管理员检查数据！");
+        BusinessSampleDispatchDetailExtendRespVO businessSampleDispatchDetailExtendRespVO = pageResult.getList().get(0);
+        return success(businessSampleDispatchDetailExtendRespVO);
+    }
+
+    @PostMapping("/create")
+    @Operation(summary = "创建样品调拨明细")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:create')")
+    public CommonResult<BusinessSampleDispatchDetailRespVO> createBusinessSampleDispatchDetail(@Valid @RequestBody BusinessSampleDispatchDetailSaveReqVO createReqVO) {
+        return success(businessSampleDispatchDetailService.createBusinessSampleDispatchDetail(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新样品调拨明细")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:update')")
+    public CommonResult<Boolean> updateBusinessSampleDispatchDetail(@Valid @RequestBody BusinessSampleDispatchDetailSaveReqVO updateReqVO) {
+        businessSampleDispatchDetailService.updateBusinessSampleDispatchDetail(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除样品调拨明细")
+    @Parameter(name = "id", description = "编号", required = true)
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:delete')")
+    public CommonResult<Boolean> deleteBusinessSampleDispatchDetail(@RequestParam("id") Long id) {
+        businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetail(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除样品调拨明细")
+                @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:delete')")
+    public CommonResult<Boolean> deleteBusinessSampleDispatchDetailList(@RequestBody BatchDeleteReqVO req) {
+        businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetailListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得样品调拨明细")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:query')")
+    public CommonResult<BusinessSampleDispatchDetailRespVO> getBusinessSampleDispatchDetail(@RequestParam("id") Long id) {
+        BusinessSampleDispatchDetailDO businessSampleDispatchDetail = businessSampleDispatchDetailService.getBusinessSampleDispatchDetail(id);
+        return success(BeanUtils.toBean(businessSampleDispatchDetail, BusinessSampleDispatchDetailRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得样品调拨明细分页")
+//    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:query')")
+    public CommonResult<PageResult<BusinessSampleDispatchDetailExtendRespVO>> getBusinessSampleDispatchDetailPage(@Valid BusinessSampleDispatchDetailPageReqVO pageReqVO) {
+        PageResult<BusinessSampleDispatchDetailExtendRespVO> pageResult = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出样品调拨明细 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSampleDispatchDetailExcel(@Valid BusinessSampleDispatchDetailPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSampleDispatchDetailExtendRespVO> list = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "样品调拨明细.xls", "数据", BusinessSampleDispatchDetailRespVO.class,
+                        BeanUtils.toBean(list, BusinessSampleDispatchDetailRespVO.class));
+    }
+
+}

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 {
 
 
@@ -42,14 +45,14 @@ public class BusinessSampleEntrustDetailController implements BusinessController
 
     @PostMapping("/create")
     @Operation(summary = "创建委检登记样品明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')")
     public CommonResult<BusinessSampleEntrustDetailRespVO> createBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO createReqVO) {
         return success(businessSampleEntrustDetailService.createBusinessSampleEntrustDetail(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新委检登记样品明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')")
     public CommonResult<Boolean> updateBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO updateReqVO) {
         businessSampleEntrustDetailService.updateBusinessSampleEntrustDetail(updateReqVO);
         return success(true);
@@ -58,7 +61,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
     @DeleteMapping("/delete")
     @Operation(summary = "删除委检登记样品明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
         businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetail(id);
         return success(true);
@@ -67,7 +70,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除委检登记样品明细")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustDetailList(@RequestBody BatchDeleteReqVO req) {
         businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetailListByIds(req.getIds());
         return success(true);
@@ -76,7 +79,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
     @GetMapping("/get")
     @Operation(summary = "获得委检登记样品明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
     public CommonResult<BusinessSampleEntrustDetailRespVO> getBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
         BusinessSampleEntrustDetailDO businessSampleEntrustDetail = businessSampleEntrustDetailService.getBusinessSampleEntrustDetail(id);
         return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class));
@@ -85,7 +88,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
 
     @GetMapping("/list")
     @Operation(summary = "获得委检登记样品明细列表")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
     public CommonResult<List<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) {
         List<BusinessSampleEntrustDetailExtendRespVO> listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO);
         return success(listResult);
@@ -93,7 +96,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
 
     @GetMapping("/page")
     @Operation(summary = "获得委检登记样品明细分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
     public CommonResult<PageResult<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
         PageResult<BusinessSampleEntrustDetailExtendRespVO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
         return success(pageResult);
@@ -101,7 +104,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出委检登记样品明细 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
 
     @PostMapping("/create")
     @Operation(summary = "创建委检样品检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')")
     public CommonResult<BusinessSampleEntrustProjectRespVO> createBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO createReqVO) {
         return success(businessSampleEntrustProjectService.createBusinessSampleEntrustProject(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新委检样品检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')")
     public CommonResult<Boolean> updateBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO updateReqVO) {
         businessSampleEntrustProjectService.updateBusinessSampleEntrustProject(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
     @DeleteMapping("/delete")
     @Operation(summary = "删除委检样品检测项目业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustProject(@RequestParam("id") Long id) {
         businessSampleEntrustProjectService.deleteBusinessSampleEntrustProject(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除委检样品检测项目业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustProjectList(@RequestBody BatchDeleteReqVO req) {
         businessSampleEntrustProjectService.deleteBusinessSampleEntrustProjectListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
     @GetMapping("/get")
     @Operation(summary = "获得委检样品检测项目业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
     public CommonResult<BusinessSampleEntrustProjectRespVO> getBusinessSampleEntrustProject(@RequestParam("id") Long id) {
         BusinessSampleEntrustProjectDO businessSampleEntrustProject = businessSampleEntrustProjectService.getBusinessSampleEntrustProject(id);
         return success(BeanUtils.toBean(businessSampleEntrustProject, BusinessSampleEntrustProjectRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
 
     @GetMapping("/page")
     @Operation(summary = "获得委检样品检测项目业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
     public CommonResult<PageResult<BusinessSampleEntrustProjectRespVO>> getBusinessSampleEntrustProjectPage(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO) {
         PageResult<BusinessSampleEntrustProjectDO> pageResult = businessSampleEntrustProjectService.getBusinessSampleEntrustProjectPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustProjectRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出委检样品检测项目业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleEntrustProjectExcel(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -46,14 +49,14 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
 
     @PostMapping("/create")
     @Operation(summary = "创建委检登记业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')")
     public CommonResult<BusinessSampleEntrustRegistrationRespVO> createBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO createReqVO) {
         return success(businessSampleEntrustRegistrationService.createBusinessSampleEntrustRegistration(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新委检登记业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')")
     public CommonResult<Boolean> updateBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO updateReqVO) {
         businessSampleEntrustRegistrationService.updateBusinessSampleEntrustRegistration(updateReqVO);
         return success(true);
@@ -62,7 +65,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
     @DeleteMapping("/delete")
     @Operation(summary = "删除委检登记业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
         businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistration(id);
         return success(true);
@@ -71,7 +74,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除委检登记业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
     public CommonResult<Boolean> deleteBusinessSampleEntrustRegistrationList(@RequestBody BatchDeleteReqVO req) {
         businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistrationListByIds(req.getIds());
         return success(true);
@@ -80,7 +83,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
     @GetMapping("/get")
     @Operation(summary = "获得委检登记业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
     public CommonResult<BusinessSampleEntrustRegistrationRespVO> getBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
         BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistration = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistration(id);
         return success(BeanUtils.toBean(businessSampleEntrustRegistration, BusinessSampleEntrustRegistrationRespVO.class));
@@ -88,7 +91,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
 
     @GetMapping("/page")
     @Operation(summary = "获得委检登记业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
     public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> getBusinessSampleEntrustRegistrationPage(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
         PageResult<BusinessSampleEntrustRegistrationExtendRespVO> pageResult = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistrationPage(pageReqVO);
         return success(pageResult);
@@ -96,7 +99,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出委检登记业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleEntrustRegistrationExcel(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -107,4 +110,14 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
                         BeanUtils.toBean(list, BusinessSampleEntrustRegistrationRespVO.class));
     }
 
+    @GetMapping("/queryWaitingDataForReport")
+    @Operation(summary = "查询待编制数据")
+    public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
+        Long configReportTypeId = pageReqVO.getConfigReportTypeId();
+        if(configReportTypeId == null)
+            return CommonResult.error(0, "缺少configReportTypeId参数，请刷新后重试！");
+        PageResult<BusinessSampleEntrustRegistrationExtendRespVO> result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO);
+        return success(result);
+    }
+
 }

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

@@ -23,12 +23,17 @@ 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;
+import com.alibaba.fastjson2.JSONObject;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
@@ -36,7 +41,8 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-handover")
 @Validated
-public class BusinessSampleHandoverController implements BusinessControllerMarker {
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSampleHandoverController {
 
 
     @Resource
@@ -44,14 +50,14 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
 
     @PostMapping("/create")
     @Operation(summary = "创建样品交接单业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')")
     public CommonResult<BusinessSampleHandoverRespVO> createBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO createReqVO) {
         return success(businessSampleHandoverService.createBusinessSampleHandover(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新样品交接单业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')")
     public CommonResult<Boolean> updateBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO updateReqVO) {
         businessSampleHandoverService.updateBusinessSampleHandover(updateReqVO);
         return success(true);
@@ -60,7 +66,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
     @DeleteMapping("/delete")
     @Operation(summary = "删除样品交接单业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
     public CommonResult<Boolean> deleteBusinessSampleHandover(@RequestParam("id") Long id) {
         businessSampleHandoverService.deleteBusinessSampleHandover(id);
         return success(true);
@@ -69,7 +75,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除样品交接单业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
     public CommonResult<Boolean> deleteBusinessSampleHandoverList(@RequestBody BatchDeleteReqVO req) {
         businessSampleHandoverService.deleteBusinessSampleHandoverListByIds(req.getIds());
         return success(true);
@@ -78,23 +84,36 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
     @GetMapping("/get")
     @Operation(summary = "获得样品交接单业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
     public CommonResult<BusinessSampleHandoverRespVO> getBusinessSampleHandover(@RequestParam("id") Long id) {
         BusinessSampleHandoverDO businessSampleHandover = businessSampleHandoverService.getBusinessSampleHandover(id);
         return success(BeanUtils.toBean(businessSampleHandover, BusinessSampleHandoverRespVO.class));
     }
 
+    @GetMapping("/reportDetail")
+    @Operation(summary = "除样品交接详情数据")
+    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
+    	JSONObject jsonObject = businessSampleHandoverService.reportDetail(id);
+    	return success(jsonObject);
+    	
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得样品交接单业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
+    //@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));
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出样品交接单业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleHandoverExcel(@Valid BusinessSampleHandoverPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
 
     @PostMapping("/create")
     @Operation(summary = "创建样品交接明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')")
     public CommonResult<BusinessSampleHandoverDetailRespVO> createBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO createReqVO) {
         return success(businessSampleHandoverDetailService.createBusinessSampleHandoverDetail(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新样品交接明细")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')")
     public CommonResult<Boolean> updateBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO updateReqVO) {
         businessSampleHandoverDetailService.updateBusinessSampleHandoverDetail(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
     @DeleteMapping("/delete")
     @Operation(summary = "删除样品交接明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
     public CommonResult<Boolean> deleteBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
         businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetail(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除样品交接明细")
-                @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
     public CommonResult<Boolean> deleteBusinessSampleHandoverDetailList(@RequestBody BatchDeleteReqVO req) {
         businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetailListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
     @GetMapping("/get")
     @Operation(summary = "获得样品交接明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
     public CommonResult<BusinessSampleHandoverDetailRespVO> getBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
         BusinessSampleHandoverDetailDO businessSampleHandoverDetail = businessSampleHandoverDetailService.getBusinessSampleHandoverDetail(id);
         return success(BeanUtils.toBean(businessSampleHandoverDetail, BusinessSampleHandoverDetailRespVO.class));
@@ -86,15 +89,23 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
 
     @GetMapping("/page")
     @Operation(summary = "获得样品交接明细分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
     public CommonResult<PageResult<BusinessSampleHandoverDetailRespVO>> getBusinessSampleHandoverDetailPage(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) {
         PageResult<BusinessSampleHandoverDetailDO> pageResult = businessSampleHandoverDetailService.getBusinessSampleHandoverDetailPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class));
     }
 
+    @GetMapping("/takeOffPageList")
+    @Operation(summary = "获得样品交接明细分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
+    public CommonResult<PageResult<BusinessSampleHandoverDetailRespVO>> takeOffPageList(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) {
+        PageResult<BusinessSampleHandoverDetailRespVO> pageResult = businessSampleHandoverDetailService.takeOffPageList(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出样品交接明细 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSampleHandoverDetailExcel(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -1,8 +1,5 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -23,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;
@@ -36,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 {
 
 
@@ -44,14 +44,14 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
 
     @PostMapping("/create")
     @Operation(summary = "创建标准样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')")
     public CommonResult<BusinessStandardSampleRespVO> createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) {
         return success(businessStandardSampleService.createBusinessStandardSample(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新标准样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')")
     public CommonResult<Boolean> updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) {
         businessStandardSampleService.updateBusinessStandardSample(updateReqVO);
         return success(true);
@@ -60,7 +60,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
     @DeleteMapping("/delete")
     @Operation(summary = "删除标准样业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
     public CommonResult<Boolean> deleteBusinessStandardSample(@RequestParam("id") Long id) {
         businessStandardSampleService.deleteBusinessStandardSample(id);
         return success(true);
@@ -69,7 +69,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除标准样业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
     public CommonResult<Boolean> deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) {
         businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds());
         return success(true);
@@ -78,7 +78,7 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
     @GetMapping("/get")
     @Operation(summary = "获得标准样业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
     public CommonResult<BusinessStandardSampleRespVO> getBusinessStandardSample(@RequestParam("id") Long id) {
         BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id);
         return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class));
@@ -86,15 +86,27 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
 
     @GetMapping("/page")
     @Operation(summary = "获得标准样业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
     public CommonResult<PageResult<BusinessStandardSampleRespVO>> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) {
         PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
     }
+    
+//    @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId")
+//    public CommonResult<?> getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) {
+//    	List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId);
+//    	return success(list);
+//	}
+    
+    @GetMapping("/getBusinessStandardSampleLeafList")
+    public CommonResult<?> getBusinessStandardSampleLeafList() {
+    	List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleLeafList();
+    	return success(list);
+	}
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出标准样业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessStandardSampleProjectController implements BusinessControll
 
     @PostMapping("/create")
     @Operation(summary = "创建标准样检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')")
     public CommonResult<BusinessStandardSampleProjectRespVO> createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) {
         return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新标准样检测项目业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')")
     public CommonResult<Boolean> updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) {
         businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
     @DeleteMapping("/delete")
     @Operation(summary = "删除标准样检测项目业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
     public CommonResult<Boolean> deleteBusinessStandardSampleProject(@RequestParam("id") Long id) {
         businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除标准样检测项目业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
     public CommonResult<Boolean> deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) {
         businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
     @GetMapping("/get")
     @Operation(summary = "获得标准样检测项目业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
     public CommonResult<BusinessStandardSampleProjectRespVO> getBusinessStandardSampleProject(@RequestParam("id") Long id) {
         BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id);
         return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
 
     @GetMapping("/page")
     @Operation(summary = "获得标准样检测项目业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
     public CommonResult<PageResult<BusinessStandardSampleProjectRespVO>> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) {
         PageResult<BusinessStandardSampleProjectDO> pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessStandardSampleProjectController implements BusinessControll
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出标准样检测项目业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubParentSampleAssessmentService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 班组判定数据业务")
+@RestController
+@RequestMapping("/qms/business-sub-parent-sample-assessment")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSubParentSampleAssessmentController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubParentSampleAssessmentService businessSubParentSampleAssessmentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建班组判定数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
+    public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
+        return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新班组判定数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
+    public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
+        businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除班组判定数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
+        businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除班组判定数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
+        businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得班组判定数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    public CommonResult<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
+        BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id);
+        return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得班组判定数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
+        PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出班组判定数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "班组判定数据业务.xls", "数据", BusinessSubParentSampleAssessmentRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubParentSampleAssessmentRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubParentSampleAssessmentProjectService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 班组判定检测项目数据业务")
+@RestController
+@RequestMapping("/qms/business-sub-parent-sample-assessment-project")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSubParentSampleAssessmentProjectController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubParentSampleAssessmentProjectService businessSubParentSampleAssessmentProjectService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建班组判定检测项目数据业务")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
+    public CommonResult<BusinessSubParentSampleAssessmentProjectRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO createReqVO) {
+        return success(businessSubParentSampleAssessmentProjectService.createBusinessSubParentSampleAssessment(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新班组判定检测项目数据业务")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
+    public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO updateReqVO) {
+        businessSubParentSampleAssessmentProjectService.updateBusinessSubParentSampleAssessment(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除班组判定检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
+        businessSubParentSampleAssessmentProjectService.deleteBusinessSubParentSampleAssessment(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除班组判定检测项目数据业务")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
+        businessSubParentSampleAssessmentProjectService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得班组判定检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    public CommonResult<BusinessSubParentSampleAssessmentProjectRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
+        BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessment(id);
+        return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentProjectRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得班组判定检测项目数据业务分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    public CommonResult<PageResult<BusinessSubParentSampleAssessmentProjectRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO) {
+        PageResult<BusinessSubParentSampleAssessmentProjectDO> pageResult = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentProjectRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出班组判定检测项目数据业务 Excel")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubParentSampleAssessmentProjectDO> list = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "班组判定检测项目数据业务.xls", "数据", BusinessSubParentSampleAssessmentProjectRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubParentSampleAssessmentProjectRespVO.class));
+    }
+
+}

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
 
     @PostMapping("/create")
     @Operation(summary = "创建分样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')")
     public CommonResult<BusinessSubParentSampleRespVO> createBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO createReqVO) {
         return success(businessSubParentSampleService.createBusinessSubParentSample(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新分样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')")
     public CommonResult<Boolean> updateBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO updateReqVO) {
         businessSubParentSampleService.updateBusinessSubParentSample(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
     @DeleteMapping("/delete")
     @Operation(summary = "删除分样业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSample(@RequestParam("id") Long id) {
         businessSubParentSampleService.deleteBusinessSubParentSample(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除分样业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleList(@RequestBody BatchDeleteReqVO req) {
         businessSubParentSampleService.deleteBusinessSubParentSampleListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
     @GetMapping("/get")
     @Operation(summary = "获得分样业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
     public CommonResult<BusinessSubParentSampleRespVO> getBusinessSubParentSample(@RequestParam("id") Long id) {
         BusinessSubParentSampleDO businessSubParentSample = businessSubParentSampleService.getBusinessSubParentSample(id);
         return success(BeanUtils.toBean(businessSubParentSample, BusinessSubParentSampleRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
 
     @GetMapping("/page")
     @Operation(summary = "获得分样业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
     public CommonResult<PageResult<BusinessSubParentSampleRespVO>> getBusinessSubParentSamplePage(@Valid BusinessSubParentSamplePageReqVO pageReqVO) {
         PageResult<BusinessSubParentSampleDO> pageResult = businessSubParentSampleService.getBusinessSubParentSamplePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出分样业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubParentSampleExcel(@Valid BusinessSubParentSamplePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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 {
 
 
@@ -44,14 +47,14 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
 
     @PostMapping("/create")
     @Operation(summary = "创建子样分析班组业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')")
     public CommonResult<BusinessSubSampleAnalysisGroupRespVO> createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) {
         return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新子样分析班组业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')")
     public CommonResult<Boolean> updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) {
         businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO);
         return success(true);
@@ -60,7 +63,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
     @DeleteMapping("/delete")
     @Operation(summary = "删除子样分析班组业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
         businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id);
         return success(true);
@@ -69,7 +72,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除子样分析班组业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds());
         return success(true);
@@ -78,7 +81,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
     @GetMapping("/get")
     @Operation(summary = "获得子样分析班组业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
     public CommonResult<BusinessSubSampleAnalysisGroupRespVO> getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
         BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id);
         return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class));
@@ -86,7 +89,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
 
     @GetMapping("/page")
     @Operation(summary = "获得子样分析班组业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
     public CommonResult<PageResult<BusinessSubSampleAnalysisGroupRespVO>> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) {
         PageResult<BusinessSubSampleAnalysisGroupDO> pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class));
@@ -94,7 +97,7 @@ public class BusinessSubSampleAnalysisGroupController implements BusinessControl
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出子样分析班组业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -1,8 +1,5 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -23,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;
@@ -32,10 +31,11 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAssessmentSe
 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-assessment")
 @Validated
+@DeptDataPermissionIgnore(enable = "true")
 public class BusinessSubSampleAssessmentController implements BusinessControllerMarker {
 
 
@@ -43,14 +43,14 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     private BusinessSubSampleAssessmentService businessSubSampleAssessmentService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建子样判定数据业务")
+    @Operation(summary = "创建子样判定业务")
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
     public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) {
         return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新子样判定数据业务")
+    @Operation(summary = "更新子样判定业务")
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
         businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
@@ -58,7 +58,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除子样判定数据业务")
+    @Operation(summary = "删除子样判定业务")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
@@ -68,7 +68,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除子样判定数据业务")
+    @Operation(summary = "批量删除子样判定业务")
                 @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
@@ -76,7 +76,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得子样判定数据业务")
+    @Operation(summary = "获得子样判定业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
@@ -85,7 +85,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得子样判定数据业务分页")
+    @Operation(summary = "获得子样判定业务分页")
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) {
         PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO);
@@ -93,7 +93,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出子样判定数据业务 Excel")
+    @Operation(summary = "导出子样判定业务 Excel")
     @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
@@ -101,7 +101,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<BusinessSubSampleAssessmentDO> list = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "子样判定数据业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class,
+        ExcelUtils.write(response, "子样判定业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class,
                         BeanUtils.toBean(list, BusinessSubSampleAssessmentRespVO.class));
     }
 

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

@@ -0,0 +1,111 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentProjectPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentProjectSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAssessmentProjectService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 子样判定检测项目数据业务")
+@RestController
+@RequestMapping("/qms/business-sub-sample-assessment-project")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSubSampleAssessmentProjectController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubSampleAssessmentProjectService businessSubSampleAssessmentProjectService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建子样判定检测项目数据业务")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
+    public CommonResult<BusinessSubSampleAssessmentProjectRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentProjectSaveReqVO createReqVO) {
+        return success(businessSubSampleAssessmentProjectService.createBusinessSubSampleAssessment(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新子样判定检测项目数据业务")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
+    public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentProjectSaveReqVO updateReqVO) {
+        businessSubSampleAssessmentProjectService.updateBusinessSubSampleAssessment(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除子样判定检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
+        businessSubSampleAssessmentProjectService.deleteBusinessSubSampleAssessment(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除子样判定检测项目数据业务")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
+        businessSubSampleAssessmentProjectService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得子样判定检测项目数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    public CommonResult<BusinessSubSampleAssessmentProjectRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
+        BusinessSubSampleAssessmentProjectDO businessSubSampleAssessment = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessment(id);
+        return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentProjectRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得子样判定检测项目数据业务分页")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    public CommonResult<PageResult<BusinessSubSampleAssessmentProjectRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentProjectPageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleAssessmentProjectDO> pageResult = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessmentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentProjectRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出子样判定检测项目数据业务 Excel")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentProjectPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubSampleAssessmentProjectDO> list = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessmentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "子样判定检测项目数据业务.xls", "数据", BusinessSubSampleAssessmentProjectRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubSampleAssessmentProjectRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -21,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;
@@ -36,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 {
 
 
@@ -47,14 +53,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建子样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')")
     public CommonResult<BusinessSubSampleRespVO> createBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO createReqVO) {
         return success(businessSubSampleService.createBusinessSubSample(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新子样业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')")
     public CommonResult<Boolean> updateBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO updateReqVO) {
         businessSubSampleService.updateBusinessSubSample(updateReqVO);
         return success(true);
@@ -63,7 +69,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除子样业务")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
     public CommonResult<Boolean> deleteBusinessSubSample(@RequestParam("id") Long id) {
         businessSubSampleService.deleteBusinessSubSample(id);
         return success(true);
@@ -72,7 +78,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除子样业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
+                //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleService.deleteBusinessSubSampleListByIds(req.getIds());
         return success(true);
@@ -81,15 +87,25 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得子样业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
-    public CommonResult<BusinessSubSampleRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
-        BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
-        return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    public CommonResult<BusinessSubSampleExtendRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
+//        BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
+//        return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
+    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getBusinessSubSample(id);
+    	return success(result);
+    }
+
+    @GetMapping("/getPrintSubSample")
+    @Operation(summary = "获得打印子样业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<BusinessSubSampleExtendRespVO> getPrintSubSample(@RequestParam("id") Long id) {
+    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getPrintSubSample(id);
+    	return success(result);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得子样业务列表")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
     public CommonResult<?> getBusinessSubSampleList(@Valid BusinessSubSampleReqVO reqVO) {
 		List<BusinessSubSampleExtendRespVO> listResult = businessSubSampleService.getBusinessSubSampleList(reqVO);
 		return success(listResult);
@@ -97,15 +113,41 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得子样业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
     public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSamplePage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
         PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
         return success(pageResult);
     }
 
+    @GetMapping("/page-analysis-group")
+    @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);
+    }
+
+    @GetMapping("/page-stock")
+    @Operation(summary = "查询样品库分页数据")
+    public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> pageStock(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/selectPageForDispatch")
+    @Operation(summary = "查询可申请调拨子样")
+    public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> selectPageForDispatch(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.selectPageForDispatch(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/page-task")
     @Operation(summary = "获得子样业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
     public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
         PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
         List<BusinessSubSampleExtendRespVO> list = pageResult.getList();
@@ -128,7 +170,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出子样业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')")
+    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleExcel(@Valid BusinessSubSamplePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -139,4 +181,24 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
                         BeanUtils.toBean(list, BusinessSubSampleRespVO.class));
     }
 
+    @PostMapping("/execReturnToStock")
+    @Operation(summary = "样品归库")
+    public CommonResult<BusinessSubSampleRespVO> execReturnToStock(@Valid @RequestBody BusinessSubSampleSaveReqVO reqVO) {
+        return success(businessSubSampleService.execReturnToStock(reqVO));
+    }
+
+    @PostMapping("/execTakeOff")
+    @Operation(summary = "样品下架")
+    public CommonResult<Integer> execTakeOff(@RequestBody JSONObject reqVO) {
+        Integer count = businessSubSampleService.execTakeOff(reqVO);
+        return success(count);
+    }
+
+    @PostMapping("/execChangeLocation")
+    @Operation(summary = "库位变更")
+    public CommonResult<Integer> execChangeLocation(@RequestBody JSONObject reqVO) {
+        Integer count = businessSubSampleService.execChangeLocation(reqVO);
+        return success(count);
+    }
+
 }

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.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 = "管理后台 - 分样复测业务数据")
+@RestController
+@RequestMapping("/qms/business-sub-sample-parent-retest")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessSubSampleParentRetestController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubSampleParentRetestService businessSubSampleParentRetestService;
+
+    @PostMapping("/create")
+    @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-retest:update')")
+    public CommonResult<Boolean> updateBusinessSubSampleParentRetest(@Valid @RequestBody BusinessSubSampleParentRetestSaveReqVO updateReqVO) {
+        businessSubSampleParentRetestService.updateBusinessSubSampleParentRetest(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除分样复测业务数据")
+    @Parameter(name = "id", description = "编号", required = true)
+    @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-retest:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleParentRetestList(@RequestBody BatchDeleteReqVO req) {
+        businessSubSampleParentRetestService.deleteBusinessSubSampleParentRetestListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得分样复测业务数据")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @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-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-retest:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubSampleParentRetestExcel(@Valid BusinessSubSampleParentRetestPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubSampleParentRetestDO> list = businessSubSampleParentRetestService.getBusinessSubSampleParentRetestPage(pageReqVO).getList();
+        // 导出 Excel
+        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/BusinessTeamAssessmentController.java

@@ -1,108 +0,0 @@
-package com.zt.plat.module.qms.business.bus.controller.admin;
-
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessTeamAssessmentSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import 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.BusinessTeamAssessmentDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessTeamAssessmentService;
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-@Tag(name = "管理后台 - 班组判定数据业务")
-@RestController
-@RequestMapping("/qms/business-team-assessment")
-@Validated
-public class BusinessTeamAssessmentController implements BusinessControllerMarker {
-
-
-    @Resource
-    private BusinessTeamAssessmentService businessTeamAssessmentService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建班组判定数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:create')")
-    public CommonResult<BusinessTeamAssessmentRespVO> createBusinessTeamAssessment(@Valid @RequestBody BusinessTeamAssessmentSaveReqVO createReqVO) {
-        return success(businessTeamAssessmentService.createBusinessTeamAssessment(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新班组判定数据业务")
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:update')")
-    public CommonResult<Boolean> updateBusinessTeamAssessment(@Valid @RequestBody BusinessTeamAssessmentSaveReqVO updateReqVO) {
-        businessTeamAssessmentService.updateBusinessTeamAssessment(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除班组判定数据业务")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:delete')")
-    public CommonResult<Boolean> deleteBusinessTeamAssessment(@RequestParam("id") Long id) {
-        businessTeamAssessmentService.deleteBusinessTeamAssessment(id);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete-list")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除班组判定数据业务")
-                @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:delete')")
-    public CommonResult<Boolean> deleteBusinessTeamAssessmentList(@RequestBody BatchDeleteReqVO req) {
-        businessTeamAssessmentService.deleteBusinessTeamAssessmentListByIds(req.getIds());
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得班组判定数据业务")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:query')")
-    public CommonResult<BusinessTeamAssessmentRespVO> getBusinessTeamAssessment(@RequestParam("id") Long id) {
-        BusinessTeamAssessmentDO businessTeamAssessment = businessTeamAssessmentService.getBusinessTeamAssessment(id);
-        return success(BeanUtils.toBean(businessTeamAssessment, BusinessTeamAssessmentRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得班组判定数据业务分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:query')")
-    public CommonResult<PageResult<BusinessTeamAssessmentRespVO>> getBusinessTeamAssessmentPage(@Valid BusinessTeamAssessmentPageReqVO pageReqVO) {
-        PageResult<BusinessTeamAssessmentDO> pageResult = businessTeamAssessmentService.getBusinessTeamAssessmentPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessTeamAssessmentRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出班组判定数据业务 Excel")
-    @PreAuthorize("@ss.hasPermission('qms:business-team-assessment:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessTeamAssessmentExcel(@Valid BusinessTeamAssessmentPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessTeamAssessmentDO> list = businessTeamAssessmentService.getBusinessTeamAssessmentPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "班组判定数据业务.xls", "数据", BusinessTeamAssessmentRespVO.class,
-                        BeanUtils.toBean(list, BusinessTeamAssessmentRespVO.class));
-    }
-
-}

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

@@ -0,0 +1,108 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessXRFDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessXRFDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 荧光采集记录")
+@RestController
+@RequestMapping("/qms/business-xrf-data")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class BusinessXRFDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessXRFDataService businessXRFDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建荧光采集记录")
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:create')")
+    public CommonResult<BusinessXRFDataRespVO> createBusinessXRFData(@Valid @RequestBody BusinessXRFDataSaveReqVO createReqVO) {
+        return success(businessXRFDataService.createBusinessXRFData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新荧光采集记录")
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:update')")
+    public CommonResult<Boolean> updateBusinessXRFData(@Valid @RequestBody BusinessXRFDataSaveReqVO updateReqVO) {
+        businessXRFDataService.updateBusinessXRFData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除荧光采集记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:delete')")
+    public CommonResult<Boolean> deleteBusinessXRFData(@RequestParam("id") Long id) {
+        businessXRFDataService.deleteBusinessXRFData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除荧光采集记录")
+                @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:delete')")
+    public CommonResult<Boolean> deleteBusinessXRFDataList(@RequestBody BatchDeleteReqVO req) {
+        businessXRFDataService.deleteBusinessXRFDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得荧光采集记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:query')")
+    public CommonResult<BusinessXRFDataRespVO> getBusinessXRFData(@RequestParam("id") Long id) {
+        BusinessXRFDataDO businessXRFData = businessXRFDataService.getBusinessXRFData(id);
+        return success(BeanUtils.toBean(businessXRFData, BusinessXRFDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得荧光采集记录分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:query')")
+    public CommonResult<PageResult<BusinessXRFDataRespVO>> getBusinessXRFDataPage(@Valid BusinessXRFDataPageReqVO pageReqVO) {
+        PageResult<BusinessXRFDataDO> pageResult = businessXRFDataService.getBusinessXRFDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessXRFDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出荧光采集记录 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-XRF-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessXRFDataExcel(@Valid BusinessXRFDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessXRFDataDO> list = businessXRFDataService.getBusinessXRFDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "荧光采集记录.xls", "数据", BusinessXRFDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessXRFDataRespVO.class));
+    }
+
+}

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

@@ -1,12 +1,21 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson2.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;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 
@@ -19,18 +28,85 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
-public class SampleAnalysisAuditController {
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;
-
+	
 	/**
 	 * 交叉审核
 	 * @return
 	 */
 	@PostMapping("/crossAudit")
 	public CommonResult<?> crossAudit(Long businessAssayTaskId, String auditStatus) {
-		sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
+		sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId, auditStatus);
 		return success("成功");
 	}
+	
+	@GetMapping("/getSampleResultAssessmentList")
+	public CommonResult<JSONObject> getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO);
+		return success(result);
+	}
+	
+	@GetMapping("/getResultAssessment")
+	public CommonResult<?> getResultAssessment(String assayType, Long sampleId, Long configAssayMethodId) {
+		JSONObject result = null;
+		if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(assayType)) {//平行
+			result = sampleAnalysisAuditService.getParallelResultAssessment(sampleId, configAssayMethodId);
+		} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(assayType)) {//双杯
+			result = sampleAnalysisAuditService.getDoubleCupResultAssessment(sampleId, configAssayMethodId);
+		}
+		return success(result);
+	}
+	
+	//平行分析结果判定
+	@GetMapping("/getParallelResultAssessment")
+	public CommonResult<?> getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleAnalysisAuditService.getParallelResultAssessment(businessSubSampleId, configAssayMethodId);
+		return success(result);
+	}
+	
+	//双杯分析结果判定
+	@GetMapping("/getDoubleCupResultAssessment")
+	public CommonResult<?> getDoubleCupResultAssessment(Long businessSubParentSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleAnalysisAuditService.getDoubleCupResultAssessment(businessSubParentSampleId, configAssayMethodId);
+		return success(result);
+	}
+	
+	//修改结果判定
+	@PostMapping("/modifyResultAssessment")
+	public CommonResult<?> modifyResultAssessment(@RequestBody ModifyResultAssessmentReqVO reqVO) {
+		JSONObject result = null;
+		if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(reqVO.getAssayType())) {//平行
+			result = sampleAnalysisAuditService.modifyParallelResultAssessment(reqVO.getSampleId(), reqVO.getConfigAssayMethodId(), reqVO.getSampleAssessmentId(), reqVO.getBusinessAssayProjectDataIds());
+		} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(reqVO.getAssayType())) {//双杯
+			
+		}
+		return success(result);
+	}
+	
+	//判定数据上报
+	@PostMapping("/assessmentDataReporting")
+	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 (BusinessSubSampleIdAndRetestCount businessSubSampleIdAndRetestCount : reqVO.getBusinessSubSampleIdAndRetestCounts()) {
+			sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleIdAndRetestCount.getBusinessSubSampleId(), reqVO.getConfigAssayMethodId(), businessSubSampleIdAndRetestCount.getRetestCount());
+		}
+		return success("成功"); 
+	}
+	
+	//重新创建复检委托
+	@PostMapping("/createReAnalysis")
+	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

@@ -7,8 +7,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
+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;
 import jakarta.annotation.Resource;
@@ -22,28 +25,69 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis")
 @Validated
-public class SampleAnalysisController {
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleAnalysisController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisService sampleAnalysisService ;
 	
+	@Deprecated
 	@GetMapping("/batchSampleAnalysisByTaskId")
 	public CommonResult<?> batchSampleAnalysisByTaskId(Long businessAssayTaskId) {
 		BusinessAssayTaskAnalysisSampleProjectRespVO businessAssayTaskAnalysisSampleProject = sampleAnalysisService.batchSampleAnalysisByTaskId(businessAssayTaskId);
 		return success(businessAssayTaskAnalysisSampleProject);
 	}
-	
+
+	@Deprecated
 	@PostMapping("/saveBatchSampleAnalysis")
 	public CommonResult<?> saveBatchSampleAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleProjectRespVO vo) {
 		sampleAnalysisService.saveBatchSampleAnalysis(vo);
 		return success("成功");
 	}
 	
+	@GetMapping("/batchSampleAndQcAnalysisByTaskId")
+	public CommonResult<?> batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId) {
+		BusinessAssayTaskAnalysisSampleAndQcProjectRespVO businessAssayTaskAnalysisSampleAndQcProject = sampleAnalysisService.batchSampleAndQcAnalysisByTaskId(businessAssayTaskId);
+		return success(businessAssayTaskAnalysisSampleAndQcProject);
+	}
 	
+	@PostMapping("/saveBatchSmpleAndQcAnalysis")
+	public CommonResult<?> saveBatchSmpleAndQcAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleAndQcProjectRespVO  vo) {
+		sampleAnalysisService.saveBatchSmpleAndQcAnalysis(vo);
+		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);
 		return success("成功");
 	}
+	
+	@GetMapping("/getSampleAnalysisDataByTaskDataId")
+	public CommonResult<?> getSampleAnalysisDataByTaskDataId(Long businessAssayTaskDataId) {
+		JSONObject json = sampleAnalysisService.getSampleAnalysisDataByTaskDataId(businessAssayTaskDataId);
+		return success(json);
+	}
+	
+	@PostMapping("/rollbackAnalysisSample")
+	public CommonResult<?> rollbackAnalysisSample(@RequestBody BusinessAssayTaskBackSampleReqVO req) {
+		sampleAnalysisService.rollbackAnalysisSample(req);
+		return success("成功");
+	}
 
 }

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

@@ -14,11 +14,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.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;
@@ -33,7 +35,8 @@ import jakarta.validation.Valid;
 @RestController
 @RequestMapping("/qms/bus/sample/entrust")
 @Validated
-public class SampleEntrustController {
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleEntrustController implements BusinessControllerMarker {
 
     @Resource
     private FlowExecutor flowExecutor;
@@ -48,7 +51,7 @@ public class SampleEntrustController {
     	if (response.isSuccess()) {
 			return success(response.getContextBean(SampleEntrustContext.class));
 		} else {
-			return error(500, response.getMessage());
+			return error(1_032_100_000, response.getMessage());
 		}
     }
     
@@ -66,7 +69,7 @@ public class SampleEntrustController {
     	if (response.isSuccess()) {
 			return success(response.getContextBean(SampleEntrustContext.class));
 		} else {
-			return error(500, response.getMessage());
+			return error(1_032_100_000, response.getMessage());
 		}
     }
 

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

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

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

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

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

@@ -0,0 +1,95 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson2.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;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import java.util.List;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 结果上报
+ */
+@Tag(name = "管理后台 - 结果上报")
+@RestController
+@RequestMapping("/qms/bus/sample/result-reporting")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleResultReportingController implements BusinessControllerMarker {
+	
+	@Resource
+	private SampleResultReportingService sampleResultReportingService;
+	
+	//获取未上报的方法
+	@GetMapping("/getUnReportMethodGroupList")
+	public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+    	if (reqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
+		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
+		return success(list);
+	}
+	
+	//获取方法对应的样品
+	@GetMapping("/getSampleResultReportingList")
+	public CommonResult<?> getSampleResultReportingList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+		JSONObject result = sampleResultReportingService.getSampleResultReportingList(reqVO);
+		return success(result);
+	}
+	
+	//获取复检方法
+	@GetMapping("/getRecheckAssayMethodList")
+	public CommonResult<?> getRecheckMethodList(Long baseSampleId, Long businessSubParentSampleId, Long configAssayMethodId) {
+		List<RecheckSubSampleParentMethodRespVO> list = sampleResultReportingService.getRecheckAssayMethodList(baseSampleId, businessSubParentSampleId, configAssayMethodId);
+		return success(list);
+	}
+	
+	//创建复检样
+	@PostMapping("/createRecheckSample")
+	public CommonResult<?> createRecheckSample(@RequestBody RecheckSubSampleParentCreateReqVO reqVO) {
+		sampleResultReportingService.createRecheckSample(reqVO);
+		
+		return success("成功");
+	}
+	
+	//上报
+	@PostMapping("/batchResultDataReporting")
+	public CommonResult<?> batchResultDataReporting(@RequestBody BatchResultDataReportingReqVO reqVO) {
+		sampleResultReportingService.batchResultDataReporting(reqVO);
+		return success("成功");
+	}
+	
+	//结果单个结果查询
+	@GetMapping("/getSingleSampleResultReportingList")
+	public CommonResult<?> getSingleSampleResultReportingList(Long businessSubParentSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleResultReportingService.getSingleSampleResultReportingList(businessSubParentSampleId, configAssayMethodId);
+	    return success(result);
+	}
+	
+	//修改结果
+	@PostMapping("/modifySampleResultReporting")
+	public CommonResult<?> modifySampleResultReporting(@RequestBody ModifySampleResultReportingReqVO reqVO) {
+		sampleResultReportingService.modifySampleResultReporting(reqVO);
+		return success("成功");
+	}
+
+}

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

@@ -9,13 +9,22 @@ import org.springframework.web.bind.annotation.RestController;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
+import java.util.Arrays;
 import java.util.List;
 
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+import com.zt.plat.framework.security.core.LoginUser;
+import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
 import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
 import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -24,7 +33,8 @@ import jakarta.annotation.Resource;
 @RestController
 @RequestMapping("/qms/bus/sample/task-assign")
 @Validated
-public class SampleTaskAssignController {
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleTaskAssignService sampleTaskAssignService;
@@ -36,10 +46,40 @@ public class SampleTaskAssignController {
 		return success(list);
 	}
 
+	@Operation(description = "根据用户id获取用户信息")
+	@GetMapping("/getUserInfoById")
+	public CommonResult<?> getUserInfoById(Long userId) {
+		AdminUserRespDTO userRespDTO = sampleTaskAssignService.getUserInfoById(userId);
+		return success(userRespDTO);
+	}
+	
+	@GetMapping("/getAssaySampleList")
+	public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
+    	if (reqVO.getAssayDepartmentId() == null) {
+    		LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            reqVO.setAssayDepartmentId(loginUser.getVisitDeptId());
+		}
+		List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
+		return success(list);
+	} 
+	
+	@GetMapping("/getAssayMethodProjectList")
+	public CommonResult<?> getAssayMethodProjectList(String businessSubSampleIds, Long configAssayMethodId) {
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getAssayMethodProjectList(businessSubSampleIdList, configAssayMethodId);
+		return success(list);
+	}
+	
+	@GetMapping("/getMaterialAssayStandardMethodProjectList")
+	public CommonResult<?> getMaterialAssayStandardMethodProjectList(String businessSubSampleIds, Long baseSampleId, Long configAssayMethodId) {
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getMaterialAssayStandardMethodProjectList(businessSubSampleIdList, baseSampleId, configAssayMethodId);
+		return success(list);
+	}
+
     @PostMapping("/changeMethod")
-    public CommonResult<?> changeMethod() {
-    	
-    	
+    public CommonResult<?> changeMethod(@RequestBody ChangeAssayMethodReqVO req) {
+    	sampleTaskAssignService.changeMethod(req);
     	return success("成功");
     }
 	
@@ -49,6 +89,11 @@ public class SampleTaskAssignController {
     	return success("成功");
     }
 
+    @PostMapping("/manualAssign")
+    public CommonResult<?> manualAssign(@RequestBody SampleTaskAssignManualParam param) {
+    	sampleTaskAssignService.manualAssign(param);
+    	return success("成功");
+    }
 	
     @PostMapping("/sampleAssign")
     public CommonResult<?> sampleAssign(@RequestBody SampleTaskAssignSampleParam param) {
@@ -56,12 +101,35 @@ public class SampleTaskAssignController {
     	return success("成功");
     }
     
+    @PostMapping("/removeAssignTaskDetail")
+    public CommonResult<?> removeAssignTaskDetail(@RequestBody BatchDeleteReqVO req) {
+    	sampleTaskAssignService.removeAssignTaskDetail(req);
+    	return success("成功");
+    }
+
+	@PostMapping("/createQcSample")
+	public CommonResult<?> createQcSample(@RequestBody CreateQcSampleReqVO req) {
+		sampleTaskAssignService.createQcSample(req);
+		return success("成功");
+	}
+	
+	@PostMapping("/deleteQcSample")
+	public CommonResult<?> deleteQcSample(@RequestBody DeleteQcSampleReqVO req) {
+		sampleTaskAssignService.deleteQcSample(req);
+		return success("成功");
+	}
+    
     @PostMapping("/submitAssign")
     public CommonResult<?> submitAssign(Long id) {
     	sampleTaskAssignService.submitAssign(id);
     	return success("成功");
     }
     
+    /**
+     * 作废
+     * @param id
+     * @return
+     */
     @PostMapping("/voidAssign")
     public CommonResult<?> voidAssign(Long id) {
     	sampleTaskAssignService.voidAssign(id);

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

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

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

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

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

@@ -0,0 +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<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

@@ -0,0 +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<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/BatchSampleAnalysisColumnRespVO.java

@@ -62,4 +62,20 @@ public class BatchSampleAnalysisColumnRespVO implements Serializable {
     
     @Schema(description = "单位")
     private String unit;
+
+    /** 类型（project：元素，parameter：参数） **/
+    @Schema(description = "类型（project：元素，parameter：参数）")
+    private String type;
+    
+    @Schema(description = "填写方式")
+    private String fillingWay;
+    
+    @Schema(description = "参数分组_ID")
+    private Long groupDictionaryBusinessId;
+
+    @Schema(description = "参数分组_Key")
+    private String groupDictionaryBusinessKey;
+
+    @Schema(description = "参数分组_Name")
+    private String groupDictionaryBusinessName;
 }

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

@@ -0,0 +1,12 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessAssayParameterDataExtendRespVO extends BusinessAssayParameterDataRespVO {
+	
+	private String parameterName;
+	
+	private String parameterKey;
+
+}

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

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

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

@@ -16,6 +16,9 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
 	/** id主键 **/
     private Long id;
     
+    /** 业务数据id 如：T_BSN_ASY_PRJ_DAT表，则为BSN_ASY_TSK_DAT_ID，T_BSN_ASY_PRM_DAT表，则为BSN_ASY_PRJ_DAT_ID **/
+    private Long bizId;
+    
     /** 元素或参数字典id **/
     private Long dicId;
     
@@ -42,6 +45,10 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     /** 结果值 **/
     @Schema(description = "结果值")
     private String value;
+
+    /** 符号,=、>、<、等 **/
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
     
     @Schema(description = "是否允许为空")
     private Integer isNull; 
@@ -54,8 +61,19 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     @Schema(description = "元素或参数配置参数编号")
     private Integer paramNo;
     
-    /** 类型（1：元素，2：参数） **/
-    @Schema(description = "类型（project：元素，2：参数）")
+    /** 类型（project：元素，parameter：参数） **/
+    @Schema(description = "类型（project：元素，parameter：参数）")
     private String type;
+    
+    @Schema(description = "填写方式")
+    private String fillingWay;
+    
+    @Schema(description = "参数分组_ID")
+    private Long groupDictionaryBusinessId;
 
+    @Schema(description = "参数分组_Key")
+    private String groupDictionaryBusinessKey;
+
+    @Schema(description = "参数分组_Name")
+    private String groupDictionaryBusinessName;
 }

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

@@ -0,0 +1,56 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDataRespVO {
+	
+    @Schema(description = "样品主样ID", example = "23293")
+    private Long businessBaseSampleId;
+    
+    @Schema(description = "主样配置ID")
+    private Long configBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "15024")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "任务分配单Id")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "样品名称", example = "张三")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
+
+    @Schema(description = "分析人员")
+    private String assayOperator;
+    
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+
+    @Schema(description = "单位")
+    private String dictionaryProjectUnit;
+
+    @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;
@@ -22,9 +24,24 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
     @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "19038")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
     @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;
 
@@ -34,6 +51,9 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
     @Schema(description = "是否不参与超差判定")
     private Integer isNotAssessment;
 
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
     @Schema(description = "是否启用")
     private Integer isEnabled;
 

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;
@@ -13,6 +15,12 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayProjectDataReqVO {
 
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "9130")
+    private Long configAssayMethodId;
+    
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
 
@@ -22,9 +30,24 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
     @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;
 
@@ -34,6 +57,9 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "是否不参与超差判定")
     private Integer isNotAssessment;
 
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
     @Schema(description = "是否启用")
     private Integer isEnabled;
 
@@ -50,4 +76,8 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    //========================扩展字段==================================
+    
+    @Schema(description = "检测任务ID列表", example = "16505")
+    private List<Long> businessAssayTaskDataIdList;
 }

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.*;
 
@@ -28,10 +30,25 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("检测项目字典ID,字典表【T_DIC_PRJ】")
     private Long dictionaryProjectId;
 
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
     @Schema(description = "值")
     @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;
@@ -44,6 +61,9 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("是否不参与超差判定")
     private Integer isNotAssessment;
 
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否启用")
     private Integer isEnabled;

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;
@@ -38,6 +49,9 @@ public class BusinessAssayProjectDataSaveReqVO {
     @NotNull(message = "是否不参与超差判定不能为空")
     private Integer isNotAssessment;
 
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否启用不能为空")
     private Integer isEnabled;

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

@@ -24,9 +24,18 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
 
     @Schema(description = "样品编号")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     private String reportFlowCode;
@@ -47,4 +56,21 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //==================扩展字段===========
+
+    @Schema(description = "id列表")
+    private List<Long> idList;
+
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "主样创建时间范围")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] baseSampleCreateTime;
+
+    @Schema(description = "委托id列表")
+    private List<Long> businessSampleEntrustRegistrationIdList;
+
+    @Schema(description = "报告类型ID", example = "2124")
+    private Long reportDocumentTypeId;
 }

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -7,6 +8,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 检测报表数据业务 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -31,10 +34,19 @@ public class BusinessAssayReportDataRespVO {
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品编号")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     @ExcelProperty("分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     @ExcelProperty("流程code")
@@ -60,4 +72,13 @@ public class BusinessAssayReportDataRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    //=====自定义字段
+    @Schema(description = "样品名称")
+    @ExcelProperty("样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品创建时间")
+    @ExcelProperty("样品创建时间")
+    private LocalDateTime baseSampleCreateTime;
+
 }

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

@@ -27,9 +27,18 @@ public class BusinessAssayReportDataSaveReqVO {
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "样品编号不能为空")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     private String reportFlowCode;

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

@@ -0,0 +1,70 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.zt.plat.module.qms.business.config.controller.vo.*;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 分配任务单 分析样品及质控样品检测项目
+ */
+@Data
+public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
+
+	/** 分配任务单id **/
+    private Long businessAssayTaskId;
+
+    /** 任务分配单编号 **/
+    private String businessAssayTasNo;
+
+    /** 任务分配单名称 **/
+    private String businessAssayTasName;
+    
+    /** 分析人员 **/
+    private String assayOperator;
+    
+    /** 分析时间 **/
+    private LocalDateTime assayTime;
+
+    /** 检测方法id **/
+    private Long configAssayMethodId;
+    
+    /** 检测方法名称 **/
+    private String configAssayMethodName;
+    
+    /** 数据集key **/
+    private String dataCollectionKey;
+    
+    /** 数据集id **/
+    private Long dataCollectionId;
+    
+    /** 动态表单值 **/
+    private String formValue;
+
+    @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;
+
+
+    /** 质量控制分析方法 **/
+    //private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
+    
+    /** 分配任务的分析数据 **/
+    private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;
+
+    /** 检测方法分析项目补正系数 **/
+    private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
+    
+    /** 检测方法范围 **/
+    private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;
+    
+    
+}

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

@@ -4,7 +4,10 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -42,12 +45,21 @@ public class BusinessAssayTaskAnalysisSampleProjectRespVO {
     
     /** 动态表单值 **/
     private String formValue;
+
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
     
     /** 分析的列 **/
     private List<BatchSampleAnalysisColumnRespVO> columns;
     
     /** 分析的数据 **/
     private List<Map<String, Object>> datas;
+
+    /** 检测方法分析项目补正系数 **/
+    private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
     
     /** 检测方法范围 **/
     private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BusinessAssayTaskBackSampleReqVO {
+	
+	/**
+	 * 任务明细id
+	 */
+	private List<Long> idList;
+	
+	/**
+	 * 退回描述
+	 */
+	private String backDesc;
+
+}

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

@@ -1,14 +1,31 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataRespVO {
+	
+    @Schema(description = "收样人")
+    private String sampleReceiver;
+
+    @Schema(description = "收样时间")
+    private LocalDateTime sampleReceiveTime;
 
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
+    @Schema(description = "主样配置id")
+    private Long configBaseSampleId;
+    
+    @Schema(description = "子样配置id")
+    private Long configSubSampleId;
 
     @Schema(description = "样品名称")
     private String sampleName;
@@ -18,4 +35,16 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
 
     @Schema(description = "分析编号")
     private String sampleAssayCode;
+    
+    @Schema(description = "任务单模板key")
+    private String configReportTemplateKey;
+
+    private Integer  asmtIsReported;
+
+    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

@@ -2,27 +2,36 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import lombok.Data;
 
-/**
- * <b>BusinessAssayTaskDataGroupRespVO</b>
- * <p>
- * 更新历史：
- * <pre> 版本         更新时间            更新者        更新内容<hr/>
- * V1.0      2025年9月20日          wxr         Add</pre>
- * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
- * </p>
- * @author 王兴荣<wxr@wangxingrong.com>
- * @version V1.0 
- * @since 2025年9月20日
- */
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	
+	/** 方法id **/
 	private Long configAssayMethodId;
 	
+	/** 方法名称 **/
 	private String configAssayMethodName;
+	
+	private String configAssayMethodDictionaryBusinessKey;
+	
+	/** 方法名称及类别 **/
+	private String configAssayMethodNameAndCategory;
 
     private String assayType;
 	
 	private Integer sampleTaskCount;
 
+	/** 判定未完 **/
+	private Integer asmtInitialCount;
+	
+	/** 判定待上报 **/
+	private Integer asmtPendingReportCount;
+	
+	/** 判定待判定 **/
+	private Integer asmtPendingAssessmentCount;
+	
+	/** 判定复测 **/
+	private Integer asmtReInspectedCount;
+	
+	/** 判定已上报 **/
+	private Integer asmtReportedCount;
 }

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

@@ -22,6 +22,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 
@@ -31,7 +34,7 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
     private String assayType;
 
     @Schema(description = "检测项目")
@@ -46,6 +49,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "27835")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +65,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "15920")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
@@ -73,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;
@@ -89,4 +104,8 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //===================================扩展字段===============================================
+
+    @Schema(description = "样品状态")
+    private String sampleStatus;
 }

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;
 
@@ -22,6 +20,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 
@@ -31,7 +32,7 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
     private String assayType;
 
     @Schema(description = "检测项目")
@@ -46,6 +47,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "27835")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +63,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "15920")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
@@ -73,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;
@@ -88,5 +101,33 @@ public class BusinessAssayTaskDataReqVO {
 
     @Schema(description = "备注")
     private String remark;
+    
+    //=== 扩展字段，判定上报状态
+    @Schema(description = "判定上报状态")
+    private String asmtReportedStatus;
 
+    @Schema(description = "样品状态")
+    private String sampleStatus;
+
+    @Schema(description = "检测方法配置名称")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
 }

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

@@ -28,6 +28,9 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
@@ -40,8 +43,8 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
     private String assayType;
 
     @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -60,6 +63,10 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "27835")
+    @ExcelProperty("分析人ID")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @ExcelProperty("分配任务时间")
     private LocalDateTime assignTaskTime;
@@ -76,6 +83,10 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "15920")
+    @ExcelProperty("上报人ID")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
@@ -92,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

@@ -2,9 +2,7 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
 import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 子样检测任务业务新增/修改 Request VO")
@@ -26,6 +24,9 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
@@ -38,8 +39,8 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...不能为空")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
     private String assayType;
 
     @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -56,6 +57,9 @@ public class BusinessAssayTaskDataSaveReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "27835")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     private LocalDateTime assignTaskTime;
 
@@ -68,6 +72,9 @@ public class BusinessAssayTaskDataSaveReqVO {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "15920")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
@@ -83,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/BusinessAssayTaskDetailExtendRespVO.java

@@ -0,0 +1,41 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayTaskDetailExtendRespVO extends BusinessAssayTaskDetailRespVO {
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "样品主样ID", example = "23293")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "15024")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "9130")
+    private Long configAssayMethodId;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
+    private String assayType;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "16988")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
+    @Schema(description = "分析人")
+    private String assayOperator;
+}

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

@@ -15,6 +15,9 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam {
 
     @Schema(description = "指派单ID", example = "21102")
     private Long businessAssayTaskId;
+    
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
 
     @Schema(description = "样品id", example = "9299")
     private Long sampleId;

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

@@ -13,6 +13,9 @@ public class BusinessAssayTaskDetailReqVO {
 
     @Schema(description = "指派单ID", example = "21102")
     private Long businessAssayTaskId;
+    
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
 
     @Schema(description = "样品id", example = "9299")
     private Long sampleId;

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

@@ -19,6 +19,9 @@ public class BusinessAssayTaskDetailRespVO {
     @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102")
     @ExcelProperty("指派单ID")
     private Long businessAssayTaskId;
+    
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
 
     @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
     @ExcelProperty("样品id")