代码合并、调整报名；编译通过

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.enums;
 
+
 import com.zt.plat.framework.common.exception.ErrorCode;
 
 /**
@@ -36,6 +37,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表模版配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目配置不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_RANGE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目区间不存在");
 	ErrorCode CONFIG_REPORT_FIELD_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表字段配置不存在");
 	ErrorCode CONFIG_STANDARD_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样类型配置不存在");
 	ErrorCode CONFIG_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样检测项目配置不存在");
@@ -58,6 +60,8 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_ASSAY_STANDARD_DETAIL_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测标准明细不存在");
 	ErrorCode MATERIAL_ASSAY_STANDARD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测标准不存在");
 	ErrorCode MATERIAL_ASSAY_STANDARD_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测标准方法不存在");
+	ErrorCode MATERIAL_ASSAY_STANDARD_FORECAST_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "物料检测标准来样品位配置不存在");
+	
 	ErrorCode CONFIG_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品交接配置不存在");
 
 	//dictionary
@@ -84,7 +88,18 @@ public interface ErrorCodeConstants {
 	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, "检测任务分配业务不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测任务分配明细不存在");
-
+	ErrorCode BUSINESS_SUB_SAMPLE_ANALYSIS_GROUP_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样分析班组业务不存在");
+	
+	ErrorCode BUSINESS_ASSAY_REPORT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报表数据业务不存在");
+	
+	ErrorCode BUSINESS_QUALITY_CONTROL_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目业务不存在");
+	ErrorCode BUSINESS_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样业务不存在");
+	ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样检测项目业务不存在");
+	
+	ErrorCode BUSINESS_TEAM_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
+	
+	ErrorCode BUSINESS_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
+	ErrorCode BUSINESS_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
 
 	/*=================================resource  资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
 	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");

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

@@ -0,0 +1,83 @@
+package com.zt.plat.module.qms.enums;
+
+/**
+ * <b>QmsCommonConstant</b>
+ * <p>
+ * 更新历史：
+ * <pre> 版本         更新时间            更新者        更新内容<hr/>
+ * V1.0      2025年9月24日          wxr         Add</pre>
+ * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
+ * </p>
+ * @author 王兴荣<wxr@wangxingrong.com>
+ * @version V1.0 
+ * @since 2025年9月24日
+ */
+public interface QmsCommonConstant {
+
+	/** 是 **/
+    Integer YES = 1;
+    
+    /** 否 **/
+    Integer NO = 0;
+    
+    /** 成功 **/
+    String SUCCESS = "success";
+    
+    /** 失败 **/
+    String FAILURE = "failure";
+    
+    /** 已失败 **/
+    String FAILED = "failed";
+    
+    /** 正常 **/
+    String NORMAL = "normal";
+    
+    /** 隔离 **/
+    String ISOLATION = "isolation";
+    
+    /** 进行中 **/
+    String IN_PROGRESS = "in_progress";
+    
+    /** 提交 **/
+    String SUBMIT = "submit";
+    
+    /** 已提交 **/
+    String SUBMITTED = "submitted";
+    
+    /** 未开始 **/
+    String NOT_START = "not_start";
+    
+    /** 待处理 **/
+    String PENDING = "pending";
+    
+    /** 退回 **/
+    String RETURN = "return";
+    
+    /** 已退回 **/
+    String RETURNED = "returned";
+    
+    /** 同意 **/
+    String APPROVE = "approve";
+    
+    /** 已同意 **/
+    String APPROVED = "approved";
+    
+    /** 驳回 **/
+    String REJECT = "reject";
+    
+    /** 已驳回 **/
+    String REJECTED = "rejected";
+    
+    /** 作废 **/
+    String VOID = "void";
+    
+    /** 已完成 **/
+    String COMPLETED = "completed";
+    
+    /** 委托登记 **/
+    String ENTRUST_REGISTRATION = "entrust_registration";
+    
+    /** 检验委托 **/
+    String ENTRUST_INSPECTION = "entrust_inspection";
+    
+}

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

@@ -189,11 +189,11 @@
         </dependency>
 
         <!--    zzjc.tio    -->
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>tech.zzjc.tio</groupId>-->
+            <groupId>tech.zzjc.tio</groupId>
-<!--            <artifactId>zzjc-tio-spring-boot-starter</artifactId>-->
+            <artifactId>zzjc-tio-spring-boot-starter</artifactId>
-<!--            <version>${zzjc.tio.version}</version>-->
+            <version>${zzjc.tio.version}</version>
-<!--        </dependency>-->
+        </dependency>
     </dependencies>
 
     <repositories>

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

@@ -1,16 +0,0 @@
-package com.zt.plat.module.qms;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * 项目的启动类
- */
-@SpringBootApplication
-public class QmsServerApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(QmsServerApplication.class, args);
-    }
-
-}

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.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.BusinessAssayReportDataPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayReportDataRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayReportDataSaveReqVO;
+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.BusinessAssayReportDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayReportDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 检测报表数据业务")
+@RestController
+@RequestMapping("/qms/business-assay-report-data")
+@Validated
+public class BusinessAssayReportDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessAssayReportDataService businessAssayReportDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建检测报表数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')")
+    public CommonResult<BusinessAssayReportDataRespVO> createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) {
+        return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新检测报表数据业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')")
+    public CommonResult<Boolean> updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) {
+        businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除检测报表数据业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayReportData(@RequestParam("id") Long id) {
+        businessAssayReportDataService.deleteBusinessAssayReportData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除检测报表数据业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) {
+        businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得检测报表数据业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
+    public CommonResult<BusinessAssayReportDataRespVO> getBusinessAssayReportData(@RequestParam("id") Long id) {
+        BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id);
+        return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得检测报表数据业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
+    public CommonResult<PageResult<BusinessAssayReportDataRespVO>> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) {
+        PageResult<BusinessAssayReportDataDO> pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出检测报表数据业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessAssayReportDataDO> list = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "检测报表数据业务.xls", "数据", BusinessAssayReportDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessAssayReportDataRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskExtendRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskSaveReqVO;
+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.BusinessAssayTaskDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 检测任务分配业务")
+@RestController
+@RequestMapping("/qms/business-assay-task")
+@Validated
+public class BusinessAssayTaskController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessAssayTaskService businessAssayTaskService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建检测任务分配业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')")
+    public CommonResult<BusinessAssayTaskRespVO> createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) {
+        return success(businessAssayTaskService.createBusinessAssayTask(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新检测任务分配业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')")
+    public CommonResult<Boolean> updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) {
+        businessAssayTaskService.updateBusinessAssayTask(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除检测任务分配业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTask(@RequestParam("id") Long id) {
+        businessAssayTaskService.deleteBusinessAssayTask(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除检测任务分配业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) {
+        businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得检测任务分配业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
+    public CommonResult<BusinessAssayTaskRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
+        BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
+        return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得检测任务分配业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
+    public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) {
+        PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出检测任务分配业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessAssayTaskExtendRespVO> list = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "检测任务分配业务.xls", "数据", BusinessAssayTaskRespVO.class,
+                        BeanUtils.toBean(list, BusinessAssayTaskRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +11,6 @@ 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.*;
@@ -85,11 +85,19 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
     @GetMapping("/getUnAssayTaskGroupList")
     @Operation(summary = "获得未指派的子样检测任务业务分组列表")
     @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
-    public CommonResult<?> getUnAssayTaskGroupList() {
+    public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
-    	List<Map<String, Object>> list = businessAssayTaskDataService.getUnAssayTaskGroupList();
+    	List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
 		return success(list);
 	}
 
+    @GetMapping("/getUnAuditTaskGroupList")
+    @Operation(summary = "获得未审核的子样检测任务业务分组列表")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
+    public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
+    	List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
+		return success(list);
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得子样检测任务业务列表")
     @PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.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.BusinessAssayTaskDetailPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailSaveReqVO;
+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.BusinessAssayTaskDetailDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDetailService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 检测任务分配明细")
+@RestController
+@RequestMapping("/qms/business-assay-task-detail")
+@Validated
+public class BusinessAssayTaskDetailController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessAssayTaskDetailService businessAssayTaskDetailService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建检测任务分配明细")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')")
+    public CommonResult<BusinessAssayTaskDetailRespVO> createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) {
+        return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新检测任务分配明细")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')")
+    public CommonResult<Boolean> updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) {
+        businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除检测任务分配明细")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) {
+        businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除检测任务分配明细")
+                @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) {
+        businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得检测任务分配明细")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    public CommonResult<BusinessAssayTaskDetailRespVO> getBusinessAssayTaskDetail(@RequestParam("id") Long id) {
+        BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id);
+        return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得检测任务分配明细分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
+        PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出检测任务分配明细 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessAssayTaskDetailDO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "检测任务分配明细.xls", "数据", BusinessAssayTaskDetailRespVO.class,
+                        BeanUtils.toBean(list, BusinessAssayTaskDetailRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSamplePageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

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

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

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

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

@@ -1,5 +1,9 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubExtendRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +14,6 @@ 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.*;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.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.BusinessQualityControlSampleProjectPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQualityControlSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQualityControlSampleProjectSaveReqVO;
+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.BusinessQualityControlSampleProjectDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQualityControlSampleProjectService;
+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-quality-control-sample-project")
+@Validated
+public class BusinessQualityControlSampleProjectController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQualityControlSampleProjectService businessQualityControlSampleProjectService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控样检测项目业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')")
+    public CommonResult<BusinessQualityControlSampleProjectRespVO> createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) {
+        return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控样检测项目业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')")
+    public CommonResult<Boolean> updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) {
+        businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控样检测项目业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
+    public CommonResult<Boolean> deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
+        businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控样检测项目业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
+    public CommonResult<Boolean> deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) {
+        businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控样检测项目业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
+    public CommonResult<BusinessQualityControlSampleProjectRespVO> getBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
+        BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id);
+        return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控样检测项目业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
+    public CommonResult<PageResult<BusinessQualityControlSampleProjectRespVO>> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) {
+        PageResult<BusinessQualityControlSampleProjectDO> pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控样检测项目业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQualityControlSampleProjectDO> list = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控样检测项目业务.xls", "数据", BusinessQualityControlSampleProjectRespVO.class,
+                        BeanUtils.toBean(list, BusinessQualityControlSampleProjectRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +11,6 @@ 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.*;
@@ -82,14 +82,21 @@ public class BusinessSampleEntrustDetailController implements BusinessController
         return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class));
     }
     
-    
+
+    @GetMapping("/list")
+    @Operation(summary = "获得委检登记样品明细列表")
+    @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
+    public CommonResult<List<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) {
+        List<BusinessSampleEntrustDetailExtendRespVO> listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO);
+        return success(listResult);
+    }
 
     @GetMapping("/page")
     @Operation(summary = "获得委检登记样品明细分页")
     @PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
-    public CommonResult<PageResult<BusinessSampleEntrustDetailRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
-        PageResult<BusinessSampleEntrustDetailDO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
+        PageResult<BusinessSampleEntrustDetailExtendRespVO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustDetailRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")
@@ -99,7 +106,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
     public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessSampleEntrustDetailDO> list = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO).getList();
+        List<BusinessSampleEntrustDetailExtendRespVO> list = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "委检登记样品明细.xls", "数据", BusinessSampleEntrustDetailRespVO.class,
                         BeanUtils.toBean(list, BusinessSampleEntrustDetailRespVO.class));

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

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

@@ -1,5 +1,9 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +14,6 @@ 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.*;

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.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.BusinessStandardSamplePageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+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.BusinessStandardSampleDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessStandardSampleService;
+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-standard-sample")
+@Validated
+public class BusinessStandardSampleController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessStandardSampleService businessStandardSampleService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建标准样业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')")
+    public CommonResult<BusinessStandardSampleRespVO> createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) {
+        return success(businessStandardSampleService.createBusinessStandardSample(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新标准样业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')")
+    public CommonResult<Boolean> updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) {
+        businessStandardSampleService.updateBusinessStandardSample(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除标准样业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
+    public CommonResult<Boolean> deleteBusinessStandardSample(@RequestParam("id") Long id) {
+        businessStandardSampleService.deleteBusinessStandardSample(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除标准样业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
+    public CommonResult<Boolean> deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) {
+        businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得标准样业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
+    public CommonResult<BusinessStandardSampleRespVO> getBusinessStandardSample(@RequestParam("id") Long id) {
+        BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id);
+        return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得标准样业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
+    public CommonResult<PageResult<BusinessStandardSampleRespVO>> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) {
+        PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出标准样业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessStandardSampleDO> list = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "标准样业务.xls", "数据", BusinessStandardSampleRespVO.class,
+                        BeanUtils.toBean(list, BusinessStandardSampleRespVO.class));
+    }
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.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.BusinessStandardSampleProjectPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleProjectSaveReqVO;
+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.BusinessStandardSampleProjectDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessStandardSampleProjectService;
+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-standard-sample-project")
+@Validated
+public class BusinessStandardSampleProjectController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessStandardSampleProjectService businessStandardSampleProjectService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建标准样检测项目业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')")
+    public CommonResult<BusinessStandardSampleProjectRespVO> createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) {
+        return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新标准样检测项目业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')")
+    public CommonResult<Boolean> updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) {
+        businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除标准样检测项目业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
+    public CommonResult<Boolean> deleteBusinessStandardSampleProject(@RequestParam("id") Long id) {
+        businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除标准样检测项目业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
+    public CommonResult<Boolean> deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) {
+        businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得标准样检测项目业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
+    public CommonResult<BusinessStandardSampleProjectRespVO> getBusinessStandardSampleProject(@RequestParam("id") Long id) {
+        BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id);
+        return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得标准样检测项目业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
+    public CommonResult<PageResult<BusinessStandardSampleProjectRespVO>> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) {
+        PageResult<BusinessStandardSampleProjectDO> pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出标准样检测项目业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessStandardSampleProjectDO> list = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "标准样检测项目业务.xls", "数据", BusinessStandardSampleProjectRespVO.class,
+                        BeanUtils.toBean(list, BusinessStandardSampleProjectRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,8 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSamplePageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ 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.*;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.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.BusinessSubSampleAnalysisGroupPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAnalysisGroupRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAnalysisGroupSaveReqVO;
+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.BusinessSubSampleAnalysisGroupDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAnalysisGroupService;
+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-analysis-group")
+@Validated
+public class BusinessSubSampleAnalysisGroupController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubSampleAnalysisGroupService businessSubSampleAnalysisGroupService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建子样分析班组业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')")
+    public CommonResult<BusinessSubSampleAnalysisGroupRespVO> createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) {
+        return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新子样分析班组业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')")
+    public CommonResult<Boolean> updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) {
+        businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除子样分析班组业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
+        businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除子样分析班组业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) {
+        businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得子样分析班组业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
+    public CommonResult<BusinessSubSampleAnalysisGroupRespVO> getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
+        BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id);
+        return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得子样分析班组业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
+    public CommonResult<PageResult<BusinessSubSampleAnalysisGroupRespVO>> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleAnalysisGroupDO> pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出子样分析班组业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubSampleAnalysisGroupDO> list = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "子样分析班组业务.xls", "数据", BusinessSubSampleAnalysisGroupRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubSampleAnalysisGroupRespVO.class));
+    }
+
+}

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

@@ -1,5 +1,8 @@
 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;
@@ -10,7 +13,6 @@ 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.*;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -10,7 +11,6 @@ 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.*;
@@ -26,7 +26,9 @@ 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.BusinessSubSampleDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDataService;
 import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
@@ -39,6 +41,9 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
 
     @Resource
     private BusinessSubSampleService businessSubSampleService;
+    
+    @Resource
+    private BusinessAssayTaskDataService businessAssayTaskDataService;
 
     @PostMapping("/create")
     @Operation(summary = "创建子样业务")
@@ -97,6 +102,22 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
         PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
         return success(pageResult);
     }
+
+    @GetMapping("/page-task")
+    @Operation(summary = "获得子样业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
+    public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
+        List<BusinessSubSampleExtendRespVO> list = pageResult.getList();
+        for (BusinessSubSampleExtendRespVO businessSubSampleExtendRespVO : list) {
+        	BusinessAssayTaskDataReqVO search = new BusinessAssayTaskDataReqVO();
+        	search.setBusinessSubSampleId(businessSubSampleExtendRespVO.getId());
+        	search.setIsAssignTasked(QmsCommonConstant.NO);
+        	List<BusinessAssayTaskDataExtendRespVO> businessAssayTaskDataList = businessAssayTaskDataService.getBusinessAssayTaskDataList(search);
+        	businessSubSampleExtendRespVO.setBusinessAssayTaskDataList(businessAssayTaskDataList);
+		}
+        return success(pageResult);
+    }
     
     @GetMapping("/getBySampleCodeAndFlowKey")
     @Operation(summary = "根据样品编号及样品流程节点key获取样品信息")

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

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

@@ -0,0 +1,36 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+/**
+ * 分析审核
+ */
+@Tag(name = "管理后台 - 样品分析")
+@RestController
+@RequestMapping("/qms/bus/sample/analysis-audit")
+@Validated
+public class SampleAnalysisAuditController {
+	
+	@Resource
+	private SampleAnalysisAuditService sampleAnalysisAuditService;
+
+	/**
+	 * 交叉审核
+	 * @return
+	 */
+	@PostMapping("/crossAudit")
+	public CommonResult<?> crossAudit(Long businessAssayTaskId, String auditStatus) {
+		sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
+		return success("成功");
+	}
+}

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

@@ -0,0 +1,49 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+/**
+ * 样品分析
+ */
+@Tag(name = "管理后台 - 样品分析")
+@RestController
+@RequestMapping("/qms/bus/sample/analysis")
+@Validated
+public class SampleAnalysisController {
+	
+	@Resource
+	private SampleAnalysisService sampleAnalysisService ;
+	
+	@GetMapping("/batchSampleAnalysisByTaskId")
+	public CommonResult<?> batchSampleAnalysisByTaskId(Long businessAssayTaskId) {
+		BusinessAssayTaskAnalysisSampleProjectRespVO businessAssayTaskAnalysisSampleProject = sampleAnalysisService.batchSampleAnalysisByTaskId(businessAssayTaskId);
+		return success(businessAssayTaskAnalysisSampleProject);
+	}
+	
+	@PostMapping("/saveBatchSampleAnalysis")
+	public CommonResult<?> saveBatchSampleAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleProjectRespVO vo) {
+		sampleAnalysisService.saveBatchSampleAnalysis(vo);
+		return success("成功");
+	}
+	
+	
+	@PostMapping("/submitSampleAnalysisByTaskId")
+	public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
+		sampleAnalysisService.submitSampleAnalysisByTaskId(businessAssayTaskId);
+		return success("成功");
+	}
+
+}

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

@@ -3,10 +3,8 @@ package com.zt.plat.module.qms.business.bus.controller.admin;
 import static com.zt.plat.framework.common.pojo.CommonResult.error;
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
-import java.time.LocalDateTime;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
-import java.util.ArrayList;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationSubmitReqVO;
-import java.util.List;
-
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,16 +14,12 @@ 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.JSON;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
-import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustDetail;
-import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustDetailProject;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustParam;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
 import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;
@@ -103,71 +97,4 @@ public class SampleEntrustController {
         return success(true);
     }
 
-    @PostMapping("/test")
-    public CommonResult<?> test() {
-    	
-    	Long tenantId = TenantContextHolder.getRequiredTenantId();
-    	
-    	SampleEntrustDetail sampleEntrustDetail_1 = new SampleEntrustDetail();
-    	sampleEntrustDetail_1.setBaseSampleId(1000000000000000001L);//铜精矿(结算样)
-    	sampleEntrustDetail_1.setDictionaryBusinessId(1965289473129664514L);
-    	sampleEntrustDetail_1.setSampleName("铜精矿");
-    	sampleEntrustDetail_1.setEntrustSampleCode("SRC0001");
-    	sampleEntrustDetail_1.setEntrustSampleName("来样名称-铜精矿");
-    	sampleEntrustDetail_1.setSort(1);
-    	sampleEntrustDetail_1.setAssayProject("");
-    	sampleEntrustDetail_1.setForecastResult("");
-    	sampleEntrustDetail_1.setRemark("");
-    	
-    	List<SampleEntrustDetailProject> sampleEntrustDetailProjectList_1 = new ArrayList<>();
-    	SampleEntrustDetailProject sampleEntrustDetailProject_1_1 = new SampleEntrustDetailProject();
-    	sampleEntrustDetailProject_1_1.setMaterialAssayStandardDetailId(1000000000000000001L);
-    	sampleEntrustDetailProject_1_1.setIsEnabled(1);
-    	sampleEntrustDetailProjectList_1.add(sampleEntrustDetailProject_1_1);
-    	sampleEntrustDetail_1.setSampleEntrustDetailProjectList(sampleEntrustDetailProjectList_1);
-    	
-    	SampleEntrustDetail sampleEntrustDetail_2 = new SampleEntrustDetail();
-    	sampleEntrustDetail_2.setBaseSampleId(1000000000000000001L);//铜精矿(结算样)
-    	sampleEntrustDetail_2.setDictionaryBusinessId(1965289473129664514L);
-    	sampleEntrustDetail_2.setSampleName("铜精矿");
-    	sampleEntrustDetail_2.setEntrustSampleCode("SRC0002");
-    	sampleEntrustDetail_2.setEntrustSampleName("来样名称-铜精矿");
-    	sampleEntrustDetail_2.setSort(2);
-    	sampleEntrustDetail_2.setAssayProject("");
-    	sampleEntrustDetail_2.setForecastResult("");
-    	sampleEntrustDetail_2.setRemark("");
-    	
-    	List<SampleEntrustDetailProject> sampleEntrustDetailProjectList_2 = new ArrayList<>();
-    	SampleEntrustDetailProject sampleEntrustDetailProject_2_1 = new SampleEntrustDetailProject();
-    	sampleEntrustDetailProject_2_1.setMaterialAssayStandardDetailId(1000000000000000001L);
-    	sampleEntrustDetailProject_2_1.setIsEnabled(1);
-    	sampleEntrustDetailProjectList_2.add(sampleEntrustDetailProject_2_1);
-    	sampleEntrustDetail_2.setSampleEntrustDetailProjectList(sampleEntrustDetailProjectList_2);
-    	
-    	List<SampleEntrustDetail> sampleEntrustDetailList = new ArrayList<>();
-    	sampleEntrustDetailList.add(sampleEntrustDetail_1);
-    	sampleEntrustDetailList.add(sampleEntrustDetail_2);    	
-    	
-    	
-    	SampleEntrustParam sampleEntrustParam = new SampleEntrustParam();
-    	sampleEntrustParam.setId(1965960610828763137L);
-    	sampleEntrustParam.setEntrustUnit("西南铜业");
-    	sampleEntrustParam.setSampleSender("送样人");
-    	sampleEntrustParam.setConfigEntrustSourceId(1000000000000000001L);
-    	sampleEntrustParam.setSampleSendDate(LocalDateTime.now());
-    	sampleEntrustParam.setSampleQuantity(2);
-    	sampleEntrustParam.setRemaineSampleRequirement("放弃1");
-    	sampleEntrustParam.setSampleEntrustDetailList(sampleEntrustDetailList);
-    	
-    	String jsonString = JSON.toJSONString(sampleEntrustParam);
-    	System.out.println(jsonString);
-    	
-    	LiteflowResponse response = flowExecutor.execute2Resp("sampleEntrustChain" + tenantId, sampleEntrustParam, SampleEntrustContext.class);
-    	if (response.isSuccess()) {
-			return success(response.getContextBean(SampleEntrustContext.class));
-		} else {
-			return error(500, response.getMessage());
-		}
-    	//return success(FlowBus.getNodeMap());
-	}
 }

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

@@ -47,4 +47,127 @@ public class SampleFlowController {
     	return success(response.getContextBean(SampleFlowContext.class));
     }    
 
+    @GetMapping("/test")
+    public CommonResult<?> test() {
+    	
+    	SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
+    	sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
+    	sampleFlowDefinition.setFlowName("子样样品流转流程");
+    	List<SampleFlowNode> flowNodeList = new ArrayList<>();
+    	
+    	SampleFlowNode zxr = new SampleFlowNode();
+    	zxr.setNodeName("中心收样");
+    	zxr.setNodeKey("flw_zx_receive");
+    	zxr.setSort(3100);
+
+    	SampleFlowNode zxs = new SampleFlowNode();
+    	zxs.setNodeName("中心送样");
+    	zxs.setNodeKey("flw_zx_send");
+    	zxs.setSort(3200);
+
+    	SampleFlowNode bzr = new SampleFlowNode();
+    	bzr.setNodeName("班组收样");
+    	bzr.setNodeKey("flw_bz_receive");
+    	bzr.setSort(3300);
+
+    	SampleFlowNode ypbm = new SampleFlowNode();
+    	ypbm.setNodeName("样品编密");
+    	ypbm.setNodeKey("flw_ypbm");
+    	ypbm.setSort(3400);
+
+    	SampleFlowNode fxr = new SampleFlowNode();
+    	fxr.setNodeName("分析收样");
+    	fxr.setNodeKey("flw_fx_receive");
+    	fxr.setSort(3500);
+
+    	SampleFlowNode fxs = new SampleFlowNode();
+    	fxs.setNodeName("分析送样");
+    	fxs.setNodeKey("flw_fx_send");
+    	fxs.setSort(3600);
+
+    	SampleFlowNode bzs = new SampleFlowNode();
+    	bzs.setNodeName("班组送样");
+    	bzs.setNodeKey("flw_bz_send");
+    	bzs.setSort(3700);
+
+    	SampleFlowNode ypgk = new SampleFlowNode();
+    	ypgk.setNodeName("样品归库");
+    	ypgk.setNodeKey("flw_ypgk");
+    	ypgk.setSort(3800);
+    	ypgk.setNextFlowNodeList(null);
+    	flowNodeList.add(ypgk);
+    	
+
+    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
+    		{
+    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
+    		}
+    	});
+    	flowNodeList.add(zxr);
+    	
+
+    	zxs.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(zxs);
+
+    	bzr.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("样品需要编密并且没编密过"));
+    		add(BeanUtils.toBean(fxr,SampleFlowNode.class).setCondition("样品无需编密或样品已编密过"));
+    	}});
+    	flowNodeList.add(bzr);
+    	
+
+    	ypbm.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(fxr,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(ypbm);
+    	
+
+    	fxr.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(fxr);
+    	
+
+    	fxs.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+    	}});
+    	flowNodeList.add(fxs);
+    	
+
+    	bzs.setNextFlowNodeList(new ArrayList<>() {{
+    		add(BeanUtils.toBean(fxr,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报"));
+    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完"));
+    	}});
+    	flowNodeList.add(bzs);
+    	
+    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
+    	
+    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
+    	
+    	System.out.println(jsonSampleFlowDefinition);
+    	
+    	Long tenantId = TenantContextHolder.getRequiredTenantId();
+    	
+    	List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
+    	sampleFlowInfoList.add(new SampleFlowInfo().setId(1967550576457330690L).setIsWeighing(0));
+    	
+    	SampleFlowParam sampleFlowParam = new SampleFlowParam();
+    	sampleFlowParam.setSampleSourceType(2);
+    	sampleFlowParam.setCurrentSampleFlowKey("P3000");
+    	sampleFlowParam.setSampleFlowInfoList(sampleFlowInfoList);
+    	
+    	
+    	
+    	LiteflowResponse response = flowExecutor.execute2Resp("sampleFlowChain" + tenantId, sampleFlowParam, SampleFlowContext.class);
+    	if (response.isSuccess()) {
+			return success(response.getContextBean(SampleFlowContext.class));
+		} else {
+			return error(500, response.getMessage());
+		}
+    	//return success(FlowBus.getNodeMap());
+	}
+
 }

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

@@ -0,0 +1,71 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import java.util.List;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
+import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
+import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
+import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+@Tag(name = "管理后台 - 样品任务分配")
+@RestController
+@RequestMapping("/qms/bus/sample/task-assign")
+@Validated
+public class SampleTaskAssignController {
+	
+	@Resource
+	private SampleTaskAssignService sampleTaskAssignService;
+	
+	@Operation(description = "获取分配人员列表")
+	@GetMapping("/getAssignUserList")
+	public CommonResult<?> getAssignUserList() {
+		List<AdminUserRespDTO> list = sampleTaskAssignService.getAssignUserList();
+		return success(list);
+	}
+
+    @PostMapping("/changeMethod")
+    public CommonResult<?> changeMethod() {
+    	
+    	
+    	return success("成功");
+    }
+	
+    @PostMapping("/methodAssign")
+    public CommonResult<?> methodAssign(@RequestBody SampleTaskAssignMethodParam param) {
+    	sampleTaskAssignService.methodAssign(param);
+    	return success("成功");
+    }
+
+	
+    @PostMapping("/sampleAssign")
+    public CommonResult<?> sampleAssign(@RequestBody SampleTaskAssignSampleParam param) {
+    	sampleTaskAssignService.sampleAssign(param);
+    	return success("成功");
+    }
+    
+    @PostMapping("/submitAssign")
+    public CommonResult<?> submitAssign(Long id) {
+    	sampleTaskAssignService.submitAssign(id);
+    	return success("成功");
+    }
+    
+    @PostMapping("/voidAssign")
+    public CommonResult<?> voidAssign(Long id) {
+    	sampleTaskAssignService.voidAssign(id);
+    	return success("成功");
+    }
+
+}

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

@@ -0,0 +1,65 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.io.Serializable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <b>BatchSampleAnalysisColumn</b>
+ * <p>
+ * 更新历史：
+ * <pre> 版本         更新时间            更新者        更新内容<hr/>
+ * V1.0      2025年9月22日          wxr         Add</pre>
+ * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
+ * </p>
+ * @author 王兴荣<wxr@wangxingrong.com>
+ * @version V1.0 
+ * @since 2025年9月22日
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BatchSampleAnalysisColumnRespVO implements Serializable {
+
+	private static final long serialVersionUID = 4283609584147441164L;
+
+	@Schema(description = "列字索引名称")
+    private String fieldIndex;
+    
+    @Schema(description = "列字段名")
+    private String field;
+    
+    @Schema(description = "标题")
+    private String title;
+    
+    @Schema(description = "列宽度")
+    private String width;
+    
+    @Schema(description = "最小列宽度")
+    private String minWidth;
+    
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+    
+    @Schema(description = "小数位数")
+    private Integer decimalPosition;
+    
+    @Schema(description = "数字间隔")
+    private Float step;
+    
+    @Schema(description = "计算公式")
+    private String formula;
+    
+    @Schema(description = "参数编号")
+    private Integer paramNo;
+    
+    @Schema(description = "是否允许编辑")
+    private Boolean isEdit;
+    
+    @Schema(description = "单位")
+    private String unit;
+}

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

@@ -13,19 +13,19 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayParameterDataPageReqVO extends PageParam {
 
-    @Schema(description = "检测项目业务ID", example = "31068")
+    @Schema(description = "检测项目业务ID", example = "4202")
     private Long businessAssayProjectDataId;
 
-    @Schema(description = "检测方法分析项目参数配置表ID", example = "10849")
+    @Schema(description = "检测方法分析项目参数配置表ID", example = "9808")
     private Long configAssayMethodProjectParameterId;
 
-    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "25302")
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "22549")
     private Long dictionaryParameterId;
 
-    @Schema(description = "参数值")
+    @Schema(description = "值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -34,11 +34,11 @@ public class BusinessAssayParameterDataPageReqVO extends PageParam {
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "7696")
+    @Schema(description = "乐观锁", example = "30975")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,47 @@
+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 BusinessAssayParameterDataReqVO {
+
+    @Schema(description = "检测项目业务ID", example = "31068")
+    private Long businessAssayProjectDataId;
+
+    @Schema(description = "检测方法分析项目参数配置表ID", example = "10849")
+    private Long configAssayMethodProjectParameterId;
+
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "25302")
+    private Long dictionaryParameterId;
+
+    @Schema(description = "参数值")
+    private String value;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "7696")
+    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/BusinessAssayParameterDataRespVO.java

@@ -12,28 +12,28 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessAssayParameterDataRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15246")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4344")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31068")
+    @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4202")
     @ExcelProperty("检测项目业务ID")
     private Long businessAssayProjectDataId;
 
-    @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10849")
+    @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9808")
     @ExcelProperty("检测方法分析项目参数配置表ID")
     private Long configAssayMethodProjectParameterId;
 
-    @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "25302")
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "22549")
     @ExcelProperty("参数ID,字典表【T_DIC_PRM】")
     private Long dictionaryParameterId;
 
-    @Schema(description = "参数值")
+    @Schema(description = "值")
-    @ExcelProperty("参数值")
+    @ExcelProperty("值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -44,11 +44,11 @@ public class BusinessAssayParameterDataRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7696")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30975")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -9,37 +9,35 @@ import jakarta.validation.constraints.*;
 @Data
 public class BusinessAssayParameterDataSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15246")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4344")
     private Long id;
 
-    @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31068")
+    @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4202")
     @NotNull(message = "检测项目业务ID不能为空")
     private Long businessAssayProjectDataId;
 
-    @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10849")
+    @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9808")
     @NotNull(message = "检测方法分析项目参数配置表ID不能为空")
     private Long configAssayMethodProjectParameterId;
 
-    @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "25302")
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "22549")
     @NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空")
     private Long dictionaryParameterId;
 
-    @Schema(description = "参数值")
+    @Schema(description = "值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
     private String dataType;
 
     @Schema(description = "小数位")
     private Integer decimalPosition;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7696")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30975")
-    @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/BusinessAssayProjectAndParameterRespVO.java

@@ -0,0 +1,61 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 分析项目与参数
+ */
+@Data
+public class BusinessAssayProjectAndParameterRespVO implements Serializable {
+
+	private static final long serialVersionUID = 2468650244768205378L;
+
+	/** id主键 **/
+    private Long id;
+    
+    /** 元素或参数字典id **/
+    private Long dicId;
+    
+    /** 元素或参数字典key **/
+    private String dicKey;
+    
+    /** 元素或参数名称 **/
+    @Schema(description = "元素或参数名称")
+    private String name;
+    
+    @Schema(description = "元素或参数显示名称")
+    private String showName;
+    
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+    
+    @Schema(description = "小数位数")
+    private Integer decimalPosition;
+    
+    /** 元素或参数单位 **/
+    @Schema(description = "元素或参数单位")
+    private String unit;
+    
+    /** 结果值 **/
+    @Schema(description = "结果值")
+    private String value;
+    
+    @Schema(description = "是否允许为空")
+    private Integer isNull; 
+    
+    /** 计算公式 **/
+    @Schema(description = "计算公式")
+    private String formula;
+
+    /** 元素或参数配置参数编号 **/
+    @Schema(description = "元素或参数配置参数编号")
+    private Integer paramNo;
+    
+    /** 类型（1：元素，2：参数） **/
+    @Schema(description = "类型（project：元素，2：参数）")
+    private String type;
+
+}

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

@@ -13,19 +13,19 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayProjectDataPageReqVO extends PageParam {
 
-    @Schema(description = "检测任务ID", example = "16505")
+    @Schema(description = "检测任务ID", example = "15606")
     private Long businessAssayTaskDataId;
 
-    @Schema(description = "检测方法分析项目配置ID", example = "15654")
+    @Schema(description = "检测方法分析项目配置ID", example = "17620")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "19038")
     private Long dictionaryProjectId;
 
     @Schema(description = "值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -37,13 +37,13 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
     @Schema(description = "是否启用")
     private Integer isEnabled;
 
-    @Schema(description = "乐观锁", example = "30037")
+    @Schema(description = "乐观锁", example = "30046")
     private Integer updateCount;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessAssayProjectDataReqVO.java

@@ -0,0 +1,53 @@
+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 BusinessAssayProjectDataReqVO {
+
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法分析项目配置ID", example = "15654")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "是否不参与超差判定")
+    private Integer isNotAssessment;
+
+    @Schema(description = "是否启用")
+    private Integer isEnabled;
+
+    @Schema(description = "乐观锁", example = "30037")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -12,19 +12,19 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessAssayProjectDataRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21103")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17927")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16505")
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
     @ExcelProperty("检测任务ID")
     private Long businessAssayTaskDataId;
 
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15654")
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17620")
     @ExcelProperty("检测方法分析项目配置ID")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "5352")
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "19038")
     @ExcelProperty("检测项目字典ID,字典表【T_DIC_PRJ】")
     private Long dictionaryProjectId;
 
@@ -32,8 +32,8 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -48,7 +48,7 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("是否启用")
     private Integer isEnabled;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30037")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30046")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 
@@ -56,8 +56,8 @@ public class BusinessAssayProjectDataRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -9,26 +9,26 @@ import jakarta.validation.constraints.*;
 @Data
 public class BusinessAssayProjectDataSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21103")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17927")
     private Long id;
 
-    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16505")
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
     @NotNull(message = "检测任务ID不能为空")
     private Long businessAssayTaskDataId;
 
-    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15654")
+    @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17620")
-    @NotEmpty(message = "检测方法分析项目配置ID不能为空")
+    @NotNull(message = "检测方法分析项目配置ID不能为空")
     private Long configAssayMethodProjectId;
 
-    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "5352")
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "19038")
     @NotNull(message = "检测项目字典ID,字典表【T_DIC_PRJ】不能为空")
     private Long dictionaryProjectId;
 
     @Schema(description = "值")
     private String value;
 
-    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
     private String dataType;
 
     @Schema(description = "小数位")
@@ -42,12 +42,10 @@ public class BusinessAssayProjectDataSaveReqVO {
     @NotNull(message = "是否启用不能为空")
     private Integer isEnabled;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30037")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30046")
-    @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,50 @@
+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 BusinessAssayReportDataPageReqVO extends PageParam {
+
+    @Schema(description = "报表类型ID", example = "15805")
+    private Long configReportTypeId;
+
+    @Schema(description = "报表配置ID", example = "24960")
+    private Long configSampleReportId;
+
+    @Schema(description = "样品主样ID", example = "30453")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析数据")
+    private String assayData;
+
+    @Schema(description = "流程code")
+    private String reportFlowCode;
+
+    @Schema(description = "报告数据明细id", example = "6437")
+    private Long documentDataId;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "378")
+    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/BusinessAssayReportDataRespVO.java

@@ -0,0 +1,63 @@
+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 BusinessAssayReportDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5943")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "报表类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15805")
+    @ExcelProperty("报表类型ID")
+    private Long configReportTypeId;
+
+    @Schema(description = "报表配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24960")
+    @ExcelProperty("报表配置ID")
+    private Long configSampleReportId;
+
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30453")
+    @ExcelProperty("样品主样ID")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("样品编号")
+    private String sampleCode;
+
+    @Schema(description = "分析数据")
+    @ExcelProperty("分析数据")
+    private String assayData;
+
+    @Schema(description = "流程code")
+    @ExcelProperty("流程code")
+    private String reportFlowCode;
+
+    @Schema(description = "报告数据明细id", example = "6437")
+    @ExcelProperty("报告数据明细id")
+    private Long documentDataId;
+
+    @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 = "378")
+    @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/BusinessAssayReportDataSaveReqVO.java

@@ -0,0 +1,49 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 检测报表数据业务新增/修改 Request VO")
+@Data
+public class BusinessAssayReportDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5943")
+    private Long id;
+
+    @Schema(description = "报表类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15805")
+    @NotNull(message = "报表类型ID不能为空")
+    private Long configReportTypeId;
+
+    @Schema(description = "报表配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24960")
+    @NotNull(message = "报表配置ID不能为空")
+    private Long configSampleReportId;
+
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30453")
+    @NotNull(message = "样品主样ID不能为空")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "样品编号不能为空")
+    private String sampleCode;
+
+    @Schema(description = "分析数据")
+    private String assayData;
+
+    @Schema(description = "流程code")
+    private String reportFlowCode;
+
+    @Schema(description = "报告数据明细id", example = "6437")
+    private Long documentDataId;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "378")
+    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/BusinessAssayTaskAnalysisSampleProjectRespVO.java

@@ -0,0 +1,54 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
+import lombok.Data;
+
+/**
+ * 分配任务单分析样品项目
+ */
+@Data
+public class BusinessAssayTaskAnalysisSampleProjectRespVO {
+
+	/** 分配任务单id **/
+    private Long businessAssayTaskId;
+
+    /** 任务分配单编号 **/
+    private String businessAssayTasNo;
+
+    /** 任务分配单名称 **/
+    private String businessAssayTasName;
+    
+    /** 分析人员 **/
+    private String assayOperator;
+    
+    /** 分析时间 **/
+    private LocalDateTime assayTime;
+
+    /** 检测方法id **/
+    private Long configAssayMethodId;
+    
+    /** 检测方法名称 **/
+    private String configAssayMethodName;
+    
+    /** 数据集key **/
+    private String dataCollectionKey;
+    
+    /** 数据集id **/
+    private Long dataCollectionId;
+    
+    /** 动态表单值 **/
+    private String formValue;
+    
+    /** 分析的列 **/
+    private List<BatchSampleAnalysisColumnRespVO> columns;
+    
+    /** 分析的数据 **/
+    private List<Map<String, Object>> datas;
+    
+    /** 检测方法范围 **/
+    private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;
+}

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

@@ -0,0 +1,28 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+/**
+ * <b>BusinessAssayTaskDataGroupRespVO</b>
+ * <p>
+ * 更新历史：
+ * <pre> 版本         更新时间            更新者        更新内容<hr/>
+ * V1.0      2025年9月20日          wxr         Add</pre>
+ * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
+ * </p>
+ * @author 王兴荣<wxr@wangxingrong.com>
+ * @version V1.0 
+ * @since 2025年9月20日
+ */
+@Data
+public class BusinessAssayTaskDataGroupRespVO {
+	
+	private Long configAssayMethodId;
+	
+	private String configAssayMethodName;
+
+    private String assayType;
+	
+	private Integer sampleTaskCount;
+
+}

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

@@ -13,36 +13,45 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayTaskDataPageReqVO extends PageParam {
 
-    @Schema(description = "样品主样ID", example = "11587")
+    @Schema(description = "样品主样ID", example = "23293")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", example = "2157")
+    @Schema(description = "样品分样ID", example = "15024")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", example = "2427")
+    @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测方法ID", example = "21835")
+    @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 
-    @Schema(description = "指派单ID", example = "15392")
+    @Schema(description = "指派单ID", example = "23566")
     private Long businessAssayTaskId;
 
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
     private String assayType;
 
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "16988")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
-    @Schema(description = "任务指派时间")
+    @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] taskTime;
+    private LocalDateTime[] assignTaskTime;
 
-    @Schema(description = "是否已指派")
+    @Schema(description = "是否已分配任务")
-    private Integer isTasked;
+    private Integer isAssignTasked;
 
     @Schema(description = "是否已上报")
     private Integer isReported;
@@ -54,19 +63,26 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
 
-    @Schema(description = "流程节点")
+    @Schema(description = "样品流程配置ID", example = "10639")
-    private String flowNode;
+    private Long configSampleFlowId;
 
-    @Schema(description = "复检次数,0代表正常分析", example = "27671")
+    @Schema(description = "样品流程节点KEY")
-    private Integer recheckCount;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "乐观锁", example = "4946")
+    @Schema(description = "样品流程节点时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleFlowNodeTime;
+
+    @Schema(description = "分析次数,复检的累加次数", example = "13073")
+    private Integer analysisCount;
+
+    @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessAssayTaskDataReqVO.java

@@ -13,36 +13,45 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayTaskDataReqVO {
 
-    @Schema(description = "样品主样ID", example = "11587")
+    @Schema(description = "样品主样ID", example = "23293")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", example = "2157")
+    @Schema(description = "样品分样ID", example = "15024")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", example = "2427")
+    @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测方法ID", example = "21835")
+    @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 
-    @Schema(description = "指派单ID", example = "15392")
+    @Schema(description = "指派单ID", example = "23566")
     private Long businessAssayTaskId;
 
     @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "2")
     private String assayType;
 
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "16988")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
-    @Schema(description = "任务指派时间")
+    @Schema(description = "分配任务时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] taskTime;
+    private LocalDateTime[] assignTaskTime;
 
-    @Schema(description = "是否已指派")
+    @Schema(description = "是否已分配任务")
-    private Integer isTasked;
+    private Integer isAssignTasked;
 
     @Schema(description = "是否已上报")
     private Integer isReported;
@@ -54,19 +63,26 @@ public class BusinessAssayTaskDataReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
 
-    @Schema(description = "流程节点")
+    @Schema(description = "样品流程配置ID", example = "10639")
-    private String flowNode;
+    private Long configSampleFlowId;
 
-    @Schema(description = "复检次数,0代表正常分析", example = "27671")
+    @Schema(description = "样品流程节点KEY")
-    private Integer recheckCount;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "乐观锁", example = "4946")
+    @Schema(description = "样品流程节点时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleFlowNodeTime;
+
+    @Schema(description = "分析次数,复检的累加次数", example = "13073")
+    private Integer analysisCount;
+
+    @Schema(description = "乐观锁", example = "11435")
     private Integer updateCount;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessAssayTaskDataRespVO.java

@@ -12,27 +12,27 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessAssayTaskDataRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32383")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1089")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11587")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23293")
     @ExcelProperty("样品主样ID")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2157")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15024")
     @ExcelProperty("样品分样ID")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2427")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20464")
     @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21835")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
-    @ExcelProperty("检测方法ID")
+    @ExcelProperty("检测方法配置ID")
-    private String configAssayMethodId;
+    private Long configAssayMethodId;
 
-    @Schema(description = "指派单ID", example = "15392")
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23566")
     @ExcelProperty("指派单ID")
     private Long businessAssayTaskId;
 
@@ -40,21 +40,33 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
     private String taskType;
 
-    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...")
     private String assayType;
 
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16988")
+    @ExcelProperty("分析部门ID")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    @ExcelProperty("分析部门名称")
+    private String assayDepartmentName;
+
     @Schema(description = "分析人")
     @ExcelProperty("分析人")
     private String assayOperator;
 
-    @Schema(description = "任务指派时间")
+    @Schema(description = "分配任务时间")
-    @ExcelProperty("任务指派时间")
+    @ExcelProperty("分配任务时间")
-    private LocalDateTime taskTime;
+    private LocalDateTime assignTaskTime;
 
-    @Schema(description = "是否已指派")
+    @Schema(description = "是否已分配任务")
-    @ExcelProperty("是否已指派")
+    @ExcelProperty("是否已分配任务")
-    private Integer isTasked;
+    private Integer isAssignTasked;
 
     @Schema(description = "是否已上报")
     @ExcelProperty("是否已上报")
@@ -68,15 +80,23 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
 
-    @Schema(description = "流程节点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10639")
-    @ExcelProperty("流程节点")
+    @ExcelProperty("样品流程配置ID")
-    private String flowNode;
+    private Long configSampleFlowId;
 
-    @Schema(description = "复检次数,0代表正常分析", requiredMode = Schema.RequiredMode.REQUIRED, example = "27671")
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("复检次数,0代表正常分析")
+    @ExcelProperty("样品流程节点KEY")
-    private Integer recheckCount;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "4946")
+    @Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("样品流程节点时间")
+    private LocalDateTime sampleFlowNodeTime;
+
+    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
+    @ExcelProperty("分析次数,复检的累加次数")
+    private Integer analysisCount;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 
@@ -84,8 +104,8 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -11,44 +11,56 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessAssayTaskDataSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32383")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1089")
     private Long id;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11587")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23293")
     @NotNull(message = "样品主样ID不能为空")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2157")
+    @Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15024")
     @NotNull(message = "样品分样ID不能为空")
     private Long businessSubParentSampleId;
 
-    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2427")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20464")
     @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
 
-    @Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21835")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
-    @NotEmpty(message = "检测方法ID不能为空")
+    @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "指派单ID", example = "15392")
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23566")
+    @NotNull(message = "指派单ID不能为空")
     private Long businessAssayTaskId;
 
     @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】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...不能为空")
     private String assayType;
 
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测项目不能为空")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16988")
+    @NotNull(message = "分析部门ID不能为空")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
-    @Schema(description = "任务指派时间")
+    @Schema(description = "分配任务时间")
-    private LocalDateTime taskTime;
+    private LocalDateTime assignTaskTime;
 
-    @Schema(description = "是否已指派")
+    @Schema(description = "是否已分配任务")
-    private Integer isTasked;
+    private Integer isAssignTasked;
 
     @Schema(description = "是否已上报")
     private Integer isReported;
@@ -59,20 +71,26 @@ public class BusinessAssayTaskDataSaveReqVO {
     @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
-    @Schema(description = "流程节点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10639")
-    @NotEmpty(message = "流程节点不能为空")
+    @NotNull(message = "样品流程配置ID不能为空")
-    private String flowNode;
+    private Long configSampleFlowId;
 
-    @Schema(description = "复检次数,0代表正常分析", requiredMode = Schema.RequiredMode.REQUIRED, example = "27671")
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "复检次数,0代表正常分析不能为空")
+    @NotEmpty(message = "样品流程节点KEY不能为空")
-    private Integer recheckCount;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "4946")
+    @Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "乐观锁不能为空")
+    @NotNull(message = "样品流程节点时间不能为空")
+    private LocalDateTime sampleFlowNodeTime;
+
+    @Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
+    @NotNull(message = "分析次数,复检的累加次数不能为空")
+    private Integer analysisCount;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
     private Integer updateCount;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -13,19 +13,16 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessAssayTaskDetailPageReqVO extends PageParam {
 
-    @Schema(description = "指派单ID", example = "6438")
+    @Schema(description = "指派单ID", example = "21102")
     private Long businessAssayTaskId;
 
-    @Schema(description = "样品id", example = "26703")
+    @Schema(description = "样品id", example = "9299")
     private Long sampleId;
 
     @Schema(description = "指派编号")
     private String taskNo;
 
-    @Schema(description = "物料名称", example = "张三")
+    @Schema(description = "样品名称", example = "王五")
-    private String materialName;
-
-    @Schema(description = "样品名称", example = "芋艿")
     private String sampleName;
 
     @Schema(description = "样品编号")
@@ -37,8 +34,8 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam {
     @Schema(description = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下", example = "1")
     private String dataSourceType;
 
-    @Schema(description = "序号")
+    @Schema(description = "排序号")
-    private Integer sort;
+    private Integer sortNo;
 
     @Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", example = "1")
     private String rollbackStatus;
@@ -46,7 +43,7 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam {
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessAssayTaskDetailReqVO.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+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 BusinessAssayTaskDetailReqVO {
+
+    @Schema(description = "指派单ID", example = "21102")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "样品id", example = "9299")
+    private Long sampleId;
+
+    @Schema(description = "指派编号")
+    private String taskNo;
+
+    @Schema(description = "样品名称", example = "王五")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "杯号")
+    private String cupNumber;
+
+    @Schema(description = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下", example = "1")
+    private String dataSourceType;
+
+    @Schema(description = "排序号")
+    private Integer sortNo;
+
+    @Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", example = "1")
+    private String rollbackStatus;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -12,15 +12,15 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessAssayTaskDetailRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19713")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6020")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102")
     @ExcelProperty("指派单ID")
     private Long businessAssayTaskId;
 
-    @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26703")
+    @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
     @ExcelProperty("样品id")
     private Long sampleId;
 
@@ -28,11 +28,7 @@ public class BusinessAssayTaskDetailRespVO {
     @ExcelProperty("指派编号")
     private String taskNo;
 
-    @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @ExcelProperty("物料名称")
-    private String materialName;
-
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @ExcelProperty("样品名称")
     private String sampleName;
 
@@ -48,9 +44,9 @@ public class BusinessAssayTaskDetailRespVO {
     @ExcelProperty("数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下")
     private String dataSourceType;
 
-    @Schema(description = "序号")
+    @Schema(description = "排序号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("序号")
+    @ExcelProperty("排序号")
-    private Integer sort;
+    private Integer sortNo;
 
     @Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回")
@@ -60,8 +56,8 @@ public class BusinessAssayTaskDetailRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -9,14 +9,14 @@ import jakarta.validation.constraints.*;
 @Data
 public class BusinessAssayTaskDetailSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19713")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6020")
     private Long id;
 
-    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102")
     @NotNull(message = "指派单ID不能为空")
     private Long businessAssayTaskId;
 
-    @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26703")
+    @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
     @NotNull(message = "样品id不能为空")
     private Long sampleId;
 
@@ -24,11 +24,7 @@ public class BusinessAssayTaskDetailSaveReqVO {
     @NotEmpty(message = "指派编号不能为空")
     private String taskNo;
 
-    @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotEmpty(message = "物料名称不能为空")
-    private String materialName;
-
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @NotEmpty(message = "样品名称不能为空")
     private String sampleName;
 
@@ -43,15 +39,15 @@ public class BusinessAssayTaskDetailSaveReqVO {
     @NotEmpty(message = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下不能为空")
     private String dataSourceType;
 
-    @Schema(description = "序号")
+    @Schema(description = "排序号", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer sort;
+    @NotNull(message = "排序号不能为空")
+    private Integer sortNo;
 
     @Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotEmpty(message = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回不能为空")
     private String rollbackStatus;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,25 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+/**
+ * <b>BusinessAssayTaskExtendRespVO</b>
+ * <p>
+ * 更新历史：
+ * <pre> 版本         更新时间            更新者        更新内容<hr/>
+ * V1.0      2025年9月25日          wxr         Add</pre>
+ * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
+ * </p>
+ * @author 王兴荣<wxr@wangxingrong.com>
+ * @version V1.0 
+ * @since 2025年9月25日
+ */
+@Data
+public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
+
+	/** 分析方法名称 **/
+    private String configAssayMethodName;
+    
+    /** 分析任务数 **/
+    private Long assayTaskCount;
+}

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

@@ -19,12 +19,18 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "指派单名称", example = "芋艿")
     private String taskName;
 
-    @Schema(description = "检测方法ID", example = "18615")
+    @Schema(description = "检测方法配置ID", example = "20503")
     private Long configAssayMethodId;
 
-    @Schema(description = "任务单来源", example = "1")
+    @Schema(description = "任务单来源", example = "2")
     private String taskSourceType;
 
+    @Schema(description = "任务单模板ID", example = "13752")
+    private Long configReportTemplateId;
+
+    @Schema(description = "任务单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "指派人")
     private String taskOperator;
 
@@ -32,9 +38,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskOperatorTime;
 
-    @Schema(description = "指派分析人")
+    @Schema(description = "分析人")
     private String assayOperator;
 
+    @Schema(description = "分析时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] assayTime;
+
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
@@ -49,16 +59,16 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", example = "1")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", example = "2")
+    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", example = "1")
     private String synchronousStatus;
 
-    @Schema(description = "标样业务ID", example = "21760")
+    @Schema(description = "标样业务ID", example = "11493")
     private Long standardSampleId;
 
     @Schema(description = "标样编号")
     private String standardSampleCode;
 
-    @Schema(description = "标准样类型ID", example = "31587")
+    @Schema(description = "标准样类型ID", example = "18274")
     private Long standardSampleTypeId;
 
     @Schema(description = "质控样编号")
@@ -68,11 +78,11 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] qualitySampleAssayTime;
 
-    @Schema(description = "流程实例id", example = "15616")
+    @Schema(description = "流程实例id", example = "32335")
     private Long flowInstanceId;
 
-    @Schema(description = "顶部字段配置")
+    @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "3868")
-    private String formConfig;
+    private Long formDataCollectionId;
 
     @Schema(description = "顶部字段值")
     private String formValue;
@@ -83,13 +93,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", example = "1")
+    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", example = "2")
     private String flowStatus;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessAssayTaskRespVO.java

@@ -12,7 +12,7 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessAssayTaskRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5973")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31525")
     @ExcelProperty("ID")
     private Long id;
 
@@ -24,14 +24,20 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("指派单名称")
     private String taskName;
 
-    @Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18615")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20503")
-    @ExcelProperty("检测方法ID")
+    @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
-    @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("任务单来源")
     private String taskSourceType;
 
+    @Schema(description = "任务单模板ID", example = "13752")
+    private Long configReportTemplateId;
+
+    @Schema(description = "任务单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("指派人")
     private String taskOperator;
@@ -40,10 +46,14 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("指派时间")
     private LocalDateTime taskOperatorTime;
 
-    @Schema(description = "指派分析人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "分析人")
-    @ExcelProperty("指派分析人")
+    @ExcelProperty("分析人")
     private String assayOperator;
 
+    @Schema(description = "分析时间")
+    @ExcelProperty("分析时间")
+    private LocalDateTime assayTime;
+
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
@@ -60,11 +70,11 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步")
     private String synchronousStatus;
 
-    @Schema(description = "标样业务ID", example = "21760")
+    @Schema(description = "标样业务ID", example = "11493")
     @ExcelProperty("标样业务ID")
     private Long standardSampleId;
 
@@ -72,7 +82,7 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("标样编号")
     private String standardSampleCode;
 
-    @Schema(description = "标准样类型ID", example = "31587")
+    @Schema(description = "标准样类型ID", example = "18274")
     @ExcelProperty("标准样类型ID")
     private Long standardSampleTypeId;
 
@@ -84,13 +94,13 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("质控样分析时间")
     private LocalDateTime qualitySampleAssayTime;
 
-    @Schema(description = "流程实例id", example = "15616")
+    @Schema(description = "流程实例id", example = "32335")
     @ExcelProperty("流程实例id")
     private Long flowInstanceId;
 
-    @Schema(description = "顶部字段配置", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "3868")
-    @ExcelProperty("顶部字段配置")
+    @ExcelProperty("顶部字段数据集ID,T_DAT_COLT_FLD")
-    private String formConfig;
+    private Long formDataCollectionId;
 
     @Schema(description = "顶部字段值")
     @ExcelProperty("顶部字段值")
@@ -104,7 +114,7 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交")
     private String finishStatus;
 
-    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成")
     private String flowStatus;
 
@@ -112,8 +122,8 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessAssayTaskSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5973")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31525")
     private Long id;
 
     @Schema(description = "指派编号", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -22,14 +22,20 @@ public class BusinessAssayTaskSaveReqVO {
     @NotEmpty(message = "指派单名称不能为空")
     private String taskName;
 
-    @Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18615")
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20503")
-    @NotNull(message = "检测方法ID不能为空")
+    @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;
 
-    @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "任务单来源不能为空")
     private String taskSourceType;
 
+    @Schema(description = "任务单模板ID", example = "13752")
+    private Long configReportTemplateId;
+
+    @Schema(description = "任务单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "指派人不能为空")
     private String taskOperator;
@@ -38,10 +44,12 @@ public class BusinessAssayTaskSaveReqVO {
     @NotNull(message = "指派时间不能为空")
     private LocalDateTime taskOperatorTime;
 
-    @Schema(description = "指派分析人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "分析人")
-    @NotEmpty(message = "指派分析人不能为空")
     private String assayOperator;
 
+    @Schema(description = "分析时间")
+    private LocalDateTime assayTime;
+
     @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
@@ -56,17 +64,17 @@ public class BusinessAssayTaskSaveReqVO {
     @NotEmpty(message = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交不能为空")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotEmpty(message = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步不能为空")
     private String synchronousStatus;
 
-    @Schema(description = "标样业务ID", example = "21760")
+    @Schema(description = "标样业务ID", example = "11493")
     private Long standardSampleId;
 
     @Schema(description = "标样编号")
     private String standardSampleCode;
 
-    @Schema(description = "标准样类型ID", example = "31587")
+    @Schema(description = "标准样类型ID", example = "18274")
     private Long standardSampleTypeId;
 
     @Schema(description = "质控样编号")
@@ -75,12 +83,12 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "质控样分析时间")
     private LocalDateTime qualitySampleAssayTime;
 
-    @Schema(description = "流程实例id", example = "15616")
+    @Schema(description = "流程实例id", example = "32335")
     private Long flowInstanceId;
 
-    @Schema(description = "顶部字段配置", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "3868")
-    @NotEmpty(message = "顶部字段配置不能为空")
+    @NotNull(message = "顶部字段数据集ID,T_DAT_COLT_FLD不能为空")
-    private String formConfig;
+    private Long formDataCollectionId;
 
     @Schema(description = "顶部字段值")
     private String formValue;
@@ -92,12 +100,11 @@ public class BusinessAssayTaskSaveReqVO {
     @NotEmpty(message = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交不能为空")
     private String finishStatus;
 
-    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成不能为空")
     private String flowStatus;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -13,53 +13,56 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessBaseSamplePageReqVO extends PageParam {
 
-    @Schema(description = "样品名称", example = "芋艿")
+    @Schema(description = "样品名称", example = "张三")
     private String sampleName;
 
+    @Schema(description = "样品大类名称", example = "张三")
+    private String baseSampleName;
+
     @Schema(description = "样品编号")
     private String sampleCode;
 
-    @Schema(description = "主样配置ID", example = "26608")
+    @Schema(description = "主样配置ID", example = "3221")
     private Long configBaseSampleId;
 
-    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", example = "27887")
+    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", example = "32376")
     private Long dictionaryBusinessId;
 
     @Schema(description = "样品生成时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleTime;
 
-    @Schema(description = "打印次数", example = "20143")
+    @Schema(description = "打印次数", example = "31445")
     private Integer printCount;
 
     @Schema(description = "末次打印时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] printLastTime;
 
-    @Schema(description = "样品流程ID", example = "25222")
+    @Schema(description = "样品流程配置ID", example = "30581")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY")
+    @Schema(description = "样品流程节点KEY")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
     @Schema(description = "样品流程节点时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] sampleFlowTime;
+    private LocalDateTime[] sampleFlowNodeTime;
 
     @Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", example = "1")
     private String sampleStatus;
 
+    @Schema(description = "操作人")
+    private String operator;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建人名称")
+    @Schema(description = "创建时间")
-    private String operator;
-
-    @Schema(description = "创建日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "13116")
+    @Schema(description = "乐观锁", example = "24886")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -12,23 +12,27 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessBaseSampleRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14424")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26968")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @ExcelProperty("样品名称")
     private String sampleName;
 
+    @Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("样品大类名称")
+    private String baseSampleName;
+
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品编号")
     private String sampleCode;
 
-    @Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26608")
+    @Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3221")
     @ExcelProperty("主样配置ID")
     private Long configBaseSampleId;
 
-    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "27887")
+    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "32376")
     @ExcelProperty("主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样")
     private Long dictionaryBusinessId;
 
@@ -36,7 +40,7 @@ public class BusinessBaseSampleRespVO {
     @ExcelProperty("样品生成时间")
     private LocalDateTime sampleTime;
 
-    @Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "20143")
+    @Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "31445")
     @ExcelProperty("打印次数")
     private Integer printCount;
 
@@ -44,35 +48,35 @@ public class BusinessBaseSampleRespVO {
     @ExcelProperty("末次打印时间")
     private LocalDateTime printLastTime;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25222")
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30581")
-    @ExcelProperty("样品流程ID")
+    @ExcelProperty("样品流程配置ID")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("样品流程KEY")
+    @ExcelProperty("样品流程节点KEY")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
     @Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品流程节点时间")
-    private LocalDateTime sampleFlowTime;
+    private LocalDateTime sampleFlowNodeTime;
 
     @Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废")
     private String sampleStatus;
 
+    @Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("操作人")
+    private String operator;
+
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建人名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建人名称")
+    @ExcelProperty("创建时间")
-    private String operator;
-
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13116")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24886")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -11,22 +11,26 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessBaseSampleSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14424")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26968")
     private Long id;
 
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @NotEmpty(message = "样品名称不能为空")
     private String sampleName;
 
+    @Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "样品大类名称不能为空")
+    private String baseSampleName;
+
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "样品编号不能为空")
     private String sampleCode;
 
-    @Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26608")
+    @Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3221")
     @NotNull(message = "主样配置ID不能为空")
     private Long configBaseSampleId;
 
-    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "27887")
+    @Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "32376")
     @NotNull(message = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样不能为空")
     private Long dictionaryBusinessId;
 
@@ -34,39 +38,37 @@ public class BusinessBaseSampleSaveReqVO {
     @NotNull(message = "样品生成时间不能为空")
     private LocalDateTime sampleTime;
 
-    @Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "20143")
+    @Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "31445")
     @NotNull(message = "打印次数不能为空")
     private Integer printCount;
 
     @Schema(description = "末次打印时间")
     private LocalDateTime printLastTime;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25222")
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30581")
-    @NotNull(message = "样品流程ID不能为空")
+    @NotNull(message = "样品流程配置ID不能为空")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "样品流程KEY不能为空")
+    @NotEmpty(message = "样品流程节点KEY不能为空")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
     @Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "样品流程节点时间不能为空")
-    private LocalDateTime sampleFlowTime;
+    private LocalDateTime sampleFlowNodeTime;
 
     @Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotEmpty(message = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废不能为空")
     private String sampleStatus;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
+    @NotEmpty(message = "操作人不能为空")
-    private String systemDepartmentCode;
-
-    @Schema(description = "创建人名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "创建人名称不能为空")
     private String operator;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13116")
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "乐观锁不能为空")
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24886")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,35 @@
+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 BusinessDocumentDataPageReqVO extends PageParam {
+
+    @Schema(description = "报告ID", example = "26917")
+    private Long businessDocumentMainId;
+
+    @Schema(description = "原始数据ID", example = "17211")
+    private Long sourceId;
+
+    @Schema(description = "数据内容")
+    private String documentContent;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 检测报告明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessDocumentDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18647")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26917")
+    @ExcelProperty("报告ID")
+    private Long businessDocumentMainId;
+
+    @Schema(description = "原始数据ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17211")
+    @ExcelProperty("原始数据ID")
+    private Long sourceId;
+
+    @Schema(description = "数据内容")
+    @ExcelProperty("数据内容")
+    private String documentContent;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,32 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 检测报告明细新增/修改 Request VO")
+@Data
+public class BusinessDocumentDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18647")
+    private Long id;
+
+    @Schema(description = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26917")
+    @NotNull(message = "报告ID不能为空")
+    private Long businessDocumentMainId;
+
+    @Schema(description = "原始数据ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17211")
+    @NotNull(message = "原始数据ID不能为空")
+    private Long sourceId;
+
+    @Schema(description = "数据内容")
+    private String documentContent;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,73 @@
+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 BusinessDocumentMainPageReqVO extends PageParam {
+
+    @Schema(description = "流程实例ID", example = "780")
+    private Long flowInstanceId;
+
+    @Schema(description = "报告类型ID", example = "15259")
+    private Long configDocumentTypeId;
+
+    @Schema(description = "流程模型Key")
+    private String modelKey;
+
+    @Schema(description = "流程流水号")
+    private String flowSerialNumber;
+
+    @Schema(description = "当前节点")
+    private String currentNode;
+
+    @Schema(description = "报告编号")
+    private String documentCode;
+
+    @Schema(description = "报告类型,【字典】【jy_doc_main_type】化验报告、典型性报告、检测报告", example = "1")
+    private String documentType;
+
+    @Schema(description = "报告标题")
+    private String documentTitle;
+
+    @Schema(description = "报告配置项")
+    private String documentConfig;
+
+    @Schema(description = "报告签名信息")
+    private String documentSignature;
+
+    @Schema(description = "报告发起时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] documentStartTime;
+
+    @Schema(description = "报告结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] documentEndTime;
+
+    @Schema(description = "报告表单数据")
+    private String formData;
+
+    @Schema(description = "附件")
+    private String attachment;
+
+    @Schema(description = "状态,【字典】【jy_doc_main_status】待编制、审批中、已结束", example = "2")
+    private String status;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,91 @@
+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 BusinessDocumentMainRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23015")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "流程实例ID", example = "780")
+    @ExcelProperty("流程实例ID")
+    private Long flowInstanceId;
+
+    @Schema(description = "报告类型ID", example = "15259")
+    @ExcelProperty("报告类型ID")
+    private Long configDocumentTypeId;
+
+    @Schema(description = "流程模型Key")
+    @ExcelProperty("流程模型Key")
+    private String modelKey;
+
+    @Schema(description = "流程流水号")
+    @ExcelProperty("流程流水号")
+    private String flowSerialNumber;
+
+    @Schema(description = "当前节点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("当前节点")
+    private String currentNode;
+
+    @Schema(description = "报告编号")
+    @ExcelProperty("报告编号")
+    private String documentCode;
+
+    @Schema(description = "报告类型,【字典】【jy_doc_main_type】化验报告、典型性报告、检测报告", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("报告类型,【字典】【jy_doc_main_type】化验报告、典型性报告、检测报告")
+    private String documentType;
+
+    @Schema(description = "报告标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("报告标题")
+    private String documentTitle;
+
+    @Schema(description = "报告配置项", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("报告配置项")
+    private String documentConfig;
+
+    @Schema(description = "报告签名信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("报告签名信息")
+    private String documentSignature;
+
+    @Schema(description = "报告发起时间")
+    @ExcelProperty("报告发起时间")
+    private LocalDateTime documentStartTime;
+
+    @Schema(description = "报告结束时间")
+    @ExcelProperty("报告结束时间")
+    private LocalDateTime documentEndTime;
+
+    @Schema(description = "报告表单数据")
+    @ExcelProperty("报告表单数据")
+    private String formData;
+
+    @Schema(description = "附件")
+    @ExcelProperty("附件")
+    private String attachment;
+
+    @Schema(description = "状态,【字典】【jy_doc_main_status】待编制、审批中、已结束", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("状态,【字典】【jy_doc_main_status】待编制、审批中、已结束")
+    private String status;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,74 @@
+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 BusinessDocumentMainSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23015")
+    private Long id;
+
+    @Schema(description = "流程实例ID", example = "780")
+    private Long flowInstanceId;
+
+    @Schema(description = "报告类型ID", example = "15259")
+    private Long configDocumentTypeId;
+
+    @Schema(description = "流程模型Key")
+    private String modelKey;
+
+    @Schema(description = "流程流水号")
+    private String flowSerialNumber;
+
+    @Schema(description = "当前节点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "当前节点不能为空")
+    private String currentNode;
+
+    @Schema(description = "报告编号")
+    private String documentCode;
+
+    @Schema(description = "报告类型,【字典】【jy_doc_main_type】化验报告、典型性报告、检测报告", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "报告类型,【字典】【jy_doc_main_type】化验报告、典型性报告、检测报告不能为空")
+    private String documentType;
+
+    @Schema(description = "报告标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "报告标题不能为空")
+    private String documentTitle;
+
+    @Schema(description = "报告配置项", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "报告配置项不能为空")
+    private String documentConfig;
+
+    @Schema(description = "报告签名信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "报告签名信息不能为空")
+    private String documentSignature;
+
+    @Schema(description = "报告发起时间")
+    private LocalDateTime documentStartTime;
+
+    @Schema(description = "报告结束时间")
+    private LocalDateTime documentEndTime;
+
+    @Schema(description = "报告表单数据")
+    private String formData;
+
+    @Schema(description = "附件")
+    private String attachment;
+
+    @Schema(description = "状态,【字典】【jy_doc_main_status】待编制、审批中、已结束", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "状态,【字典】【jy_doc_main_status】待编制、审批中、已结束不能为空")
+    private String status;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -14,14 +14,14 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessHandoverRecordSubPageReqVO extends PageParam {
 
-    @Schema(description = "样品子样ID", example = "7268")
+    @Schema(description = "分样子样ID", example = "15157")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品流程ID", example = "27410")
+    @Schema(description = "样品流程配置ID", example = "9154")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY")
+    @Schema(description = "样品流程节点KEY")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
     @Schema(description = "样品编号")
     private String sampleCode;
@@ -29,6 +29,9 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "样品重量")
     private BigDecimal sampleWeight;
 
+    @Schema(description = "天平编号")
+    private String balanceCode;
+
     @Schema(description = "操作时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] operationTime;
@@ -36,7 +39,7 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "操作人")
     private String operator;
 
-    @Schema(description = "操作人ID", example = "9370")
+    @Schema(description = "操作人ID", example = "19708")
     private Long operatorId;
 
     @Schema(description = "送样人")
@@ -45,10 +48,16 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "收样人")
     private String receiveSampleOperator;
 
+    @Schema(description = "上一个交接记录ID", example = "5605")
+    private Long upSampleRecordId;
+
+    @Schema(description = "下一个交接记录ID", example = "31634")
+    private Long nextSampleRecordId;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessHandoverRecordSubRespVO.java

@@ -13,23 +13,23 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessHandoverRecordSubRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3962")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20889")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7268")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15157")
-    @ExcelProperty("样品子样ID")
+    @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27410")
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9154")
-    @ExcelProperty("样品流程ID")
+    @ExcelProperty("样品流程配置ID")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("样品流程KEY")
+    @ExcelProperty("样品流程节点KEY")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "样品编号")
+    @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品编号")
     private String sampleCode;
 
@@ -37,6 +37,10 @@ public class BusinessHandoverRecordSubRespVO {
     @ExcelProperty("样品重量")
     private BigDecimal sampleWeight;
 
+    @Schema(description = "天平编号")
+    @ExcelProperty("天平编号")
+    private String balanceCode;
+
     @Schema(description = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("操作时间")
     private LocalDateTime operationTime;
@@ -45,7 +49,7 @@ public class BusinessHandoverRecordSubRespVO {
     @ExcelProperty("操作人")
     private String operator;
 
-    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9370")
+    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19708")
     @ExcelProperty("操作人ID")
     private Long operatorId;
 
@@ -57,12 +61,20 @@ public class BusinessHandoverRecordSubRespVO {
     @ExcelProperty("收样人")
     private String receiveSampleOperator;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上一个交接记录ID", example = "5605")
+    @ExcelProperty("上一个交接记录ID")
+    private Long upSampleRecordId;
+
+    @Schema(description = "下一个交接记录ID", example = "31634")
+    @ExcelProperty("下一个交接记录ID")
+    private Long nextSampleRecordId;
+
+    @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -12,27 +12,31 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessHandoverRecordSubSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3962")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20889")
     private Long id;
 
-    @Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7268")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15157")
-    @NotNull(message = "样品子样ID不能为空")
+    @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27410")
+    @Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9154")
-    @NotNull(message = "样品流程ID不能为空")
+    @NotNull(message = "样品流程配置ID不能为空")
-    private Long sampleFlowId;
+    private Long configSampleFlowId;
 
-    @Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "样品流程KEY不能为空")
+    @NotEmpty(message = "样品流程节点KEY不能为空")
-    private String sampleFlowKey;
+    private String sampleFlowNodeKey;
 
-    @Schema(description = "样品编号")
+    @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "样品编号不能为空")
     private String sampleCode;
 
     @Schema(description = "样品重量")
     private BigDecimal sampleWeight;
 
+    @Schema(description = "天平编号")
+    private String balanceCode;
+
     @Schema(description = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "操作时间不能为空")
     private LocalDateTime operationTime;
@@ -41,7 +45,7 @@ public class BusinessHandoverRecordSubSaveReqVO {
     @NotEmpty(message = "操作人不能为空")
     private String operator;
 
-    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9370")
+    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19708")
     @NotNull(message = "操作人ID不能为空")
     private Long operatorId;
 
@@ -53,8 +57,13 @@ public class BusinessHandoverRecordSubSaveReqVO {
     @NotEmpty(message = "收样人不能为空")
     private String receiveSampleOperator;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "上一个交接记录ID", example = "5605")
-    @NotEmpty(message = "所属部门不能为空")
+    private Long upSampleRecordId;
+
+    @Schema(description = "下一个交接记录ID", example = "31634")
+    private Long nextSampleRecordId;
+
+    @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,62 @@
+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 BusinessQualityControlSampleProjectPageReqVO extends PageParam {
+
+    @Schema(description = "指派单ID", example = "11066")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "标准样元素配置ID", example = "15889")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "32665")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称,字典表：【UNT】", example = "李四")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    private String standardValue;
+
+    @Schema(description = "允差值")
+    private String toleraanceValue;
+
+    @Schema(description = "质控样值")
+    private String qualityControlValue;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    private Integer sortNo;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "14124")
+    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/BusinessQualityControlSampleProjectRespVO.java

@@ -0,0 +1,79 @@
+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 BusinessQualityControlSampleProjectRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5422")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11066")
+    @ExcelProperty("指派单ID")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15889")
+    @ExcelProperty("标准样元素配置ID")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "32665")
+    @ExcelProperty("检测项目ID,字典表：【T_DIC_PRJ】")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称,字典表：【UNT】", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("检测项目名称,字典表：【UNT】")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    @ExcelProperty("检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    @ExcelProperty("标准值")
+    private String standardValue;
+
+    @Schema(description = "允差值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("允差值")
+    private String toleraanceValue;
+
+    @Schema(description = "质控样值")
+    @ExcelProperty("质控样值")
+    private String qualityControlValue;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    @ExcelProperty("排序号")
+    private Integer sortNo;
+
+    @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 = "14124")
+    @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/BusinessQualityControlSampleProjectSaveReqVO.java

@@ -0,0 +1,64 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 质控样检测项目业务新增/修改 Request VO")
+@Data
+public class BusinessQualityControlSampleProjectSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5422")
+    private Long id;
+
+    @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11066")
+    @NotNull(message = "指派单ID不能为空")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15889")
+    @NotNull(message = "标准样元素配置ID不能为空")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "32665")
+    @NotNull(message = "检测项目ID,字典表：【T_DIC_PRJ】不能为空")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称,字典表：【UNT】", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotEmpty(message = "检测项目名称,字典表：【UNT】不能为空")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    private String standardValue;
+
+    @Schema(description = "允差值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "允差值不能为空")
+    private String toleraanceValue;
+
+    @Schema(description = "质控样值")
+    private String qualityControlValue;
+
+    @Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "小数位不能为空")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    private Integer sortNo;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "14124")
+    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/BusinessSampleAssayResultPageReqVO.java

@@ -13,13 +13,13 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSampleAssayResultPageReqVO extends PageParam {
 
-    @Schema(description = "委托登记样品明细ID", example = "5711")
+    @Schema(description = "委托登记样品明细ID", example = "26226")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "样品主样ID", example = "22353")
+    @Schema(description = "样品主样ID", example = "9132")
     private Long businessBaseSampleId;
 
-    @Schema(description = "来样品位")
+    @Schema(description = "来样品位(JSON数据)")
     private String data;
 
     @Schema(description = "所属部门")
@@ -29,7 +29,7 @@ public class BusinessSampleAssayResultPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "18328")
+    @Schema(description = "乐观锁", example = "31515")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -12,20 +12,20 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSampleAssayResultRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31437")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21507")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5711")
+    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26226")
     @ExcelProperty("委托登记样品明细ID")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22353")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9132")
     @ExcelProperty("样品主样ID")
     private Long businessBaseSampleId;
 
-    @Schema(description = "来样品位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "来样品位(JSON数据)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("来样品位")
+    @ExcelProperty("来样品位(JSON数据)")
     private String data;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -36,7 +36,7 @@ public class BusinessSampleAssayResultRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18328")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "31515")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -9,27 +9,25 @@ import jakarta.validation.constraints.*;
 @Data
 public class BusinessSampleAssayResultSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31437")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21507")
     private Long id;
 
-    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5711")
+    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26226")
     @NotNull(message = "委托登记样品明细ID不能为空")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22353")
+    @Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9132")
     @NotNull(message = "样品主样ID不能为空")
     private Long businessBaseSampleId;
 
-    @Schema(description = "来样品位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "来样品位(JSON数据)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "来样品位不能为空")
+    @NotEmpty(message = "来样品位(JSON数据)不能为空")
     private String data;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18328")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "31515")
-    @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/BusinessSampleEntrustDetailExtendRespVO.java

@@ -7,6 +7,9 @@ import lombok.Data;
 @Data
 public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntrustDetailRespVO {
 	
+	/** 样品大类名称 **/
+	private String baseSampleName;
+	
 	private List<BusinessSampleEntrustProjectExtendRespVO> sampleEntrustDetailProjectList;
 
 }

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

@@ -13,19 +13,19 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSampleEntrustDetailPageReqVO extends PageParam {
 
-    @Schema(description = "检验委托登记ID", example = "3509")
+    @Schema(description = "检验委托登记ID", example = "17352")
     private Long businessSampleEntrustRegistrationId;
 
-    @Schema(description = "主样业务ID", example = "24710")
+    @Schema(description = "主样业务ID", example = "9560")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品大类ID", example = "10243")
+    @Schema(description = "样品大类ID", example = "1920")
     private Long baseSampleId;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】结算样、委检样、生产样等", example = "27392")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", example = "5244")
-    private Long dictionaryBusinessId;
+    private Long sampleTypeDictionaryBusinessId;
 
-    @Schema(description = "样品名称", example = "芋艿")
+    @Schema(description = "样品名称", example = "李四")
     private String sampleName;
 
     @Schema(description = "样品编号")
@@ -37,15 +37,15 @@ public class BusinessSampleEntrustDetailPageReqVO extends PageParam {
     @Schema(description = "委托样品编号")
     private String entrustSampleCode;
 
-    @Schema(description = "排序")
-    private Integer sort;
-
     @Schema(description = "检测项目")
     private String assayProject;
 
     @Schema(description = "预报结果")
     private String forecastResult;
 
+    @Schema(description = "排序")
+    private Integer sort;
+
     @Schema(description = "是否称重,1-启用，0-不启用")
     private Integer isWeighing;
 
@@ -56,7 +56,7 @@ public class BusinessSampleEntrustDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "12540")
+    @Schema(description = "乐观锁", example = "18310")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,63 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+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 BusinessSampleEntrustDetailReqVO {
+
+    @Schema(description = "检验委托登记ID", example = "17352")
+    private Long businessSampleEntrustRegistrationId;
+
+    @Schema(description = "主样业务ID", example = "9560")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品大类ID", example = "1920")
+    private Long baseSampleId;
+
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", example = "5244")
+    private Long sampleTypeDictionaryBusinessId;
+
+    @Schema(description = "样品名称", example = "李四")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "委托样品名称", example = "赵六")
+    private String entrustSampleName;
+
+    @Schema(description = "委托样品编号")
+    private String entrustSampleCode;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "预报结果")
+    private String forecastResult;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "是否称重,1-启用，0-不启用")
+    private Integer isWeighing;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "18310")
+    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/BusinessSampleEntrustDetailRespVO.java

@@ -12,27 +12,27 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSampleEntrustDetailRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12340")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6935")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3509")
+    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17352")
     @ExcelProperty("检验委托登记ID")
     private Long businessSampleEntrustRegistrationId;
 
-    @Schema(description = "主样业务ID", example = "24710")
+    @Schema(description = "主样业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9560")
     @ExcelProperty("主样业务ID")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10243")
+    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1920")
     @ExcelProperty("样品大类ID")
     private Long baseSampleId;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】结算样、委检样、生产样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "27392")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "5244")
-    @ExcelProperty("样品类型ID,字典表：【T_DIC_BSN】结算样、委检样、生产样等")
+    @ExcelProperty("样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等")
-    private Long dictionaryBusinessId;
+    private Long sampleTypeDictionaryBusinessId;
 
-    @Schema(description = "样品名称", example = "芋艿")
+    @Schema(description = "样品名称", example = "李四")
     @ExcelProperty("样品名称")
     private String sampleName;
 
@@ -48,11 +48,7 @@ public class BusinessSampleEntrustDetailRespVO {
     @ExcelProperty("委托样品编号")
     private String entrustSampleCode;
 
-    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("排序")
-    private Integer sort;
-
-    @Schema(description = "检测项目")
     @ExcelProperty("检测项目")
     private String assayProject;
 
@@ -60,6 +56,10 @@ public class BusinessSampleEntrustDetailRespVO {
     @ExcelProperty("预报结果")
     private String forecastResult;
 
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @Schema(description = "是否称重,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否称重,1-启用，0-不启用")
     private Integer isWeighing;
@@ -72,7 +72,7 @@ public class BusinessSampleEntrustDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", example = "12540")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18310")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -9,25 +9,26 @@ import jakarta.validation.constraints.*;
 @Data
 public class BusinessSampleEntrustDetailSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12340")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6935")
     private Long id;
 
-    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3509")
+    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17352")
     @NotNull(message = "检验委托登记ID不能为空")
     private Long businessSampleEntrustRegistrationId;
 
-    @Schema(description = "主样业务ID", example = "24710")
+    @Schema(description = "主样业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9560")
+    @NotNull(message = "主样业务ID不能为空")
     private Long businessBaseSampleId;
 
-    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10243")
+    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1920")
     @NotNull(message = "样品大类ID不能为空")
     private Long baseSampleId;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】结算样、委检样、生产样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "27392")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "5244")
-    @NotNull(message = "样品类型ID,字典表：【T_DIC_BSN】结算样、委检样、生产样等不能为空")
+    @NotNull(message = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等不能为空")
-    private Long dictionaryBusinessId;
+    private Long sampleTypeDictionaryBusinessId;
 
-    @Schema(description = "样品名称", example = "芋艿")
+    @Schema(description = "样品名称", example = "李四")
     private String sampleName;
 
     @Schema(description = "样品编号")
@@ -41,16 +42,17 @@ public class BusinessSampleEntrustDetailSaveReqVO {
     @NotEmpty(message = "委托样品编号不能为空")
     private String entrustSampleCode;
 
-    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "排序不能为空")
+    @NotEmpty(message = "检测项目不能为空")
-    private Integer sort;
-
-    @Schema(description = "检测项目")
     private String assayProject;
 
     @Schema(description = "预报结果")
     private String forecastResult;
 
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+
     @Schema(description = "是否称重,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否称重,1-启用，0-不启用不能为空")
     private Integer isWeighing;
@@ -58,7 +60,7 @@ public class BusinessSampleEntrustDetailSaveReqVO {
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", example = "12540")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18310")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -9,17 +9,17 @@ 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 BusinessSampleEntrustProjectPageReqVO extends PageParam {
 
-    @Schema(description = "样品检验委托明细ID", example = "31234")
+    @Schema(description = "委托登记样品明细ID", example = "30574")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "物料检测标准检测项目ID", example = "1780")
+    @Schema(description = "物料检测标准检测项目ID", example = "32027")
     private Long materialAssayStandardDetailId;
 
-    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "29566")
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "32209")
     private Long dictionaryProjectId;
 
     @Schema(description = "是否启用,1-启用，0-不启用")
@@ -32,7 +32,7 @@ public class BusinessSampleEntrustProjectPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "22753")
+    @Schema(description = "乐观锁", example = "15928")
     private Integer updateCount;
 
     @Schema(description = "备注")

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

@@ -7,24 +7,24 @@ 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 BusinessSampleEntrustProjectRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6960")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19565")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "样品检验委托明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31234")
+    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30574")
-    @ExcelProperty("样品检验委托明细ID")
+    @ExcelProperty("委托登记样品明细ID")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "物料检测标准检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1780")
+    @Schema(description = "物料检测标准检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32027")
     @ExcelProperty("物料检测标准检测项目ID")
     private Long materialAssayStandardDetailId;
 
-    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29566")
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "32209")
     @ExcelProperty("检测项目ID,字典表：【T_DIC_PRJ】")
     private Long dictionaryProjectId;
 
@@ -40,7 +40,7 @@ public class BusinessSampleEntrustProjectRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "22753")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "15928")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 

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

@@ -5,22 +5,22 @@ import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
-@Schema(description = "管理后台 - 委检样品检测项目业务新增/修改 Request VO")
+@Schema(description = "管理后台 - 委检登记样品检测项目新增/修改 Request VO")
 @Data
 public class BusinessSampleEntrustProjectSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6960")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19565")
     private Long id;
 
-    @Schema(description = "样品检验委托明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31234")
+    @Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30574")
-    @NotNull(message = "样品检验委托明细ID不能为空")
+    @NotNull(message = "委托登记样品明细ID不能为空")
     private Long businessSampleEntrustDetailId;
 
-    @Schema(description = "物料检测标准检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1780")
+    @Schema(description = "物料检测标准检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32027")
     @NotNull(message = "物料检测标准检测项目ID不能为空")
     private Long materialAssayStandardDetailId;
 
-    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29566")
+    @Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "32209")
     @NotNull(message = "检测项目ID,字典表：【T_DIC_PRJ】不能为空")
     private Long dictionaryProjectId;
 
@@ -29,11 +29,9 @@ public class BusinessSampleEntrustProjectSaveReqVO {
     private Integer isEnabled;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "22753")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "15928")
-    @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/BusinessSampleEntrustRegistrationExtendRespVO.java

@@ -14,9 +14,6 @@ public class BusinessSampleEntrustRegistrationExtendRespVO extends BusinessSampl
     @ExcelProperty("委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托")
     private String configEntrustSourceName;
     
-    @Schema(description = "委托单报表模板")
-    private String entrustReportTemplate;
-
     @Schema(description = "样品称重数量")
     @ExcelProperty("样品称重数量")
     private Integer sampleWeighingCount;

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

@@ -13,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
 
-    @Schema(description = "委托ID", example = "9871")
+    @Schema(description = "委托ID", example = "8978")
     private Long entrustId;
 
     @Schema(description = "委托单号")
@@ -22,7 +22,7 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     @Schema(description = "委托单位/送样单位")
     private String entrustUnit;
 
-    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", example = "28265")
+    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", example = "6609")
     private Long configEntrustSourceId;
 
     @Schema(description = "样品数量")
@@ -37,9 +37,45 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     @Schema(description = "余样要求,【字典】【jy_sample_entrust_remaine_requirement】余样返回、放弃")
     private String remaineSampleRequirement;
 
-    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", example = "1")
+    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
+    private String createWay;
+
+    @Schema(description = "委托类型,委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
+    private String entrustType;
+
+    @Schema(description = "委托时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] entrustTime;
+
+    @Schema(description = "送样人")
+    private String sampleSender;
+
+    @Schema(description = "送样日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleSendDate;
+
+    @Schema(description = "收样人")
+    private String sampleReceiver;
+
+    @Schema(description = "收样日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveDate;
+
+    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", example = "2")
     private String sampleStatus;
 
+    @Schema(description = "扩展信息数据集ID,T_DAT_COLT_FLD", example = "9517")
+    private Long externalInfomationDataCollectionId;
+
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
+    @Schema(description = "委托单模板ID", example = "13752")
+    private Long configReportTemplateId;
+
+    @Schema(description = "委托单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "电话")
     private String tel;
 
@@ -70,33 +106,19 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
     private String assayMethod;
 
-    @Schema(description = "送样人")
+    @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
-    private String sampleSender;
-
-    @Schema(description = "送样日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] sampleSendDate;
-
-    @Schema(description = "收样人")
-    private String sampleReceiver;
-
-    @Schema(description = "收样日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] sampleReceiveDate;
-
-    @Schema(description = "登记状态,register-登记中、submitted-已提交", example = "2")
     private String registrationStatus;
 
-    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "1")
+    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "2")
     private String dataCheckStatus;
 
-    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "1")
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
     private String assayStatus;
 
-    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "2")
+    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1")
     private String dataStatus;
 
-    @Schema(description = "报告IDs", example = "1825")
+    @Schema(description = "报告IDs", example = "26875")
     private String documentMainId;
 
     @Schema(description = "报告发送方式,【字典】【jy_sample_entrust_send_way】自取、邮寄、电话、传真、E-mail")
@@ -123,29 +145,10 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "乐观锁", example = "9487")
+    @Schema(description = "乐观锁", example = "13676")
     private Integer updateCount;
 
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "扩展信息")
-    private String externalInfomation;
-
-    @Schema(description = "数据集key,T_DAT_COLT_FLD", example = "29021")
-    private Long dataCollectionId;
-
-    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
-    private String createWay;
-
-    @Schema(description = "创建人")
-    private String createOperator;
-
-    @Schema(description = "委托类型：委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
-    private String entrustType;
-
-    @Schema(description = "委托时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] entrustTime;
-
 }

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

@@ -12,11 +12,11 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSampleEntrustRegistrationRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13395")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23276")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "委托ID", example = "9871")
+    @Schema(description = "委托ID", example = "8978")
     @ExcelProperty("委托ID")
     private Long entrustId;
 
@@ -28,7 +28,7 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("委托单位/送样单位")
     private String entrustUnit;
 
-    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", requiredMode = Schema.RequiredMode.REQUIRED, example = "28265")
+    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", requiredMode = Schema.RequiredMode.REQUIRED, example = "6609")
     @ExcelProperty("委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托")
     private Long configEntrustSourceId;
 
@@ -48,10 +48,54 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("余样要求,【字典】【jy_sample_entrust_remaine_requirement】余样返回、放弃")
     private String remaineSampleRequirement;
 
-    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", example = "1")
+    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
+    @ExcelProperty("创建方式,手动创建-manual、外部系统创建-interface")
+    private String createWay;
+
+    @Schema(description = "委托类型,委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
+    @ExcelProperty("委托类型,委托登记-entrust_registration、检验委托-entrust_inspection")
+    private String entrustType;
+
+    @Schema(description = "委托时间")
+    @ExcelProperty("委托时间")
+    private LocalDateTime entrustTime;
+
+    @Schema(description = "送样人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("送样人")
+    private String sampleSender;
+
+    @Schema(description = "送样日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("送样日期")
+    private LocalDateTime sampleSendDate;
+
+    @Schema(description = "收样人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("收样人")
+    private String sampleReceiver;
+
+    @Schema(description = "收样日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("收样日期")
+    private LocalDateTime sampleReceiveDate;
+
+    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体")
     private String sampleStatus;
 
+    @Schema(description = "扩展信息数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "9517")
+    @ExcelProperty("扩展信息数据集ID,T_DAT_COLT_FLD")
+    private Long externalInfomationDataCollectionId;
+
+    @Schema(description = "扩展信息")
+    @ExcelProperty("扩展信息")
+    private String externalInfomation;
+
+    @Schema(description = "委托单模板ID", example = "13752")
+    @ExcelProperty("委托单模板ID")
+    private Long configReportTemplateId;
+
+    @Schema(description = "委托单模板key")
+    @ExcelProperty("委托单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "电话")
     @ExcelProperty("电话")
     private String tel;
@@ -80,51 +124,35 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("样品类别(装港/卸港),【字典】【jy_sample_entrust_category】装港样、卸港样")
     private String sampleCategory;
 
-    @Schema(description = "样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样")
+    @Schema(description = "样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样")
     private String sampleOrigin;
 
-    @Schema(description = "保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求")
+    @Schema(description = "保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求")
     private String secrecyRequire;
 
-    @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
+    @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
     private String assayMethod;
 
-    @Schema(description = "送样人")
+    @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
-    @ExcelProperty("送样人")
+    @ExcelProperty("登记状态,in_progress-登记中、submit-已提交")
-    private String sampleSender;
-
-    @Schema(description = "送样日期")
-    @ExcelProperty("送样日期")
-    private LocalDateTime sampleSendDate;
-
-    @Schema(description = "收样人")
-    @ExcelProperty("收样人")
-    private String sampleReceiver;
-
-    @Schema(description = "收样日期")
-    @ExcelProperty("收样日期")
-    private LocalDateTime sampleReceiveDate;
-
-    @Schema(description = "登记状态,register-登记中、submitted-已提交", example = "2")
-    @ExcelProperty("登记状态,register-登记中、submitted-已提交")
     private String registrationStatus;
 
-    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "1")
+    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "2")
     @ExcelProperty("数据校验状态,success-数据校验成功、fail-数据校验失败")
     private String dataCheckStatus;
 
-    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "1")
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
     @ExcelProperty("检验状态,unchecked-未检验；checked-已检验")
     private String assayStatus;
 
-    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "2")
+    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1")
     @ExcelProperty("数据回报状态,unreturned-未回报；returned-已回报")
     private String dataStatus;
 
-    @Schema(description = "报告IDs", example = "1825")
+    @Schema(description = "报告IDs", example = "26875")
     @ExcelProperty("报告IDs")
     private String documentMainId;
 
@@ -156,35 +184,15 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "9487")
+    @Schema(description = "创建人")
+    private String creatorName;
+    
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13676")
     @ExcelProperty("乐观锁")
     private Integer updateCount;
 
-    @Schema(description = "备注")
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("备注")
     private String remark;
 
-    @Schema(description = "扩展信息")
-    @ExcelProperty("扩展信息")
-    private String externalInfomation;
-
-    @Schema(description = "数据集key,T_DAT_COLT_FLD", example = "29021")
-    @ExcelProperty("数据集key,T_DAT_COLT_FLD")
-    private Long dataCollectionId;
-
-    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
-    @ExcelProperty("创建方式,手动创建-manual、外部系统创建-interface")
-    private String createWay;
-
-    @Schema(description = "创建人")
-    @ExcelProperty("创建人")
-    private String createOperator;
-
-    @Schema(description = "委托类型：委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
-    @ExcelProperty("委托类型：委托登记-entrust_registration、检验委托-entrust_inspection")
-    private String entrustType;
-
-    @Schema(description = "委托时间")
-    private LocalDateTime entrustTime;
-
 }

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

@@ -11,10 +11,10 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessSampleEntrustRegistrationSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13395")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23276")
     private Long id;
 
-    @Schema(description = "委托ID", example = "9871")
+    @Schema(description = "委托ID", example = "8978")
     private Long entrustId;
 
     @Schema(description = "委托单号", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -25,7 +25,7 @@ public class BusinessSampleEntrustRegistrationSaveReqVO {
     @NotEmpty(message = "委托单位/送样单位不能为空")
     private String entrustUnit;
 
-    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", requiredMode = Schema.RequiredMode.REQUIRED, example = "28265")
+    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", requiredMode = Schema.RequiredMode.REQUIRED, example = "6609")
     @NotNull(message = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托不能为空")
     private Long configEntrustSourceId;
 
@@ -43,9 +43,48 @@ public class BusinessSampleEntrustRegistrationSaveReqVO {
     @NotEmpty(message = "余样要求,【字典】【jy_sample_entrust_remaine_requirement】余样返回、放弃不能为空")
     private String remaineSampleRequirement;
 
-    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", example = "1")
+    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
+    private String createWay;
+
+    @Schema(description = "委托类型,委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
+    private String entrustType;
+
+    @Schema(description = "委托时间")
+    private LocalDateTime entrustTime;
+
+    @Schema(description = "送样人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "送样人不能为空")
+    private String sampleSender;
+
+    @Schema(description = "送样日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "送样日期不能为空")
+    private LocalDateTime sampleSendDate;
+
+    @Schema(description = "收样人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "收样人不能为空")
+    private String sampleReceiver;
+
+    @Schema(description = "收样日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "收样日期不能为空")
+    private LocalDateTime sampleReceiveDate;
+
+    @Schema(description = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "样品状态,【字典】【jy_sample_entrust_status】块状、粉末、颗粒、液体不能为空")
     private String sampleStatus;
 
+    @Schema(description = "扩展信息数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "9517")
+    @NotNull(message = "扩展信息数据集ID,T_DAT_COLT_FLD不能为空")
+    private Long externalInfomationDataCollectionId;
+
+    @Schema(description = "扩展信息")
+    private String externalInfomation;
+
+    @Schema(description = "委托单模板ID", example = "13752")
+    private Long configReportTemplateId;
+
+    @Schema(description = "委托单模板key")
+    private String configReportTemplateKey;
+
     @Schema(description = "电话")
     private String tel;
 
@@ -67,40 +106,31 @@ public class BusinessSampleEntrustRegistrationSaveReqVO {
     @Schema(description = "样品类别(装港/卸港),【字典】【jy_sample_entrust_category】装港样、卸港样")
     private String sampleCategory;
 
-    @Schema(description = "样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样")
+    @Schema(description = "样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "样品来源,【字典】【jy_sample_entrust_origin】送样、邮寄、现场取样不能为空")
     private String sampleOrigin;
 
-    @Schema(description = "保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求")
+    @Schema(description = "保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "保密要求,【字典】【jy_sample_entrust_secrecy_requirement】要求对样品和文件保密、无保密要求不能为空")
     private String secrecyRequire;
 
-    @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择")
+    @Schema(description = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测方法,【字典】【jy_sample_entrust_assay_method】国标、行标、客户要求、检测方依据样品选择不能为空")
     private String assayMethod;
 
-    @Schema(description = "送样人")
+    @Schema(description = "登记状态,in_progress-登记中、submit-已提交", example = "1")
-    private String sampleSender;
-
-    @Schema(description = "送样日期")
-    private LocalDateTime sampleSendDate;
-
-    @Schema(description = "收样人")
-    private String sampleReceiver;
-
-    @Schema(description = "收样日期")
-    private LocalDateTime sampleReceiveDate;
-
-    @Schema(description = "登记状态,register-登记中、submitted-已提交", example = "2")
     private String registrationStatus;
 
-    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "1")
+    @Schema(description = "数据校验状态,success-数据校验成功、fail-数据校验失败", example = "2")
     private String dataCheckStatus;
 
-    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "1")
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
     private String assayStatus;
 
-    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "2")
+    @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1")
     private String dataStatus;
 
-    @Schema(description = "报告IDs", example = "1825")
+    @Schema(description = "报告IDs", example = "26875")
     private String documentMainId;
 
     @Schema(description = "报告发送方式,【字典】【jy_sample_entrust_send_way】自取、邮寄、电话、传真、E-mail")
@@ -121,29 +151,11 @@ public class BusinessSampleEntrustRegistrationSaveReqVO {
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "9487")
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13676")
-    @NotNull(message = "乐观锁不能为空")
     private Integer updateCount;
 
-    @Schema(description = "备注")
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "备注不能为空")
     private String remark;
 
-    @Schema(description = "扩展信息")
-    private String externalInfomation;
-
-    @Schema(description = "数据集key,T_DAT_COLT_FLD", example = "29021")
-    private Long dataCollectionId;
-
-    @Schema(description = "创建方式,手动创建-manual、外部系统创建-interface")
-    private String createWay;
-
-    @Schema(description = "创建人")
-    private String createOperator;
-
-    @Schema(description = "委托类型：委托登记-entrust_registration、检验委托-entrust_inspection", example = "2")
-    private String entrustType;
-
-    @Schema(description = "委托时间")
-    private LocalDateTime entrustTime;
-
 }

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

@@ -14,13 +14,13 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSampleHandoverDetailPageReqVO extends PageParam {
 
-    @Schema(description = "交接单ID", example = "7637")
+    @Schema(description = "交接单ID", example = "12067")
     private Long businessSampleHandoverId;
 
-    @Schema(description = "样品子样ID", example = "14005")
+    @Schema(description = "分样子样ID", example = "17670")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品名称", example = "李四")
+    @Schema(description = "样品名称", example = "王五")
     private String sampleName;
 
     @Schema(description = "样品编号")
@@ -32,16 +32,16 @@ public class BusinessSampleHandoverDetailPageReqVO extends PageParam {
     @Schema(description = "天平编号")
     private String balanceCode;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", example = "29761")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", example = "15453")
     private Long dictionaryBusinessId;
 
-    @Schema(description = "样品类型", example = "王五")
+    @Schema(description = "样品类型", example = "芋艿")
     private String dictionaryBusinessName;
 
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessSampleHandoverDetailRespVO.java

@@ -13,19 +13,19 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSampleHandoverDetailRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30266")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10448")
     @ExcelProperty("ID")
     private Long id;
 
-    @Schema(description = "交接单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7637")
+    @Schema(description = "交接单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12067")
     @ExcelProperty("交接单ID")
     private Long businessSampleHandoverId;
 
-    @Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14005")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17670")
-    @ExcelProperty("样品子样ID")
+    @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("样品名称")
     private String sampleName;
 
@@ -41,11 +41,11 @@ public class BusinessSampleHandoverDetailRespVO {
     @ExcelProperty("天平编号")
     private String balanceCode;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29761")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", requiredMode = Schema.RequiredMode.REQUIRED, example = "15453")
     @ExcelProperty("样品类型ID,字典表：【T_DIC_BSN】")
     private Long dictionaryBusinessId;
 
-    @Schema(description = "样品类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @Schema(description = "样品类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @ExcelProperty("样品类型")
     private String dictionaryBusinessName;
 
@@ -53,8 +53,8 @@ public class BusinessSampleHandoverDetailRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -10,18 +10,18 @@ import java.math.BigDecimal;
 @Data
 public class BusinessSampleHandoverDetailSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30266")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10448")
     private Long id;
 
-    @Schema(description = "交接单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7637")
+    @Schema(description = "交接单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12067")
     @NotNull(message = "交接单ID不能为空")
     private Long businessSampleHandoverId;
 
-    @Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14005")
+    @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17670")
-    @NotNull(message = "样品子样ID不能为空")
+    @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
 
-    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @NotEmpty(message = "样品名称不能为空")
     private String sampleName;
 
@@ -34,16 +34,15 @@ public class BusinessSampleHandoverDetailSaveReqVO {
     @Schema(description = "天平编号")
     private String balanceCode;
 
-    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29761")
+    @Schema(description = "样品类型ID,字典表：【T_DIC_BSN】", requiredMode = Schema.RequiredMode.REQUIRED, example = "15453")
     @NotNull(message = "样品类型ID,字典表：【T_DIC_BSN】不能为空")
     private Long dictionaryBusinessId;
 
-    @Schema(description = "样品类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @Schema(description = "样品类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @NotEmpty(message = "样品类型不能为空")
     private String dictionaryBusinessName;
 
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -16,17 +16,20 @@ public class BusinessSampleHandoverPageReqVO extends PageParam {
     @Schema(description = "交接单编号")
     private String code;
 
-    @Schema(description = "交接单名称", example = "赵六")
+    @Schema(description = "交接单名称", example = "芋艿")
     private String name;
 
-    @Schema(description = "交接单模版Key")
+    @Schema(description = "交接单模板ID", example = "29613")
-    private String templateKey;
+    private Long configReportTemplateId;
 
-    @Schema(description = "样品流程ID", example = "27863")
+    @Schema(description = "交接单模板key")
-    private String sampleFlowId;
+    private String configReportTemplateKey;
 
-    @Schema(description = "样品流程code")
+    @Schema(description = "样品流程配置ID", example = "9154")
-    private String sampleFlowCode;
+    private Long configSampleFlowId;
+
+    @Schema(description = "样品流程节点KEY")
+    private String sampleFlowNodeKey;
 
     @Schema(description = "操作类型,【字典】【jy_sample_handover_biz type】归库、调拨、下架、销毁", example = "2")
     private String operationType;
@@ -38,7 +41,7 @@ public class BusinessSampleHandoverPageReqVO extends PageParam {
     @Schema(description = "操作人")
     private String operator;
 
-    @Schema(description = "操作人ID", example = "8793")
+    @Schema(description = "操作人ID", example = "32492")
     private Long operatorId;
 
     @Schema(description = "流程模型Key")
@@ -50,7 +53,7 @@ public class BusinessSampleHandoverPageReqVO extends PageParam {
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期")
+    @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/BusinessSampleHandoverRespVO.java

@@ -12,7 +12,7 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class BusinessSampleHandoverRespVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16517")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13208")
     @ExcelProperty("ID")
     private Long id;
 
@@ -20,21 +20,23 @@ public class BusinessSampleHandoverRespVO {
     @ExcelProperty("交接单编号")
     private String code;
 
-    @Schema(description = "交接单名称", example = "赵六")
+    @Schema(description = "交接单名称", example = "芋艿")
     @ExcelProperty("交接单名称")
     private String name;
 
-    @Schema(description = "交接单模版Key")
+    @Schema(description = "交接单模板ID", example = "29613")
-    @ExcelProperty("交接单模版Key")
+    @ExcelProperty("交接单模板ID")
-    private String templateKey;
+    private Long configReportTemplateId;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27863")
+    @Schema(description = "交接单模板key")
-    @ExcelProperty("样品流程ID")
+    @ExcelProperty("交接单模板key")
-    private String sampleFlowId;
+    private String configReportTemplateKey;
 
-    @Schema(description = "样品流程code", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程配置ID", example = "9154")
-    @ExcelProperty("样品流程code")
+    private Long configSampleFlowId;
-    private String sampleFlowCode;
+
+    @Schema(description = "样品流程节点KEY")
+    private String sampleFlowNodeKey;
 
     @Schema(description = "操作类型,【字典】【jy_sample_handover_biz type】归库、调拨、下架、销毁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("操作类型,【字典】【jy_sample_handover_biz type】归库、调拨、下架、销毁")
@@ -48,7 +50,7 @@ public class BusinessSampleHandoverRespVO {
     @ExcelProperty("操作人")
     private String operator;
 
-    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8793")
+    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32492")
     @ExcelProperty("操作人ID")
     private Long operatorId;
 
@@ -60,12 +62,12 @@ public class BusinessSampleHandoverRespVO {
     @ExcelProperty("流程流水号")
     private String flowSerialNumber;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
-    @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建日期")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
     @Schema(description = "备注")

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

@@ -11,26 +11,27 @@ import java.time.LocalDateTime;
 @Data
 public class BusinessSampleHandoverSaveReqVO {
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16517")
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13208")
     private Long id;
 
     @Schema(description = "交接单编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "交接单编号不能为空")
+    @NotEmpty(message = "交接单编号不能为空")
     private String code;
 
-    @Schema(description = "交接单名称", example = "赵六")
+    @Schema(description = "交接单名称", example = "芋艿")
     private String name;
 
-    @Schema(description = "交接单模版Key")
+    @Schema(description = "交接单模板ID", example = "29613")
-    private String templateKey;
+    private Long configReportTemplateId;
 
-    @Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27863")
+    @Schema(description = "交接单模板key")
-    @NotEmpty(message = "样品流程ID不能为空")
+    private String configReportTemplateKey;
-    private String sampleFlowId;
 
-    @Schema(description = "样品流程code", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "样品流程配置ID", example = "9154")
-    @NotEmpty(message = "样品流程code不能为空")
+    private Long configSampleFlowId;
-    private String sampleFlowCode;
+
+    @Schema(description = "样品流程节点KEY")
+    private String sampleFlowNodeKey;
 
     @Schema(description = "操作类型,【字典】【jy_sample_handover_biz type】归库、调拨、下架、销毁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "操作类型,【字典】【jy_sample_handover_biz type】归库、调拨、下架、销毁不能为空")
@@ -44,7 +45,7 @@ public class BusinessSampleHandoverSaveReqVO {
     @NotEmpty(message = "操作人不能为空")
     private String operator;
 
-    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8793")
+    @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32492")
     @NotNull(message = "操作人ID不能为空")
     private Long operatorId;
 
@@ -54,8 +55,7 @@ public class BusinessSampleHandoverSaveReqVO {
     @Schema(description = "流程流水号")
     private String flowSerialNumber;
 
-    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "所属部门")
-    @NotEmpty(message = "所属部门不能为空")
     private String systemDepartmentCode;
 
     @Schema(description = "备注")

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

@@ -0,0 +1,41 @@
+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 BusinessStandardSamplePageReqVO extends PageParam {
+
+    @Schema(description = "标准样类型ID", example = "12799")
+    private Long configStandardSampleTypeId;
+
+    @Schema(description = "标准样类型名称", example = "李四")
+    private String configStandardSampleTypeName;
+
+    @Schema(description = "标准样编号")
+    private String standardSampleCode;
+
+    @Schema(description = "是否启用,1-启用，0-不启用")
+    private Integer isUse;
+
+    @Schema(description = "是否发布,1-是，0-否")
+    private Integer isPublish;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,53 @@
+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 BusinessStandardSampleProjectPageReqVO extends PageParam {
+
+    @Schema(description = "标准样ID", example = "10572")
+    private Long businessStandardSampleId;
+
+    @Schema(description = "标准样元素配置ID", example = "17543")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID", example = "19425")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称", example = "张三")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    private String standardValue;
+
+    @Schema(description = "标准允差值")
+    private String standardToleraanceValue;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    private Integer sortNo;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,67 @@
+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 BusinessStandardSampleProjectRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572")
+    @ExcelProperty("标准样ID")
+    private Long businessStandardSampleId;
+
+    @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543")
+    @ExcelProperty("标准样元素配置ID")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425")
+    @ExcelProperty("检测项目ID")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("检测项目名称")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    @ExcelProperty("检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    @ExcelProperty("标准值")
+    private String standardValue;
+
+    @Schema(description = "标准允差值")
+    @ExcelProperty("标准允差值")
+    private String standardToleraanceValue;
+
+    @Schema(description = "小数位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    @ExcelProperty("排序号")
+    private Integer sortNo;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,53 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 标准样检测项目业务新增/修改 Request VO")
+@Data
+public class BusinessStandardSampleProjectSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746")
+    private Long id;
+
+    @Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572")
+    @NotNull(message = "标准样ID不能为空")
+    private Long businessStandardSampleId;
+
+    @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543")
+    @NotNull(message = "标准样元素配置ID不能为空")
+    private Long configStandardSampleProjectId;
+
+    @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425")
+    @NotNull(message = "检测项目ID不能为空")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "检测项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "检测项目名称不能为空")
+    private String dictionaryProjectName;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+
+    @Schema(description = "标准值")
+    private String standardValue;
+
+    @Schema(description = "标准允差值")
+    private String standardToleraanceValue;
+
+    @Schema(description = "小数位", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "小数位不能为空")
+    private Integer decimalPosition;
+
+    @Schema(description = "排序号")
+    private Integer sortNo;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,51 @@
+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 BusinessStandardSampleRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28533")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "标准样类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12799")
+    @ExcelProperty("标准样类型ID")
+    private Long configStandardSampleTypeId;
+
+    @Schema(description = "标准样类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("标准样类型名称")
+    private String configStandardSampleTypeName;
+
+    @Schema(description = "标准样编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("标准样编号")
+    private String standardSampleCode;
+
+    @Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否启用,1-启用，0-不启用")
+    private Integer isUse;
+
+    @Schema(description = "是否发布,1-是，0-否", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否发布,1-是，0-否")
+    private Integer isPublish;
+
+    @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}