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

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

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.*;