升级liteflow及处理荧光数据上传

# Conflicts:
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.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
@@ -74,3 +74,13 @@ spec:
       port: 9999
       targetPort: 9999
       nodePort: 30194
+    - name: websocket-8320
+      protocol: TCP
+      port: 8320
+      targetPort: 8320
+      nodePort: 30320
+    - name: tcp-8330
+      protocol: TCP
+      port: 8330
+      targetPort: 8330
+      nodePort: 30330

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.43</revision>
+        <revision>3.0.45</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -177,8 +177,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>
@@ -190,8 +190,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>
@@ -203,8 +203,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,5 +1,6 @@
-ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
-FROM ${BASE_IMAGE}
+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 文件，复制到镜像中
@@ -8,10 +9,10 @@ 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}"
+#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

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/resources/application-dev.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

@@ -119,5 +119,9 @@ zt:
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true
-
+    ignore-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
+  security:
+    permit-all-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
 debug: false

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

@@ -54,6 +54,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_REPORT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表类型配置不存在");
 	ErrorCode CONFIG_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目配置不存在");
 	ErrorCode CONFIG_ENTRUST_SOURCE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源配置不存在");
+	ErrorCode CONFIG_ENTRUST_SOURCE_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源与样品类型配置不存在");
 
 	ErrorCode CONFIG_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "主样配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目参数配置不存在");
@@ -87,7 +88,7 @@ public interface ErrorCodeConstants {
 	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, "库位编码重复，请检查库位数据，或联系管理员处理！");
+	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, "委检登记业务不存在");
@@ -102,7 +103,8 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_ASSAY_TASK_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, "检测任务分配业务不存在");
@@ -116,6 +118,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_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_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
 
@@ -137,6 +140,7 @@ public interface ErrorCodeConstants {
 	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
 	ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
 	ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
+	ErrorCode REPORT_DOCUMENT_FILE_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告附件不存在");
 
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
@@ -148,12 +152,38 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
 
 
+	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
+	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
+
+	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次不存在");
+	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次分发不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库，出库不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库明细,出库明细等不存在");
+
+	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_150_000, "客户端版本管理不存在");
+
+	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "存放位置不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点明细不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
+
+
+
+
+
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
 
 
 
 
 	/*================================= 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/QmsCommonConstant.java

@@ -107,6 +107,15 @@ public interface QmsCommonConstant {
     /** 检验委托 **/
     String ENTRUST_INSPECTION = "entrust_inspection";
     
+    /** 委托样品类型： 委检样 **/
+    String ENTRUST_COMMISSION_INSPECTION_SAMPLE = "commissionInspectionSample";
+
+    /** 委托样品类型： 商检分析样 **/
+    String ENTRUST_INSPECTION_ANALYSIS_SAMPLE = "inspectionAnalysisSample";
+
+    /** 委托样品类型： 商检综合 **/
+    String ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE = "comprehensiveInspectionSample";
+    
     /** 中心收样 **/
     String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
     
@@ -157,10 +166,48 @@ public interface QmsCommonConstant {
     
     /** 品质控制 **/
     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";
+    
+    
+    
 }

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

@@ -17,7 +17,8 @@ public interface QmsPermissionConstant {
     String TARGET_TYPE_CUSTOM = "custom";
 
     //======================各业务模块权限常量=============================
-    //报告发起权限
-    String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";
+
+    String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";                   //报告发起权限
+    String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
 }

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

@@ -17,7 +17,8 @@
         QMS模块。
     </description>
     <properties>
-        <zzjc.tio.version>3.9.1.v20251013-RELEASE</zzjc.tio.version>
+        <zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
+        <liteflow.version>2.15.2</liteflow.version>
     </properties>
     <dependencies>
         <!-- Spring Cloud 基础 -->
@@ -141,27 +142,27 @@
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-javax-pro</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-groovy</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-qlexpress</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-graaljs</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
 
         <!-- pdfbox -->

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

@@ -1,12 +1,16 @@
 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.BusinessSampleDispatchPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchSaveReqVO;
+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;
@@ -46,7 +50,9 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
 
 
     @Resource private BusinessSampleDispatchService businessSampleDispatchService;
+    @Resource private BusinessSampleDispatchDetailService businessSampleDispatchDetailService;
     @Resource private BusinessSubSampleService businessSubSampleService;
+    @Resource private ConfigWarehouseLocationService configWarehouseLocationService;
 
     @PostMapping("/createTempData")
     @Operation(summary = "创建临时数据")
@@ -60,6 +66,7 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
     @Operation(summary = "更新样品调拨")
     public CommonResult<Boolean> updateBusinessSampleDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
         updateReqVO.setCancelStatus("0");
+        updateReqVO.setFlowStatus(QmsCommonConstant.NOT_START);
         businessSampleDispatchService.updateBusinessSampleDispatch(updateReqVO);
         return success(true);
     }
@@ -67,19 +74,35 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
     @PostMapping("/addOrRemoveSample")
     @Operation(summary = "增加或移除样品")
     public CommonResult<Boolean> addOrRemoveSample(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
-        businessSampleDispatchService.addOrRemoveSample(updateReqVO);
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, true);
         return success(true);
     }
 
-    @PostMapping("/addBySampleCode")
-    @Operation(summary = "增加或移除样品")
-    public CommonResult<Boolean> addBySampleCode(@RequestBody JSONObject param) {
+    @PostMapping("/addBySampleReturnCode")
+    @Operation(summary = "按归库码增加样品")
+    public CommonResult<Boolean> addBySampleReturnCode(@RequestBody JSONObject param) {
         String id = param.getString("id");
-        String sampleCode = param.getString("sampleCode");
-        BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleCode(sampleCode);
+        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+"，不能调拨！");
@@ -88,14 +111,19 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
         if("1".equals(dispatchStatus)){
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品已被调拨：请归还后再调拨！");
         }
-        //todo 重复校验
-
+        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);
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, false);
         return success(true);
     }
 

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

@@ -50,11 +50,11 @@ public class BusinessSampleDispatchDetailController implements BusinessControlle
     @GetMapping("/searchBySampleCode")
     @Operation(summary = "扫码查询待归还样品")
     public CommonResult<BusinessSampleDispatchDetailExtendRespVO> searchBySampleCode(HttpServletRequest request) {
-        String sampleCode = request.getParameter("sampleCode");
-        if(ObjectUtils.isEmpty(sampleCode))
+        String sampleReturnCode = request.getParameter("sampleReturnCode");
+        if(ObjectUtils.isEmpty(sampleReturnCode))
             return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "请输入样品编号！");
         BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
-        reqVO.setSampleCode(sampleCode);
+        reqVO.setSampleReturnCode(sampleReturnCode);
         reqVO.setBorrowStatus("1");
         reqVO.setGivebackStatus("0");
 

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

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

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

@@ -37,7 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-handover")
 @Validated
-public class BusinessSampleHandoverController implements BusinessControllerMarker {
+public class BusinessSampleHandoverController {
 
 
     @Resource

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

@@ -92,6 +92,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
         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')")

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

@@ -42,14 +42,14 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @PostMapping("/create")
     @Operation(summary = "创建班组判定数据业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
+    @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')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
         businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
         return success(true);
@@ -58,7 +58,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @DeleteMapping("/delete")
     @Operation(summary = "删除班组判定数据业务")
     @Parameter(name = "id", description = "编号", required = true)
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
         businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
         return success(true);
@@ -67,7 +67,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除班组判定数据业务")
-                //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
         return success(true);
@@ -76,7 +76,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
     @GetMapping("/get")
     @Operation(summary = "获得班组判定数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    @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));
@@ -84,7 +84,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @GetMapping("/page")
     @Operation(summary = "获得班组判定数据业务分页")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
+    @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));
@@ -92,7 +92,7 @@ public class BusinessSubParentSampleAssessmentController implements BusinessCont
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出班组判定数据业务 Excel")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -0,0 +1,106 @@
+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 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
+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/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;
@@ -32,7 +29,7 @@ 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
@@ -43,24 +40,24 @@ public class BusinessSubSampleAssessmentController implements BusinessController
     private BusinessSubSampleAssessmentService businessSubSampleAssessmentService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建子样判定数据业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
+    @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 = "更新子样判定数据业务")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
+    @Operation(summary = "更新子样判定业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
         businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除子样判定数据业务")
+    @Operation(summary = "删除子样判定业务")
     @Parameter(name = "id", description = "编号", required = true)
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
         businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id);
         return success(true);
@@ -68,40 +65,40 @@ public class BusinessSubSampleAssessmentController implements BusinessController
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除子样判定数据业务")
-                //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    @Operation(summary = "批量删除子样判定业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
         return success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得子样判定数据业务")
+    @Operation(summary = "获得子样判定业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
         BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id);
         return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得子样判定数据业务分页")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    @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);
         return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出子样判定数据业务 Excel")
-    //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
+    @Operation(summary = "导出子样判定业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         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,108 @@
+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 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
+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

@@ -90,6 +90,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     	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')")
@@ -121,6 +129,13 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
         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')")

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

@@ -8,6 +8,7 @@ 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.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
@@ -25,17 +26,11 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
-public class SampleAnalysisAuditController {
+public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;
 	
-	@GetMapping("/crossAuditByTaskId")
-	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
-		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
-		return success(result);
-	}
-
 	/**
 	 * 交叉审核
 	 * @return
@@ -47,10 +42,8 @@ public class SampleAnalysisAuditController {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus) {
-		
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, assessmentStatus);
-		
+	public CommonResult<JSONObject> getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO);
 		return success(result);
 	}
 	

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

@@ -8,6 +8,7 @@ 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.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
@@ -23,7 +24,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis")
 @Validated
-public class SampleAnalysisController {
+public class SampleAnalysisController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisService sampleAnalysisService ;

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

@@ -17,7 +17,7 @@ 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.module.qms.business.bus.controller.vo.*;
@@ -34,7 +34,7 @@ import jakarta.validation.Valid;
 @RestController
 @RequestMapping("/qms/bus/sample/entrust")
 @Validated
-public class SampleEntrustController {
+public class SampleEntrustController implements BusinessControllerMarker {
 
     @Resource
     private FlowExecutor flowExecutor;
@@ -59,14 +59,6 @@ public class SampleEntrustController {
     	BusinessSampleEntrustRegistrationExtendRespVO sampleEntrustRegistration = sampleEntrustService.detail(id);
     	return success(sampleEntrustRegistration);
     }
-
-    @GetMapping("/reportDetail")
-    @Operation(summary = "委托单详情数据")
-    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
-    	JSONObject jsonObject = sampleEntrustService.reportDetail(id);
-    	return success(jsonObject);
-    	
-    }
     
     @PostMapping("/update")
     @Operation(summary = "修改委托登记")

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

@@ -1,39 +1,30 @@
 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.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 {
+public class SampleFlowController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleFlowService sampleFlowService;
@@ -45,138 +36,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_center_receive");
-    	zxr.setSort(3100);
-
-    	SampleFlowNode zxs = new SampleFlowNode();
-    	zxs.setNodeName("中心送样");
-    	zxs.setNodeKey("flw_center_send");
-    	zxs.setSort(3200);
-
-    	SampleFlowNode bzr = new SampleFlowNode();
-    	bzr.setNodeName("班组收样");
-    	bzr.setNodeKey("flw_team_receive");
-    	bzr.setSort(3300);
-
-    	SampleFlowNode ypbm = new SampleFlowNode();
-    	ypbm.setNodeName("样品编密");
-    	ypbm.setNodeKey("flw_sample_encrypt");
-    	ypbm.setSort(3400);
-
-//    	SampleFlowNode fxr = new SampleFlowNode();
-//    	fxr.setNodeName("分析收样");
-//    	fxr.setNodeKey("flw_analysis_receive");
-//    	fxr.setSort(3500);
-//
-    	SampleFlowNode fx = new SampleFlowNode();
-    	fx.setNodeName("样品分析");
-    	fx.setNodeKey("flw_analysis");
-    	fx.setSort(3550);
-//
-//    	SampleFlowNode fxs = new SampleFlowNode();
-//    	fxs.setNodeName("分析送样");
-//    	fxs.setNodeKey("flw_analysis_send");
-//    	fxs.setSort(3600);
-
-    	SampleFlowNode bzs = new SampleFlowNode();
-    	bzs.setNodeName("班组送样");
-    	bzs.setNodeKey("flw_team_send");
-    	bzs.setSort(3700);
-
-    	SampleFlowNode ypgk = new SampleFlowNode();
-    	ypgk.setNodeName("样品归库");
-    	ypgk.setNodeKey("flw_sample_storage");
-    	ypgk.setSort(3800);
-    	ypgk.setNextFlowNodeList(null);
-    	flowNodeList.add(ypgk);
-    	
-
-    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
-    		{
-    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
-    		}
-    	});
-    	flowNodeList.add(zxr);
-    	
-
-    	zxs.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(zxs);
-
-    	bzr.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
-    	}});
-    	flowNodeList.add(bzr);
-    	
-
-    	ypbm.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(ypbm);
-    	
-
-//    	fxr.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
-//    	}});
-//    	flowNodeList.add(fxr);
-//    	
-//
-//    	fxs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-//    	}});
-//    	flowNodeList.add(fxs);
-    	
-    	fx.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-    	}});
-    	flowNodeList.add(fx);
-
-    	bzs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
-    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
-    	}});
-    	flowNodeList.add(bzs);
-    	
-    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
-    	
-    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
-    	
-    	System.out.println(jsonSampleFlowDefinition);
-    	
-    	Long tenantId = TenantContextHolder.getRequiredTenantId();
-    	
-    	List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
-    	sampleFlowInfoList.add(new SampleFlowInfo().setId(1967550576457330690L).setIsWeighing(0));
-    	
-    	SampleFlowParam sampleFlowParam = new SampleFlowParam();
-    	sampleFlowParam.setSampleSourceType(2);
-    	sampleFlowParam.setCurrentSampleFlowKey("P3000");
-    	sampleFlowParam.setSampleFlowInfoList(sampleFlowInfoList);
-    	
-    	
-    	
-    	LiteflowResponse response = flowExecutor.execute2Resp("sampleFlowChain" + tenantId, sampleFlowParam, SampleFlowContext.class);
-    	if (response.isSuccess()) {
-			return success(response.getContextBean(SampleFlowContext.class));
-		} else {
-			return error(1_032_100_000, response.getMessage());
-		}
-    	//return success(FlowBus.getNodeMap());
-	}
+    }
 
+    /**
+     * 中心收样并送样
+     * @param sampleFlowParam
+     * @return
+     */
+    @PostMapping("/centerReceiveAndSend")
+    public CommonResult<?> centerReceiveAndSend(@Validated @RequestBody SampleFlowParam sampleFlowParam) {
+    	//中心收样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_RECEIVE);
+    	LiteflowResponse response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	//中心送样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_SEND);
+    	sampleFlowParam.setSendSampleOper(null);
+    	response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	return success(response.getContextBean(SampleFlowContext.class));
+    }
 }

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

@@ -0,0 +1,45 @@
+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.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")
+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.crossAuditByTaskId(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

@@ -6,6 +6,7 @@ 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.*;
 import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
@@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @RestController
 @RequestMapping("/qms/bus/sample/result-reporting")
 @Validated
-public class SampleResultReportingController {
+public class SampleResultReportingController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleResultReportingService sampleResultReportingService;
@@ -42,8 +43,8 @@ public class SampleResultReportingController {
 	
 	//获取方法对应的样品
 	@GetMapping("/getSampleResultReportingList")
-	public CommonResult<?> getSampleResultReportingList(Long configAssayMethodId) {
-		JSONObject result = sampleResultReportingService.getSampleResultReportingList(configAssayMethodId);
+	public CommonResult<?> getSampleResultReportingList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
+		JSONObject result = sampleResultReportingService.getSampleResultReportingList(reqVO);
 		return success(result);
 	}
 	

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

@@ -11,6 +11,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 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.module.qms.business.bus.controller.vo.*;
@@ -27,7 +28,7 @@ import jakarta.annotation.Resource;
 @RestController
 @RequestMapping("/qms/bus/sample/task-assign")
 @Validated
-public class SampleTaskAssignController {
+public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleTaskAssignService sampleTaskAssignService;
@@ -38,6 +39,13 @@ public class SampleTaskAssignController {
 		List<AdminUserRespDTO> list = sampleTaskAssignService.getAssignUserList();
 		return success(list);
 	}
+
+	@Operation(description = "根据用户id获取用户信息")
+	@GetMapping("/getUserInfoById")
+	public CommonResult<?> getUserInfoById(Long userId) {
+		AdminUserRespDTO userRespDTO = sampleTaskAssignService.getUserInfoById(userId);
+		return success(userRespDTO);
+	}
 	
 	@GetMapping("/getAssaySampleList")
 	public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {

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

@@ -0,0 +1,155 @@
+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.module.qms.core.sampleflow.SampleFlowDefinition;
+import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
+
+
+@RestController
+@RequestMapping("/qms/bus/test")
+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(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
+    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
+    	}});
+    	flowNodeList.add(bzr);
+    	
+
+    	ypbm.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 1014984817516902869L;
+
+		{
+    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(ypbm);
+    	
+
+//    	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/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/BusinessAssayProjectDataReqVO.java

@@ -65,4 +65,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/BusinessAssayTaskDataExtendRespVO.java

@@ -17,6 +17,12 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
+    @Schema(description = "子样配置id")
+    private Long configSubSampleId;
 
     @Schema(description = "样品名称")
     private String sampleName;
@@ -29,4 +35,10 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
+
+    private Integer  asmtIsReported;
+
+    private Integer  asmtIsRecheck;
+
+    private String  asmtReportedStatus;
 }

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

@@ -5,12 +5,31 @@ import lombok.Data;
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	
+	/** 方法id **/
 	private Long configAssayMethodId;
 	
+	/** 方法名称 **/
 	private String configAssayMethodName;
+	
+	/** 方法名称及类别 **/
+	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;
 
@@ -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;
@@ -89,4 +98,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

@@ -22,6 +22,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;
 
@@ -46,6 +49,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 +65,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;
@@ -88,5 +97,30 @@ 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 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;
@@ -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;

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

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -24,6 +25,9 @@ public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
 	/** 分析方法名称 **/
     private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     /** 分析方法对应的分析项目 **/
     private String configAssayMethodProjectShowNames;
     

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

@@ -34,6 +34,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "任务单分配人")
     private String taskAssignOperator;
 
+    @Schema(description = "任务单分配人ID", example = "14545")
+    private Long taskAssignOperatorId;
+
     @Schema(description = "任务单分配时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskAssignTime;
@@ -54,6 +57,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人", example = "17685")
+    private Long assayOperatorId;
+
     @Schema(description = "分析时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assayTime;
@@ -75,6 +81,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "上报人")
     private String reportOperator;
 
+    @Schema(description = "上报人ID", example = "7393")
+    private Long reportOperatorId;
+
     @Schema(description = "任务单完成时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskFinishTime;
@@ -91,10 +100,10 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -33,6 +33,9 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "任务单分配人")
     private String taskAssignOperator;
 
+    @Schema(description = "任务单分配人ID", example = "14545")
+    private Long taskAssignOperatorId;
+
     @Schema(description = "任务单分配时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskAssignTime;
@@ -53,6 +56,9 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人", example = "17685")
+    private Long assayOperatorId;
+
     @Schema(description = "分析时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assayTime;
@@ -74,6 +80,9 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "上报人")
     private String reportOperator;
 
+    @Schema(description = "上报人ID", example = "7393")
+    private Long reportOperatorId;
+
     @Schema(description = "任务单完成时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskFinishTime;
@@ -90,10 +99,10 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 检测任务分配业务 Response VO")
 @Data
@@ -42,6 +43,10 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("任务单分配人")
     private String taskAssignOperator;
 
+    @Schema(description = "任务单分配人ID", example = "14545")
+    @ExcelProperty("任务单分配人ID")
+    private Long taskAssignOperatorId;
+
     @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("任务单分配时间")
     private LocalDateTime taskAssignTime;
@@ -64,6 +69,10 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人", example = "17685")
+    @ExcelProperty("分析人")
+    private Long assayOperatorId;
+
     @Schema(description = "分析时间")
     @ExcelProperty("分析时间")
     private LocalDateTime assayTime;
@@ -84,6 +93,10 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("上报人")
     private String reportOperator;
 
+    @Schema(description = "上报人ID", example = "7393")
+    @ExcelProperty("上报人ID")
+    private Long reportOperatorId;
+
     @Schema(description = "任务单完成时间")
     @ExcelProperty("任务单完成时间")
     private LocalDateTime taskFinishTime;
@@ -104,12 +117,13 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
-    @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
+    @ExcelProperty("完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
-    @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @Dict(dicCode = "flow_status")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
+    @ExcelProperty("流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -40,9 +40,11 @@ public class BusinessAssayTaskSaveReqVO {
     private String taskSourceType;
 
     @Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "任务单分配人不能为空")
     private String taskAssignOperator;
 
+    @Schema(description = "任务单分配人ID", example = "14545")
+    private Long taskAssignOperatorId;
+
     @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "任务单分配时间不能为空")
     private LocalDateTime taskAssignTime;
@@ -64,6 +66,9 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人", example = "17685")
+    private Long assayOperatorId;
+
     @Schema(description = "分析时间")
     private LocalDateTime assayTime;
 
@@ -79,6 +84,9 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "上报人")
     private String reportOperator;
 
+    @Schema(description = "上报人ID", example = "7393")
+    private Long reportOperatorId;
+
     @Schema(description = "任务单完成时间")
     private LocalDateTime taskFinishTime;
 
@@ -94,10 +102,10 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

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

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

@@ -46,6 +46,9 @@ public class BusinessQCCoefficientDataPageReqVO extends PageParam {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "10644")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataPageReqVO extends PageParam {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "2683")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;

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

@@ -46,6 +46,9 @@ public class BusinessQCCoefficientDataReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "10644")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataReqVO {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "2683")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;

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

@@ -60,6 +60,9 @@ public class BusinessQCCoefficientDataRespVO {
     @ExcelProperty("分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "10644")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @ExcelProperty("分配任务时间")
     private LocalDateTime assignTaskTime;
@@ -76,6 +79,9 @@ public class BusinessQCCoefficientDataRespVO {
     @ExcelProperty("上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "2683")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;

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

@@ -50,6 +50,9 @@ public class BusinessQCCoefficientDataSaveReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "10644")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     private LocalDateTime assignTaskTime;
 
@@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataSaveReqVO {
     @Schema(description = "是否已上报")
     private Integer isReported;
 
+    @Schema(description = "上报人ID", example = "2683")
+    private Long reporterId;
+
     @Schema(description = "上报人")
     private String reporter;
 

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

@@ -46,6 +46,9 @@ public class BusinessQCManagementDataPageReqVO extends PageParam {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "6498")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +62,9 @@ public class BusinessQCManagementDataPageReqVO extends PageParam {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "17517")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;

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

@@ -46,6 +46,9 @@ public class BusinessQCManagementDataReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "6498")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] assignTaskTime;
@@ -59,6 +62,9 @@ public class BusinessQCManagementDataReqVO {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "17517")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;

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

@@ -60,6 +60,9 @@ public class BusinessQCManagementDataRespVO {
     @ExcelProperty("分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "6498")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     @ExcelProperty("分配任务时间")
     private LocalDateTime assignTaskTime;
@@ -76,6 +79,9 @@ public class BusinessQCManagementDataRespVO {
     @ExcelProperty("上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "17517")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;

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

@@ -51,6 +51,9 @@ public class BusinessQCManagementDataSaveReqVO {
     @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析人ID", example = "6498")
+    private Long assayOperatorId;
+
     @Schema(description = "分配任务时间")
     private LocalDateTime assignTaskTime;
 
@@ -63,6 +66,9 @@ public class BusinessQCManagementDataSaveReqVO {
     @Schema(description = "上报人")
     private String reporter;
 
+    @Schema(description = "上报人ID", example = "17517")
+    private Long reporterId;
+
     @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 

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

@@ -60,8 +60,8 @@ public class BusinessSampleDispatchDetailPageReqVO extends PageParam {
 
     //================================扩展字段=============================================
 
-    @Schema(description = "样品号")
-    private String sampleCode;
+    @Schema(description = "样品归库码")
+    private String sampleReturnCode;
 
     @Schema(description = "idsList")
     private List<Long> idList;

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

@@ -64,6 +64,12 @@ public class BusinessSampleDispatchPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+    @Schema(description = "仓库编码")
+    private String warehouseCode;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -65,6 +66,7 @@ public class BusinessSampleDispatchRespVO {
 
     @Schema(description = "流程审批状态", example = "1")
     @ExcelProperty("流程审批状态")
+    @Dict(dicCode = "flow_status")
     private String flowStatus;
 
     @Schema(description = "完成状态", example = "1")
@@ -83,6 +85,14 @@ public class BusinessSampleDispatchRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "仓库名称")
+    @ExcelProperty("仓库名称")
+    private String warehouseName;
+
+    @Schema(description = "仓库编码")
+    @ExcelProperty("仓库编码")
+    private String warehouseCode;
+
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -64,6 +64,12 @@ public class BusinessSampleDispatchSaveReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+    @Schema(description = "仓库编码")
+    private String warehouseCode;
+
     //=========================扩展字段=======================================
     @Schema(description = "新增子样id")
     List<Long> addSubSampleIds;

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

@@ -1,12 +1,27 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntrustDetailRespVO {
 	
+	/**
+	 * 样品类型key
+	 */
+    private String sampleTypeDictionaryBusinessKey;
+	
 	/** 样品大类名称 **/
 	private String baseSampleName;
 
@@ -16,6 +31,12 @@ public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntru
 	/** 打印标签 **/
     private String printTemplate;
     
+    @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应）
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "任务结束时间(yyyy-MM-dd HH:mm:ss)")
+    private LocalDateTime createTime;
+    
 	private List<BusinessSampleEntrustProjectExtendRespVO> sampleEntrustDetailProjectList;
 
 }

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

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

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

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

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

@@ -61,4 +61,19 @@ public class BusinessSampleHandoverDetailRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+
+    //==================================扩展字段==================================
+    @Schema(description = "原样品编号")
+    @ExcelProperty("原样品编号")
+    private String originalSampleCode;
+
+    @Schema(description = "库位编码")
+    @ExcelProperty("归库时间")
+    private String warehouseLocationCode;
+
+    @Schema(description = "归库时间")
+    @ExcelProperty("归库时间")
+    private LocalDateTime returnTime;
+
+
 }

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

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

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

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

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

@@ -13,45 +13,21 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
 
-    @Schema(description = "样品分样ID", example = "23188")
+    @Schema(description = "样品分样ID", example = "25701")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", example = "7653")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", example = "16271")
+    @Schema(description = "检测方法配置ID", example = "13131")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "1")
     private String taskType;
 
     @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
-
     @Schema(description = "是否已上报")
     private Integer isReported;
 
@@ -62,6 +38,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
@@ -69,7 +48,7 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "16999")
+    @Schema(description = "乐观锁", example = "13008")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,23 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubParentSampleAssessmentProjectExtendRespVO extends BusinessSubParentSampleAssessmentProjectRespVO {
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+    
+    @Schema(description = "分析方法")
+    private String configAssayMethodName;
+}

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

@@ -0,0 +1,78 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 班组判定检测项目数据业务分页 Request VO")
+@Data
+public class BusinessSubParentSampleAssessmentProjectPageReqVO extends PageParam {
+
+    @Schema(description = "样品分样ID", example = "23188")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", example = "7653")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", example = "16271")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] reportTime;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "16999")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,94 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 班组判定检测项目数据业务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessSubParentSampleAssessmentProjectRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
+    @ExcelProperty("样品分样ID")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
+    @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
+    @ExcelProperty("检测方法分析项目配置ID")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
+    @ExcelProperty("检测方法配置ID")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    @ExcelProperty("判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报时间")
+    private LocalDateTime reportTime;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,84 @@
+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")
+@Data
+public class BusinessSubParentSampleAssessmentProjectSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
+    private Long id;
+
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
+    @NotNull(message = "样品分样ID不能为空")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
+    @NotNull(message = "检测项目ID,字典表【T_DIC_PRJ】不能为空")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
+    @NotNull(message = "检测方法分析项目配置ID不能为空")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
+    @NotNull(message = "检测方法配置ID不能为空")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差不能为空")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "是否已上报不能为空")
+    private Integer isReported;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "上报人不能为空")
+    private String reporter;
+
+    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "上报时间不能为空")
+    private LocalDateTime reportTime;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -12,69 +12,46 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSubParentSampleAssessmentRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29068")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25701")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
-    @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
-    @ExcelProperty("检测方法分析项目配置ID")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13131")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    @ExcelProperty("小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    @ExcelProperty("判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
+    @ExcelProperty("判定状态,in_progress-进行中 normal-正常")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
-
-    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否已上报")
     @ExcelProperty("是否已上报")
     private Integer isReported;
 
-    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上报人")
     @ExcelProperty("上报人")
     private String reporter;
 
-    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    @ExcelProperty("结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
@@ -83,7 +60,7 @@ public class BusinessSubParentSampleAssessmentRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13008")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -11,70 +11,44 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessSubParentSampleAssessmentSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29068")
     private Long id;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23188")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25701")
     @NotNull(message = "样品分样ID不能为空")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17642")
-    @NotNull(message = "检测项目ID,字典表【T_DIC_PRJ】不能为空")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7653")
-    @NotNull(message = "检测方法分析项目配置ID不能为空")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16271")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13131")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差不能为空")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常", example = "1")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
-
-    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否已上报不能为空")
+    @Schema(description = "是否已上报")
     private Integer isReported;
 
-    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "上报人不能为空")
+    @Schema(description = "上报人")
     private String reporter;
 
-    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "上报时间不能为空")
+    @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16999")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13008")
     @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 

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

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

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

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

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

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

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

@@ -9,55 +9,37 @@ import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 子样判定数据业务分页 Request VO")
+@Schema(description = "管理后台 - 子样判定业务分页 Request VO")
 @Data
 public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
 
-	@Schema(description = "分样id")
+    @Schema(description = "样品分样ID", example = "29115")
     private Long businessSubParentSampleId;
-	
-    @Schema(description = "分样子样ID", example = "7025")
+
+    @Schema(description = "分样子样ID", example = "30256")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "21744")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", example = "14847")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", example = "8091")
+    @Schema(description = "检测方法配置ID", example = "16304")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "1")
     private String taskType;
 
     @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
+    @Schema(description = "是否复测,1-是，0-否")
+    private Integer isRecheck;
 
-    @Schema(description = "是否已上报")
+    @Schema(description = "是否已上报,1-是，0-否")
     private Integer isReported;
 
+    @Schema(description = "上报状态,初始状态-initial、待上报-pending_report、待判定-pending_assessment、已复检-re_inspected、已上报-reported", example = "1")
+    private String reportedStatus;
+
     @Schema(description = "上报人")
     private String reporter;
 
@@ -65,6 +47,9 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
@@ -72,7 +57,7 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "12836")
+    @Schema(description = "乐观锁", example = "6438")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,24 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubSampleAssessmentProjectExtendRespVO extends BusinessSubSampleAssessmentProjectRespVO {
+
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法名称")
+    private String configAssayMethodName;
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+}

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

@@ -0,0 +1,84 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 子样判定检测项目数据业务分页 Request VO")
+@Data
+public class BusinessSubSampleAssessmentProjectPageReqVO extends PageParam {
+
+	@Schema(description = "分样id")
+    private Long businessSubParentSampleId;
+	
+    @Schema(description = "分样子样ID", example = "7025")
+    private Long businessSubSampleId;
+
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "21744")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", example = "14847")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", example = "8091")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] reportTime;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "12836")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,103 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 子样判定检测项目数据业务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessSubSampleAssessmentProjectRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
+    @ExcelProperty("ID")
+    private Long id;
+    
+	@Schema(description = "分样id")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7025")
+    @ExcelProperty("分样子样ID")
+    private Long businessSubSampleId;
+
+    @Schema(description = "分样子样判定ID", example = "14560")
+    @ExcelProperty("分样子样判定ID")
+    private Long businessSubSampleAssessmentId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "21744")
+    @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14847")
+    @ExcelProperty("检测方法分析项目配置ID")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8091")
+    @ExcelProperty("检测方法配置ID")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    @ExcelProperty("判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报时间")
+    private LocalDateTime reportTime;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "12836")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,90 @@
+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")
+@Data
+public class BusinessSubSampleAssessmentProjectSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
+    private Long id;
+    
+	@Schema(description = "分样id")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7025")
+    @NotNull(message = "分样子样ID不能为空")
+    private Long businessSubSampleId;
+
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
+    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "21744")
+    @NotNull(message = "检测项目ID,字典表【T_DIC_PRJ】不能为空")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14847")
+    @NotNull(message = "检测方法分析项目配置ID不能为空")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8091")
+    @NotNull(message = "检测方法配置ID不能为空")
+    private Long configAssayMethodId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
+    private String assayType;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "判定值")
+    private String assessmentValue;
+
+    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    private String assessmentStatus;
+
+    @Schema(description = "方法检出下限值")
+    private String minimumLimitValue;
+
+    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "是否已上报不能为空")
+    private Integer isReported;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "上报人不能为空")
+    private String reporter;
+
+    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "上报时间不能为空")
+    private LocalDateTime reportTime;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "12836")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -7,41 +7,28 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 子样判定数据业务 Response VO")
+@Schema(description = "管理后台 - 子样判定业务 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class BusinessSubSampleAssessmentRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5736")
     @ExcelProperty("ID")
     private Long id;
-    
-	@Schema(description = "分样id")
+
+    @Schema(description = "样品分样ID", example = "29115")
+    @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7025")
+    @Schema(description = "分样子样ID", example = "30256")
     @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "21744")
-    @ExcelProperty("检测项目ID,字典表【T_DIC_PRJ】")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14847")
-    @ExcelProperty("检测方法分析项目配置ID")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8091")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16304")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
@@ -49,38 +36,33 @@ public class BusinessSubSampleAssessmentRespVO {
     @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    @ExcelProperty("小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    @ExcelProperty("判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
-    @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
+    @ExcelProperty("判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
+    @Schema(description = "是否复测,1-是，0-否")
+    @ExcelProperty("是否复测,1-是，0-否")
+    private Integer isRecheck;
 
-    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("是否已上报")
+    @Schema(description = "是否已上报,1-是，0-否")
+    @ExcelProperty("是否已上报,1-是，0-否")
     private Integer isReported;
 
-    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上报状态,初始状态-initial、待上报-pending_report、待判定-pending_assessment、已复检-re_inspected、已上报-reported", example = "1")
+    private String reportedStatus;
+
+    @Schema(description = "上报人")
     @ExcelProperty("上报人")
     private String reporter;
 
-    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
+    @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
@@ -88,7 +70,7 @@ public class BusinessSubSampleAssessmentRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "12836")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -7,39 +7,24 @@ import jakarta.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 子样判定数据业务新增/修改 Request VO")
+@Schema(description = "管理后台 - 子样判定业务新增/修改 Request VO")
 @Data
 public class BusinessSubSampleAssessmentSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5736")
     private Long id;
-    
-	@Schema(description = "分样id")
+
+    @Schema(description = "样品分样ID", example = "29115")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7025")
-    @NotNull(message = "分样子样ID不能为空")
+    @Schema(description = "分样子样ID", example = "30256")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "21744")
-    @NotNull(message = "检测项目ID,字典表【T_DIC_PRJ】不能为空")
-    private Long dictionaryProjectId;
-
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14847")
-    @NotNull(message = "检测方法分析项目配置ID不能为空")
-    private Long configAssayMethodProjectId;
-
-    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8091")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16304")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
-    private String usage;
-
-    @Schema(description = "符号,=、>、<、等")
-    private String symbol;
-
-    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
     private String taskType;
 
@@ -47,38 +32,32 @@ public class BusinessSubSampleAssessmentSaveReqVO {
     @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
     private String assayType;
 
-    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
-    private String dataType;
-
-    @Schema(description = "小数位")
-    private Integer decimalPosition;
-
-    @Schema(description = "判定值")
-    private String assessmentValue;
-
-    @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1")
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
 
-    @Schema(description = "方法检出下限值")
-    private String minimumLimitValue;
+    @Schema(description = "是否复测,1-是，0-否")
+    private Integer isRecheck;
 
-    @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否已上报不能为空")
+    @Schema(description = "是否已上报,1-是，0-否")
     private Integer isReported;
 
-    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "上报人不能为空")
+    @Schema(description = "上报状态,初始状态-initial、待上报-pending_report、待判定-pending_assessment、已复检-re_inspected、已上报-reported", example = "1")
+    private String reportedStatus;
+
+    @Schema(description = "上报人")
     private String reporter;
 
-    @Schema(description = "上报时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "上报时间不能为空")
+    @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
+    @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "12836")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
+    @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -1,9 +1,15 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
 import cn.hutool.core.collection.CollUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -57,12 +63,30 @@ public class BusinessSubSampleExtendRespVO extends BusinessSubSampleRespVO {
 	
 	@Schema(description = "分析部门名称")
     private String assayDepartmentName;
+	
+	@Schema(description = "是否已送样")
+	private Integer isSendSample;
 
     @Schema(description = "是否打印")
     private Integer isPrint;
 
     @Schema(description = "样品标签打印模版")
     private String printTemplate;
+    
+    @Schema(description = "样品标签打印份数")
+    private Integer codePrintQuantity;
+	
+    @Schema(description = "收样人")
+    private String sampleReceiver;
+    
+    @Schema(description = "分析项目")
+    private String assayProject;
+
+    @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应）
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "收样时间")
+    private LocalDateTime sampleReceiveTime;
 
 	@Schema(description = "库位编码")
 	private String warehouseLocationCode;

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

@@ -6,6 +6,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import java.math.BigDecimal;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -133,6 +134,8 @@ public class BusinessSubSamplePageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //=======================================扩展字段=======================================
+
 	@Schema(description = "分析部门id")
     private Long assayDepartmentId;
 	
@@ -142,8 +145,20 @@ public class BusinessSubSamplePageReqVO extends PageParam {
 	@Schema(description = "分析部门状态")
 	private String assayDepartmentStatus;
 	
-    //扩展字段
+	@Schema(description = "是否已送样")
+	private Integer isSendSample;
+	
+    @Schema(description = "样品流程节点KEY列表")
+    private List<String> sampleFlowNodeKeyList;
+    
     @Schema(description = "库位编码")
     private String warehouseLocationCode;
 
+    @Schema(description = "仓库编码")
+    private String warehouseCode;
+
+    //是否过滤已申请调拨的数据: 1-是， 其他值：否
+    @Schema(description = "是否过滤已申请调拨的数据")
+    private String hideDispatchData;
+
 }

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

@@ -134,4 +134,29 @@ public class BusinessSubSampleReqVO  {
     @Schema(description = "备注")
     private String remark;
 
+    //=======================================扩展字段=======================================
+
+	@Schema(description = "分析部门id")
+    private Long assayDepartmentId;
+	
+	@Schema(description = "分析部门名称")
+    private String assayDepartmentName;
+	
+	@Schema(description = "分析部门状态")
+	private String assayDepartmentStatus;
+	
+    @Schema(description = "样品流程节点KEY列表")
+    private List<String> sampleFlowNodeKeyList;
+    
+    @Schema(description = "库位编码")
+    private String warehouseLocationCode;
+
+    @Schema(description = "仓库编码")
+    private String warehouseCode;
+
+    //是否过滤已申请调拨的数据: 1-是， 其他值：否
+    @Schema(description = "是否过滤已申请调拨的数据")
+    private String hideDispatchData;
+
+
 }

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

@@ -1,5 +1,7 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
+
 import lombok.Data;
 
 @Data
@@ -22,4 +24,7 @@ public class NoReportSubParentSampleAssessmentRespVO {
     private String taskType;
     
     private String assayType;
+
+    
+    private LocalDateTime sampleReceiveTime;
 }

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

@@ -4,6 +4,7 @@ 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
@@ -20,6 +21,9 @@ public class RecheckSubSampleParentMethodRespVO {
 	private Long configAssayMethodId;
 	
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 	
 	private Long baseSampleId;
 	

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

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.dal.dataobject;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
     import java.time.LocalDateTime;
@@ -109,4 +110,20 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO {
     //样品创建时间
     @TableField(exist = false)
     private LocalDateTime baseSampleCreateTime;
+
+    //样品类型key
+    @TableField(exist = false)
+    private String sampleTypeKey;
+
+    //委托样品名称
+    @TableField(exist = false)
+    private String entrustSampleName;
+
+    //委托样品编号
+    @TableField(exist = false)
+    private String entrustSampleCode;
+
+    //委托明细排序
+    @TableField(exist = false)
+    private Integer entrustDetailSort;
 }

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

@@ -24,7 +24,6 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 public class BusinessAssayTaskDO extends BusinessBaseDO {
 
 
-
     /**
     * ID
     */
@@ -66,6 +65,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("TSK_ASN_OPTR")
     private String taskAssignOperator;
     /**
+    * 任务单分配人ID
+    */
+    @TableField("TSK_ASN_OPTR_ID")
+    private Long taskAssignOperatorId;
+    /**
     * 任务单分配时间
     */
     @TableField("TSK_ASN_TM")
@@ -76,8 +80,8 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("TSK_ASN_STS")
     private String taskAssignStatus;
     /**
-     * 任务单分配提交时间
-     */
+    * 任务单分配提交时间
+    */
     @TableField("TSK_ASN_SBM_TM")
     private LocalDateTime taskAssignSubmitTime;
     /**
@@ -96,6 +100,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("ASY_OPTR")
     private String assayOperator;
     /**
+    * 分析人
+    */
+    @TableField("ASY_OPTR_ID")
+    private Long assayOperatorId;
+    /**
     * 分析时间
     */
     @TableField("ASY_TM")
@@ -121,6 +130,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("RPT_OPTR")
     private String reportOperator;
     /**
+    * 上报人ID
+    */
+    @TableField("RPT_OPTR_ID")
+    private Long reportOperatorId;
+    /**
     * 任务单完成时间
     */
     @TableField("TSK_FIN_TM")
@@ -146,12 +160,12 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("DOC_SIG")
     private String documentSignature;
     /**
-    * 完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved
+    * 完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed
     */
     @TableField("FIN_STS")
     private String finishStatus;
     /**
-    * 流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved
+    * 流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed
     */
     @TableField("FLW_STS")
     private String flowStatus;

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

@@ -2,11 +2,7 @@ package com.zt.plat.module.qms.business.bus.dal.dataobject;
 
 import lombok.*;
 import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
@@ -60,6 +56,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField(value = "BSN_ASY_TSK_ID", updateStrategy = FieldStrategy.ALWAYS)
     private Long businessAssayTaskId;
     /**
+    * 子样判定ID
+    */
+    @TableField("BSN_SB_SMP_ASMT_ID")
+    private Long businessSubSampleAssessmentId;
+    /**
     * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
     */
     @TableField("TSK_TP")
@@ -90,6 +91,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField(value = "ASY_OPTR", updateStrategy = FieldStrategy.ALWAYS)
     private String assayOperator;
     /**
+    * 分析人ID
+    */
+    @TableField(value = "ASY_OPTR_ID", updateStrategy = FieldStrategy.ALWAYS)
+    private Long assayOperatorId;
+    /**
     * 分配任务时间
     */
     @TableField(value = "ASN_TSK_TM", updateStrategy = FieldStrategy.ALWAYS)
@@ -110,6 +116,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField("RPTR")
     private String reporter;
     /**
+    * 上报人ID
+    */
+    @TableField("RPTR_ID")
+    private Long reporterId;
+    /**
     * 上报时间
     */
     @TableField("RPT_TM")
@@ -130,7 +141,7 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO {
     @TableField("SMP_FLW_NDE_TM")
     private LocalDateTime sampleFlowNodeTime;
     /**
-    * 分析次数,复检的累加次数
+    * 分析次数,值为0为分析，大于0为第几次复检
     */
     @TableField("ANL_CNT")
     private Integer analysisCount;

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

@@ -89,6 +89,11 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO {
     @TableField("ASY_OPTR")
     private String assayOperator;
     /**
+    * 分析人ID
+    */
+    @TableField("ASY_OPTR_ID")
+    private Long assayOperatorId;
+    /**
     * 分配任务时间
     */
     @TableField("ASN_TSK_TM")
@@ -109,6 +114,11 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO {
     @TableField("RPTR")
     private String reporter;
     /**
+    * 上报人ID
+    */
+    @TableField("RPTR_ID")
+    private Long reporterId;
+    /**
     * 上报时间
     */
     @TableField("RPT_TM")
@@ -129,4 +139,5 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO {
     @TableField("RMK")
     private String remark;
 
+
 }

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

@@ -89,6 +89,11 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO {
     @TableField("ASY_OPTR")
     private String assayOperator;
     /**
+    * 分析人ID
+    */
+    @TableField("ASY_OPTR_ID")
+    private Long assayOperatorId;
+    /**
     * 分配任务时间
     */
     @TableField("ASN_TSK_TM")
@@ -109,6 +114,11 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO {
     @TableField("RPTR")
     private String reporter;
     /**
+    * 上报人ID
+    */
+    @TableField("RPTR_ID")
+    private Long reporterId;
+    /**
     * 上报时间
     */
     @TableField("RPT_TM")
@@ -128,5 +138,4 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO {
     */
     @TableField("RMK")
     private String remark;
-
 }

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

@@ -119,4 +119,11 @@ public class BusinessSampleDispatchDO extends BusinessBaseDO {
     @TableField("RMK")
     private String remark;
 
+    //仓库编码
+    @TableField("WRH_CD")
+    private String warehouseCode;
+
+    //仓库名称
+    @TableField("WRH_NAME")
+    private String warehouseName;
 }

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

@@ -38,31 +38,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
     @TableField("BSN_SB_PRN_SMP_ID")
     private Long businessSubParentSampleId;
     /**
-    * 检测项目ID,字典表【T_DIC_PRJ】
-    */
-    @TableField("DIC_PRJ_ID")
-    private Long dictionaryProjectId;
-    /**
-    * 检测方法分析项目配置ID
-    */
-    @TableField("CFG_ASY_MTHD_PRJ_ID")
-    private Long configAssayMethodProjectId;
-    /**
     * 检测方法配置ID
     */
     @TableField("CFG_ASY_MTHD_ID")
     private Long configAssayMethodId;
     /**
-    * 用途,ingredient-配料、report-报出、ingredient_report-配料及报出
-    */
-    @TableField("USG")
-    private String usage;
-    /**
-    * 符号,=、>、<、等
-    */
-    @TableField("SMB")
-    private String symbol;
-    /**
     * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
     */
     @TableField("TSK_TP")
@@ -73,31 +53,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
     @TableField("ASY_TP")
     private String assayType;
     /**
-    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
-    */
-    @TableField("DAT_TP")
-    private String dataType;
-    /**
-    * 小数位
-    */
-    @TableField("DEC_POS")
-    private Integer decimalPosition;
-    /**
-    * 判定值
-    */
-    @TableField("ASMT_VAL")
-    private String assessmentValue;
-    /**
-    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    * 判定状态,in_progress-进行中 normal-正常
     */
     @TableField("ASMT_STS")
     private String assessmentStatus;
     /**
-    * 方法检出下限值
-    */
-    @TableField("MIN_LIM_VAL")
-    private String minimumLimitValue;
-    /**
     * 是否已上报
     */
     @TableField("IS_RPOD")
@@ -113,6 +73,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
     @TableField("RPT_TM")
     private LocalDateTime reportTime;
     /**
+    * 结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改
+    */
+    @TableField("RSLT_TMT_WY")
+    private String resultTreatmentWay;
+    /**
     * 所属部门
     */
     @TableField("SYS_DEPT_CD")

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

@@ -0,0 +1,136 @@
+package com.zt.plat.module.qms.business.bus.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 班组判定检测项目数据业务 DO
+*
+* @author 后台管理
+*/
+@TableName("t_bsn_sb_prn_smp_asmt_prj")
+@KeySequence("t_bsn_sb_prn_smp_asmt_prj_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class BusinessSubParentSampleAssessmentProjectDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 样品分样ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ID")
+    private Long businessSubParentSampleId;
+    /**
+    * 班组判定数据业务ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ASMT_ID")
+    private Long businessSubParentSampleAssessmentId;
+    /**
+    * 检测项目ID,字典表【T_DIC_PRJ】
+    */
+    @TableField("DIC_PRJ_ID")
+    private Long dictionaryProjectId;
+    /**
+    * 检测方法分析项目配置ID
+    */
+    @TableField("CFG_ASY_MTHD_PRJ_ID")
+    private Long configAssayMethodProjectId;
+    /**
+    * 检测方法配置ID
+    */
+    @TableField("CFG_ASY_MTHD_ID")
+    private Long configAssayMethodId;
+    /**
+    * 用途,ingredient-配料、report-报出、ingredient_report-配料及报出
+    */
+    @TableField("USG")
+    private String usage;
+    /**
+    * 符号,=、>、<、等
+    */
+    @TableField("SMB")
+    private String symbol;
+    /**
+    * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
+    */
+    @TableField("TSK_TP")
+    private String taskType;
+    /**
+    * 分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...
+    */
+    @TableField("ASY_TP")
+    private String assayType;
+    /**
+    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
+    */
+    @TableField("DAT_TP")
+    private String dataType;
+    /**
+    * 小数位
+    */
+    @TableField("DEC_POS")
+    private Integer decimalPosition;
+    /**
+    * 判定值
+    */
+    @TableField("ASMT_VAL")
+    private String assessmentValue;
+    /**
+    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    */
+    @TableField("ASMT_STS")
+    private String assessmentStatus;
+    /**
+    * 方法检出下限值
+    */
+    @TableField("MIN_LIM_VAL")
+    private String minimumLimitValue;
+    /**
+    * 是否已上报
+    */
+    @TableField("IS_RPOD")
+    private Integer isReported;
+    /**
+    * 上报人
+    */
+    @TableField("RPTR")
+    private String reporter;
+    /**
+    * 上报时间
+    */
+    @TableField("RPT_TM")
+    private LocalDateTime reportTime;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 乐观锁
+    */
+    @TableField("UPD_CNT")
+    private Integer updateCount;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

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

@@ -63,6 +63,11 @@ public class BusinessSubSampleAnalysisGroupDO extends BusinessBaseDO {
     @TableField("SMP_STS")
     private String sampleStatus;
     /**
+    * 是否送样
+    */
+    @TableField("IS_SND")
+    private Integer isSend;
+    /**
     * 收样人
     */
     @TableField("SMP_RCVR")

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

@@ -2,13 +2,11 @@ package com.zt.plat.module.qms.business.bus.dal.dataobject;
 
 import lombok.*;
 import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
-* 子样判定数据业务 DO
+* 子样判定业务 DO
 *
 * @author 后台管理
 */
@@ -33,6 +31,11 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
+    * 样品主样ID
+    */
+    @TableField("BSN_BSE_SMP_ID")
+    private Long businessBaseSampleId;
+    /**
     * 样品分样ID
     */
     @TableField("BSN_SB_PRN_SMP_ID")
@@ -43,31 +46,16 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     @TableField("BSN_SB_SMP_ID")
     private Long businessSubSampleId;
     /**
-    * 检测项目ID,字典表【T_DIC_PRJ】
+    * 班组判定数据业务ID
     */
-    @TableField("DIC_PRJ_ID")
-    private Long dictionaryProjectId;
-    /**
-    * 检测方法分析项目配置ID
-    */
-    @TableField("CFG_ASY_MTHD_PRJ_ID")
-    private Long configAssayMethodProjectId;
+    @TableField("BSN_SB_PRN_SMP_ASMT_ID")
+    private Long businessSubParentSampleAssessmentId;
     /**
     * 检测方法配置ID
     */
     @TableField("CFG_ASY_MTHD_ID")
     private Long configAssayMethodId;
     /**
-    * 用途,ingredient-配料、report-报出、ingredient_report-配料及报出
-    */
-    @TableField("USG")
-    private String usage;
-    /**
-    * 符号,=、>、<、等
-    */
-    @TableField("SMB")
-    private String symbol;
-    /**
     * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
     */
     @TableField("TSK_TP")
@@ -78,36 +66,26 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     @TableField("ASY_TP")
     private String assayType;
     /**
-    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
-    */
-    @TableField("DAT_TP")
-    private String dataType;
-    /**
-    * 小数位
-    */
-    @TableField("DEC_POS")
-    private Integer decimalPosition;
-    /**
-    * 判定值
-    */
-    @TableField(value = "ASMT_VAL", updateStrategy = FieldStrategy.ALWAYS)
-    private String assessmentValue;
-    /**
-    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    * 判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差
     */
     @TableField("ASMT_STS")
     private String assessmentStatus;
     /**
-    * 方法检出下限值
+    * 是否复测,1-是，0-否
     */
-    @TableField("MIN_LIM_VAL")
-    private String minimumLimitValue;
+    @TableField("IS_RCHK")
+    private Integer isRecheck;
     /**
-    * 是否已上报
+    * 是否已上报,1-是，0-否
     */
     @TableField("IS_RPOD")
     private Integer isReported;
     /**
+    * 上报状态,初始状态-initial、待上报-pending_report、待判定-pending_assessment、已复检-re_inspected、已上报-reported
+    */
+    @TableField("RPOD_STS")
+    private String reportedStatus;
+    /**
     * 上报人
     */
     @TableField("RPTR")
@@ -118,6 +96,11 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
     @TableField("RPT_TM")
     private LocalDateTime reportTime;
     /**
+    * 结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改
+    */
+    @TableField("RSLT_TMT_WY")
+    private String resultTreatmentWay;
+    /**
     * 所属部门
     */
     @TableField("SYS_DEPT_CD")

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

@@ -0,0 +1,141 @@
+package com.zt.plat.module.qms.business.bus.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 子样判定检测项目数据业务 DO
+*
+* @author 后台管理
+*/
+@TableName("t_bsn_sb_smp_asmt_prj")
+@KeySequence("t_bsn_sb_smp_asmt_prj_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class BusinessSubSampleAssessmentProjectDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 样品分样ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ID")
+    private Long businessSubParentSampleId;
+    /**
+    * 分样子样ID
+    */
+    @TableField("BSN_SB_SMP_ID")
+    private Long businessSubSampleId;
+    /**
+    * 分样子样判定ID
+    */
+    @TableField("BSN_SB_SMP_ASMT_ID")
+    private Long businessSubSampleAssessmentId;
+    /**
+    * 检测项目ID,字典表【T_DIC_PRJ】
+    */
+    @TableField("DIC_PRJ_ID")
+    private Long dictionaryProjectId;
+    /**
+    * 检测方法分析项目配置ID
+    */
+    @TableField("CFG_ASY_MTHD_PRJ_ID")
+    private Long configAssayMethodProjectId;
+    /**
+    * 检测方法配置ID
+    */
+    @TableField("CFG_ASY_MTHD_ID")
+    private Long configAssayMethodId;
+    /**
+    * 用途,ingredient-配料、report-报出、ingredient_report-配料及报出
+    */
+    @TableField("USG")
+    private String usage;
+    /**
+    * 符号,=、>、<、等
+    */
+    @TableField("SMB")
+    private String symbol;
+    /**
+    * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
+    */
+    @TableField("TSK_TP")
+    private String taskType;
+    /**
+    * 分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...
+    */
+    @TableField("ASY_TP")
+    private String assayType;
+    /**
+    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
+    */
+    @TableField("DAT_TP")
+    private String dataType;
+    /**
+    * 小数位
+    */
+    @TableField("DEC_POS")
+    private Integer decimalPosition;
+    /**
+    * 判定值
+    */
+    @TableField(value = "ASMT_VAL", updateStrategy = FieldStrategy.ALWAYS)
+    private String assessmentValue;
+    /**
+    * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    */
+    @TableField("ASMT_STS")
+    private String assessmentStatus;
+    /**
+    * 方法检出下限值
+    */
+    @TableField("MIN_LIM_VAL")
+    private String minimumLimitValue;
+    /**
+    * 是否已上报
+    */
+    @TableField("IS_RPOD")
+    private Integer isReported;
+    /**
+    * 上报人
+    */
+    @TableField("RPTR")
+    private String reporter;
+    /**
+    * 上报时间
+    */
+    @TableField("RPT_TM")
+    private LocalDateTime reportTime;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 乐观锁
+    */
+    @TableField("UPD_CNT")
+    private Integer updateCount;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.java

@@ -10,8 +10,10 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterD
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO;
-import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
 import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,21 +29,20 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
 	default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessAssayParameterDataReqVO reqVO) {
 		return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessAssayParameterDataDO>()
 				.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId)
-				.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessAssayParameterDataDO::getDictionaryParameterId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectParameterDO::getDictionaryBusinessId)
 				.selectAs(BusinessAssayParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
-				.selectAs(BusinessAssayParameterDataDO::getDictionaryParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
-				.selectAs(DictionaryParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
-				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
-				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getShowName)
-				.selectAs(DictionaryParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
 				.selectAs(BusinessAssayParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessAssayParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessAssayParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
-				.selectAs(DictionaryParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
-				.selectAs(ConfigAssayMethodProjectParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
 				.selectAs("'parameter'", BusinessAssayProjectAndParameterRespVO::getType)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getDictionaryBusinessId, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessId)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
@@ -83,5 +84,25 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
     	return selectList(new LambdaQueryWrapperX<BusinessAssayParameterDataDO>()
     			.in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIds));
     }
+    
+    default List<BusinessAssayParameterDataExtendRespVO> selectExtendByBusinessAssayProjectDataIds(List<Long> businessAssayProjectDataIds) {
+    	return selectJoinList(BusinessAssayParameterDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayParameterDataDO>()
+    			.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId)
+    			.selectAll(BusinessAssayParameterDataDO.class)
+    			.selectAs(ConfigAssayMethodProjectParameterDO::getParameterName, BusinessAssayParameterDataExtendRespVO::getParameterName)
+    			.selectAs(ConfigAssayMethodProjectParameterDO::getKey, BusinessAssayParameterDataExtendRespVO::getParameterKey)
+    			.in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIds));
+    }
+    
+    default BusinessAssayParameterDataDO selectByBusinessAssayTaskDataIdAndProjectSimpleNameAndParameterKey(Long businessAssayTaskDataId, String projectSimpleName, String parameterKey) {
+    	return selectJoinOne(BusinessAssayParameterDataDO.class, new MPJLambdaWrapperX<BusinessAssayParameterDataDO>()
+    			.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId)
+    			.leftJoin(BusinessAssayProjectDataDO.class, BusinessAssayProjectDataDO::getId, BusinessAssayParameterDataDO::getBusinessAssayProjectDataId)
+    			.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessAssayProjectDataDO::getConfigAssayMethodProjectId)
+    			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
+    			.eq(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataId)
+    			.eq(DictionaryProjectDO::getSimpleName, projectSimpleName)
+    			.eq(ConfigAssayMethodProjectParameterDO::getKey, parameterKey));
+    }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.java

@@ -32,7 +32,7 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectDO::getDictionaryBusinessId)
 				.selectAs(BusinessAssayProjectDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
-				.selectAs(BusinessAssayProjectDataDO::getDictionaryProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				//.selectAs(DictionaryProjectDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -49,6 +49,7 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
 				.selectAs(DictionaryBusinessDO::getName, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessName)
                 .eqIfPresent(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .inIfPresent(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataIdList())
                 .eqIfPresent(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
                 .eqIfPresent(BusinessAssayProjectDataDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
                 .eqIfPresent(BusinessAssayProjectDataDO::getUsage, reqVO.getUsage())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java

@@ -2,7 +2,6 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 
 import java.util.*;
 
-import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl.On;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.zt.plat.framework.common.pojo.PageResult;
@@ -25,7 +24,6 @@ import cn.hutool.core.util.ObjectUtil;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,75 +36,209 @@ import org.apache.ibatis.annotations.Param;
 public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTaskDataDO> {
 	
 	default List<BusinessAssayTaskDataExtendRespVO> selectList(BusinessAssayTaskDataReqVO reqVO) {
-		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
-        		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
-        		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAll(BusinessAssayTaskDataDO.class)
-        		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
-        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
-        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
-        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .likeIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported())
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount())
-                .eqIfPresent(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount())
-                .eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessAssayTaskDataDO::getId));
+		MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+		.leftJoin(BusinessSubSampleAnalysisGroupDO.class, on -> on
+				.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
+		.selectAll(BusinessAssayTaskDataDO.class)
+		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
+		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId);
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessBaseSampleId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubParentSampleId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId());			
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessAssayTaskId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleAssessmentId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getTaskType())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getAssayType())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayProject())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentName())) {
+    		mpjLambdaWrapper.like(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperator())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperatorId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()[0], reqVO.getAssignTaskTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsAssignTasked())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsReported())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporter())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporterId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReportTime()) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime()[0], reqVO.getReportTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getConfigSampleFlowId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeKey())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSystemDepartmentCode())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode());
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getCreateTime()) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[1])) {
+        	mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getRemark())) {
+        	mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark());
+		}
+        
+        if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
+    		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
+		}
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
     default PageResult<BusinessAssayTaskDataExtendRespVO> selectPage(BusinessAssayTaskDataPageReqVO reqVO) {
-        return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
-        		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
-        		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAll(BusinessAssayTaskDataDO.class)
-        		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
-        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
-        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
-        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .likeIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported())
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
-                .eqIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount())
-                .eqIfPresent(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount())
-                .eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-                .betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessAssayTaskDataDO::getId));
+    	MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+		.leftJoin(BusinessSubSampleAnalysisGroupDO.class, on -> on
+				.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
+		.selectAll(BusinessAssayTaskDataDO.class)
+		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
+		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId);
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessBaseSampleId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubParentSampleId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId());			
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessAssayTaskId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleAssessmentId())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getTaskType())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType());
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getAssayType())) {
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayProject())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentName())) {
+    		mpjLambdaWrapper.like(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperator())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperatorId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()[0], reqVO.getAssignTaskTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsAssignTasked())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsReported())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporter())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporterId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReportTime()) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime()[0], reqVO.getReportTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getConfigSampleFlowId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeKey())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSystemDepartmentCode())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode());
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getCreateTime()) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[1])) {
+        	mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getRemark())) {
+        	mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark());
+		}
+        
+        if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
+    		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
+		}
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
+        return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
 
@@ -131,19 +263,49 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
 	}
 	
+	default List<BusinessAssayTaskDataExtendRespVO> selectBySampleAssayCodesAndConfigAssayMethodId(List<String> sampleAssayCodes, Long configAssayMethodId) {
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+        		.selectAll(BusinessAssayTaskDataDO.class)
+        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.in(BusinessSubSampleDO::getSampleAssayCode, sampleAssayCodes)
+        		.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
+        		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
+	}
+	
+	default List<BusinessAssayTaskDataExtendRespVO> selectBySampleAssayCodesAndConfigAssayMethodDictionaryBusinessKey(List<String> sampleAssayCodes, String configAssayMethodDictionaryBusinessKey) {
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+        		.selectAll(BusinessAssayTaskDataDO.class)
+        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.in(BusinessSubSampleDO::getSampleAssayCode, sampleAssayCodes)
+        		.eq(ConfigAssayMethodDO::getDictionaryBusinessKey, configAssayMethodDictionaryBusinessKey)
+        		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
+	}
+	
 	default List<BusinessAssayTaskDataExtendRespVO> selectResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
 		MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapper<BusinessAssayTaskDataDO>()
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
         		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+        		.leftJoin(BusinessSubSampleAssessmentDO.class, BusinessSubSampleAssessmentDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId)
         		.leftJoin(BusinessSubSampleAnalysisGroupDO.class, on -> on
         				.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
         				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
         		.selectAll(BusinessAssayTaskDataDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
         		.selectAs(ConfigAssayMethodDO::getConfigReportTemplateKey, BusinessAssayTaskDataExtendRespVO::getConfigReportTemplateKey)
         		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
         		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
         		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.selectAs(BusinessSubSampleAssessmentDO::getIsRecheck, BusinessAssayTaskDataExtendRespVO::getAsmtIsRecheck)
+        		.selectAs(BusinessSubSampleAssessmentDO::getIsReported, BusinessAssayTaskDataExtendRespVO::getAsmtIsReported)
+        		.selectAs(BusinessSubSampleAssessmentDO::getReportedStatus, BusinessAssayTaskDataExtendRespVO::getAsmtReportedStatus)
         		.selectAs(BusinessSubSampleAnalysisGroupDO::getSampleReceiver, BusinessAssayTaskDataExtendRespVO::getSampleReceiver)
         		.selectAs(BusinessSubSampleAnalysisGroupDO::getSampleReceiveTime, BusinessAssayTaskDataExtendRespVO::getSampleReceiveTime);
 		if (ObjectUtil.isNotEmpty(reqVO.getBusinessBaseSampleId())) {
@@ -155,46 +317,23 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
 			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
 		}
-		mpjLambdaWrapper.ne(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "已收样");
+		if (ObjectUtil.isNotEmpty(reqVO.getAsmtReportedStatus())) {
+			mpjLambdaWrapper.eq(BusinessSubSampleAssessmentDO::getReportedStatus, reqVO.getAsmtReportedStatus());
+			switch(reqVO.getAsmtReportedStatus()) {
+				case QmsCommonConstant.ASMT_INITIAL:
+				case QmsCommonConstant.ASMT_PENDING_REPORT:
+				case QmsCommonConstant.ASMT_PENDING_ASSESSMENT:
+					mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsAssignTasked, QmsCommonConstant.YES);//已任务指派
+					break;
+			}
+		}
+		if (ObjectUtil.isNotEmpty(reqVO.getSampleReceiveTime()) && reqVO.getSampleReceiveTime().length == 2) {
+			mpjLambdaWrapper.between(BusinessSubSampleAnalysisGroupDO::getSampleReceiveTime, reqVO.getSampleReceiveTime()[0], reqVO.getSampleReceiveTime()[1]);
+		}
+		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "已收样");//已收样
 		mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId).orderByAsc(BusinessAssayTaskDataDO::getReportTime);
 		
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
-		
-		
-//		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
-//        		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
-//        		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-//        		.selectAll(BusinessAssayTaskDataDO.class)
-//        		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
-//        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
-//        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
-//        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
-//                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-//                .likeIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator())
-//                .betweenIfPresent(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter())
-//                .betweenIfPresent(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
-//                .betweenIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-//                .betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
-//                .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
-//                .orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId)
-//                .orderByAsc(BusinessAssayTaskDataDO::getReportTime));
     }
 	
 	/**
@@ -230,6 +369,20 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
 				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId));
 	}
+
+	
+	/**
+	 * 根据子样及分析部门查询分析任务
+	 * @param businessSubSampleId 子样id
+	 * @param assayDepartmentId 分析部门id
+	 * @return
+	 */
+	default List<BusinessAssayTaskDataDO> selectByBusinessSubSampleIdAndAssayDepartmentId(Long businessSubSampleId, Long assayDepartmentId) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
+				.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, assayDepartmentId));
+	}
+	
 	
 	/**
 	 * 根据子样查询分析任务

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java

@@ -49,7 +49,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
     
     default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
@@ -80,7 +80,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-    			.orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
 
 	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {