修改T_BSN_SB_PRN_SMP_ASMT表名到T_BSN_SB_PRN_SMP_ASMT_PRJ

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

@@ -102,7 +102,8 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_ASSAY_TASK_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务业务不存在");
 	ErrorCode BUSINESS_ASSAY_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测项目数据业务不存在");
 	ErrorCode BUSINESS_ASSAY_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测参数数据业务不存在");
-	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定数据业务不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定业务不存在");
+	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定检测项目数据业务不存在");
 	ErrorCode BUSINESS_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品交接单业务不存在");
 	ErrorCode BUSINESS_SAMPLE_HANDOVER_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品交接明细不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测任务分配业务不存在");
@@ -115,7 +116,7 @@ public interface ErrorCodeConstants {
 	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_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
+	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
 	
 	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
 

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

@@ -32,7 +32,7 @@ import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAssessmentPr
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-@Tag(name = "管理后台 - 子样判定数据业务")
+@Tag(name = "管理后台 - 子样判定检测项目数据业务")
 @RestController
 @RequestMapping("/qms/business-sub-sample-assessment-project")
 @Validated
@@ -43,14 +43,14 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
     private BusinessSubSampleAssessmentProjectService businessSubSampleAssessmentProjectService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建子样判定数据业务")
+    @Operation(summary = "创建子样判定检测项目数据业务")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
     public CommonResult<BusinessSubSampleAssessmentProjectRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentProjectSaveReqVO createReqVO) {
         return success(businessSubSampleAssessmentProjectService.createBusinessSubSampleAssessment(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新子样判定数据业务")
+    @Operation(summary = "更新子样判定检测项目数据业务")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
     public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentProjectSaveReqVO updateReqVO) {
         businessSubSampleAssessmentProjectService.updateBusinessSubSampleAssessment(updateReqVO);
@@ -58,7 +58,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除子样判定数据业务")
+    @Operation(summary = "删除子样判定检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true)
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
@@ -68,7 +68,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除子样判定数据业务")
+    @Operation(summary = "批量删除子样判定检测项目数据业务")
                 //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
         businessSubSampleAssessmentProjectService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
@@ -76,7 +76,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得子样判定数据业务")
+    @Operation(summary = "获得子样判定检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<BusinessSubSampleAssessmentProjectRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
@@ -85,7 +85,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得子样判定数据业务分页")
+    @Operation(summary = "获得子样判定检测项目数据业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
     public CommonResult<PageResult<BusinessSubSampleAssessmentProjectRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentProjectPageReqVO pageReqVO) {
         PageResult<BusinessSubSampleAssessmentProjectDO> pageResult = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessmentPage(pageReqVO);
@@ -93,7 +93,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出子样判定数据业务 Excel")
+    @Operation(summary = "导出子样判定检测项目数据业务 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentProjectPageReqVO pageReqVO,
@@ -101,7 +101,7 @@ public class BusinessSubSampleAssessmentProjectController implements BusinessCon
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<BusinessSubSampleAssessmentProjectDO> list = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessmentPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "子样判定数据业务.xls", "数据", BusinessSubSampleAssessmentProjectRespVO.class,
+        ExcelUtils.write(response, "子样判定检测项目数据业务.xls", "数据", BusinessSubSampleAssessmentProjectRespVO.class,
                         BeanUtils.toBean(list, BusinessSubSampleAssessmentProjectRespVO.class));
     }
 

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

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
-public class BusinessSubParentSampleAssessmentExtendRespVO extends BusinessSubParentSampleAssessmentRespVO {
+public class BusinessSubParentSampleAssessmentProjectExtendRespVO extends BusinessSubParentSampleAssessmentProjectRespVO {
 
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;

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

@@ -9,9 +9,9 @@ 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 BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
+public class BusinessSubParentSampleAssessmentProjectPageReqVO extends PageParam {
 
     @Schema(description = "样品分样ID", example = "23188")
     private Long businessSubParentSampleId;

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

@@ -7,10 +7,10 @@ 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 BusinessSubParentSampleAssessmentRespVO {
+public class BusinessSubParentSampleAssessmentProjectRespVO {
 
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
     @ExcelProperty("ID")

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

@@ -7,9 +7,9 @@ import jakarta.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 班组判定数据业务新增/修改 Request VO")
+@Schema(description = "管理后台 - 班组判定检测项目数据业务新增/修改 Request VO")
 @Data
-public class BusinessSubParentSampleAssessmentSaveReqVO {
+public class BusinessSubParentSampleAssessmentProjectSaveReqVO {
 
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5014")
     private Long id;

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

@@ -0,0 +1,60 @@
+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 BusinessSubSampleAssessmentPageReqVO extends PageParam {
+
+    @Schema(description = "样品分样ID", example = "29115")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "30256")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "16304")
+    private Long configAssayMethodId;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "1")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
+    @Schema(description = "判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
+    private String assessmentStatus;
+
+    @Schema(description = "是否复测,1-是，0-否")
+    private Integer isRecheck;
+
+    @Schema(description = "是否已上报,1-是，0-否")
+    private Integer isReported;
+
+    @Schema(description = "上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] reportTime;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "6438")
+    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/BusinessSubSampleAssessmentProjectPageReqVO.java

@@ -9,7 +9,7 @@ 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 BusinessSubSampleAssessmentProjectPageReqVO extends PageParam {