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

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>-->
-<!--            <groupId>tech.zzjc.tio</groupId>-->
-<!--            <artifactId>zzjc-tio-spring-boot-starter</artifactId>-->
-<!--            <version>${zzjc.tio.version}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>tech.zzjc.tio</groupId>
+            <artifactId>zzjc-tio-spring-boot-starter</artifactId>
+            <version>${zzjc.tio.version}</version>
+        </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/BusinessAssayParameterDataController.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.BusinessAssayParameterDataPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataSaveReqVO;
 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.*;
@@ -20,9 +23,8 @@ 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.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;

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/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() {
-    	List<Map<String, Object>> list = businessAssayTaskDataService.getUnAssayTaskGroupList();
+    public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
+    	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')")