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

This commit is contained in:
FCL
2025-10-10 10:45:45 +08:00
parent e5b181d894
commit 07877f589f
624 changed files with 22199 additions and 2185 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More