修改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/BusinessSubParentSampleAssessmentProjectController.java

@@ -25,82 +25,82 @@ 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.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
-import com.zt.plat.module.qms.business.bus.service.BusinessSubParentSampleAssessmentService;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubParentSampleAssessmentProjectService;
 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-parent-sample-assessment")
+@RequestMapping("/qms/business-sub-parent-sample-assessment-project")
 @Validated
-public class BusinessSubParentSampleAssessmentController implements BusinessControllerMarker {
+public class BusinessSubParentSampleAssessmentProjectController implements BusinessControllerMarker {
 
 
     @Resource
-    private BusinessSubParentSampleAssessmentService businessSubParentSampleAssessmentService;
+    private BusinessSubParentSampleAssessmentProjectService businessSubParentSampleAssessmentProjectService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建班组判定数据业务")
+    @Operation(summary = "创建班组判定检测项目数据业务")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
-    public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
+    public CommonResult<BusinessSubParentSampleAssessmentProjectRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO createReqVO) {
-        return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO));
+        return success(businessSubParentSampleAssessmentProjectService.createBusinessSubParentSampleAssessment(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新班组判定数据业务")
+    @Operation(summary = "更新班组判定检测项目数据业务")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
-    public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO updateReqVO) {
-        businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
+        businessSubParentSampleAssessmentProjectService.updateBusinessSubParentSampleAssessment(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除班组判定数据业务")
+    @Operation(summary = "删除班组判定检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true)
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
-        businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
+        businessSubParentSampleAssessmentProjectService.deleteBusinessSubParentSampleAssessment(id);
         return success(true);
     }
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除班组判定数据业务")
+    @Operation(summary = "批量删除班组判定检测项目数据业务")
                 //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
     public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
-        businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
+        businessSubParentSampleAssessmentProjectService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
         return success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得班组判定数据业务")
+    @Operation(summary = "获得班组判定检测项目数据业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
-    public CommonResult<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
+    public CommonResult<BusinessSubParentSampleAssessmentProjectRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
-        BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id);
+        BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessment(id);
-        return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class));
+        return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentProjectRespVO.class));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得班组判定数据业务分页")
+    @Operation(summary = "获得班组判定检测项目数据业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
-    public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessSubParentSampleAssessmentProjectRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO) {
-        PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
+        PageResult<BusinessSubParentSampleAssessmentProjectDO> pageResult = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class));
+        return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentProjectRespVO.class));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出班组判定数据业务 Excel")
+    @Operation(summary = "导出班组判定检测项目数据业务 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
+    public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList();
+        List<BusinessSubParentSampleAssessmentProjectDO> list = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "班组判定数据业务.xls", "数据", BusinessSubParentSampleAssessmentRespVO.class,
+        ExcelUtils.write(response, "班组判定检测项目数据业务.xls", "数据", BusinessSubParentSampleAssessmentProjectRespVO.class,
-                        BeanUtils.toBean(list, BusinessSubParentSampleAssessmentRespVO.class));
+                        BeanUtils.toBean(list, BusinessSubParentSampleAssessmentProjectRespVO.class));
     }
 
 }

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

@@ -0,0 +1,105 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+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.BusinessSubSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAssessmentService;
+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-assessment")
+@Validated
+public class BusinessSubSampleAssessmentController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessSubSampleAssessmentService businessSubSampleAssessmentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建子样判定业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
+    public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) {
+        return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新子样判定业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
+    public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
+        businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @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) {
+        businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除子样判定业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
+    public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
+        businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得子样判定业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
+        BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id);
+        return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得子样判定业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
+    public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) {
+        PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出子样判定业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessSubSampleAssessmentDO> list = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "子样判定业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class,
+                        BeanUtils.toBean(list, BusinessSubSampleAssessmentRespVO.class));
+    }
+
+}

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 {
 

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

@@ -7,7 +7,7 @@ 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 BusinessSubSampleAssessmentProjectRespVO {

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

@@ -7,7 +7,7 @@ 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 BusinessSubSampleAssessmentProjectSaveReqVO {
 

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

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

@@ -0,0 +1,60 @@
+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 BusinessSubSampleAssessmentSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5736")
+    private Long id;
+
+    @Schema(description = "样品分样ID", example = "29115")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "30256")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16304")
+    @NotNull(message = "检测方法配置ID不能为空")
+    private Long configAssayMethodId;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
+    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 = "上报时间")
+    private LocalDateTime reportTime;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
+    @NotNull(message = "乐观锁不能为空")
+    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/dal/dataobject/BusinessSubParentSampleAssessmentProjectDO.java

@@ -8,12 +8,12 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
-* 班组判定数据业务 DO
+* 班组判定检测项目数据业务 DO
 *
 * @author 后台管理
 */
-@TableName("t_bsn_sb_prn_smp_asmt")
+@TableName("t_bsn_sb_prn_smp_asmt_prj")
-@KeySequence("t_bsn_sb_prn_smp_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@KeySequence("t_bsn_sb_prn_smp_asmt_prj_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -23,7 +23,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO {
+public class BusinessSubParentSampleAssessmentProjectDO extends BusinessBaseDO {
 
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java

@@ -0,0 +1,99 @@
+package com.zt.plat.module.qms.business.bus.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 子样判定业务 DO
+*
+* @author 后台管理
+*/
+@TableName("t_bsn_sb_smp_asmt")
+@KeySequence("t_bsn_sb_smp_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class BusinessSubSampleAssessmentDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 样品分样ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ID")
+    private Long businessSubParentSampleId;
+    /**
+    * 分样子样ID
+    */
+    @TableField("BSN_SB_SMP_ID")
+    private Long businessSubSampleId;
+    /**
+    * 检测方法配置ID
+    */
+    @TableField("CFG_ASY_MTHD_ID")
+    private Long configAssayMethodId;
+    /**
+    * 任务类型,【字典】【jy_sample_task_type】常规、抽查...
+    */
+    @TableField("TSK_TP")
+    private String taskType;
+    /**
+    * 分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...
+    */
+    @TableField("ASY_TP")
+    private String assayType;
+    /**
+    * 判定状态,in_progress-进行中 normal-正常，exceeds_tolerance-超差
+    */
+    @TableField("ASMT_STS")
+    private String assessmentStatus;
+    /**
+    * 是否复测,1-是，0-否
+    */
+    @TableField("IS_RCHK")
+    private Integer isRecheck;
+    /**
+    * 是否已上报,1-是，0-否
+    */
+    @TableField("IS_RPOD")
+    private Integer isReported;
+    /**
+    * 上报人
+    */
+    @TableField("RPTR")
+    private String reporter;
+    /**
+    * 上报时间
+    */
+    @TableField("RPT_TM")
+    private LocalDateTime reportTime;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 乐观锁
+    */
+    @TableField("UPD_CNT")
+    private Integer updateCount;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentProjectDO.java

@@ -8,7 +8,7 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 /**
-* 子样判定数据业务 DO
+* 子样判定检测项目数据业务 DO
 *
 * @author 后台管理
 */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.java

@@ -7,7 +7,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
 import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
@@ -16,57 +16,57 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * 班组判定数据业务 Mapper
+ * 班组判定检测项目数据业务 Mapper
  *
  * @author 后台管理
  */
 @Mapper
-public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapperX<BusinessSubParentSampleAssessmentDO> {
+public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapperX<BusinessSubParentSampleAssessmentProjectDO> {
 
     List<BusinessSubParentSampleAssessmentGroupRespVO> selectUnReportMethodGroupList(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO);
     
-    default PageResult<BusinessSubParentSampleAssessmentDO> selectPage(BusinessSubParentSampleAssessmentPageReqVO reqVO) {
+    default PageResult<BusinessSubParentSampleAssessmentProjectDO> selectPage(BusinessSubParentSampleAssessmentProjectPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
+        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentProjectDO>()
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getUsage, reqVO.getUsage())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getUsage, reqVO.getUsage())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getSymbol, reqVO.getSymbol())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getSymbol, reqVO.getSymbol())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getTaskType, reqVO.getTaskType())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getTaskType, reqVO.getTaskType())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssayType, reqVO.getAssayType())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssayType, reqVO.getAssayType())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDataType, reqVO.getDataType())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDecimalPosition, reqVO.getDecimalPosition())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentValue, reqVO.getAssessmentValue())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssessmentValue, reqVO.getAssessmentValue())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssessmentStatus, reqVO.getAssessmentStatus())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getIsReported, reqVO.getIsReported())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getIsReported, reqVO.getIsReported())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getReporter, reqVO.getReporter())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getReporter, reqVO.getReporter())
-                .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getReportTime, reqVO.getReportTime())
+                .betweenIfPresent(BusinessSubParentSampleAssessmentProjectDO::getReportTime, reqVO.getReportTime())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
-                .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(BusinessSubParentSampleAssessmentProjectDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getUpdateCount, reqVO.getUpdateCount())
-                .eqIfPresent(BusinessSubParentSampleAssessmentDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessSubParentSampleAssessmentDO::getId));
+                .orderByDesc(BusinessSubParentSampleAssessmentProjectDO::getId));
     }
     
-    default List<BusinessSubParentSampleAssessmentExtendRespVO> selectByBusinessSubParentSampleIdAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
+    default List<BusinessSubParentSampleAssessmentProjectExtendRespVO> selectByBusinessSubParentSampleIdAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
-    	return selectJoinList(BusinessSubParentSampleAssessmentExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentDO>()
+    	return selectJoinList(BusinessSubParentSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentProjectDO>()
-    		    .leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodProjectId)
+    		    .leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId)
-    			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentDO::getDictionaryProjectId)
+    			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId)
-    			.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId)
+    			.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId)
-    			.selectAll(BusinessSubParentSampleAssessmentDO.class)
+    			.selectAll(BusinessSubParentSampleAssessmentProjectDO.class)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectUnit)
     			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentProjectExtendRespVO::getDictionaryProjectKey)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentProjectExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentProjectExtendRespVO::getShowName)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessSubSampleAssessmentProjectExtendRespVO::getConfigAssayMethodName)
-    			.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
+    			.in(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
-    			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    			.eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId));
     }
     
-    default List<BusinessSubParentSampleAssessmentDO> selectByConfigAssayMethodId(Long configAssayMethodId) {
+    default List<BusinessSubParentSampleAssessmentProjectDO> selectByConfigAssayMethodId(Long configAssayMethodId) {
-    	return selectList(new LambdaQueryWrapper<BusinessSubParentSampleAssessmentDO>()
+    	return selectList(new LambdaQueryWrapper<BusinessSubParentSampleAssessmentProjectDO>()
-    			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    			.eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId));
     }
 
 	List<NoReportSubParentSampleAssessmentRespVO> selectNoReportSubParentSampleAssessment(@Param("configAssayMethodId") Long configAssayMethodId);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentProjectMapper.java

@@ -4,7 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
@@ -18,12 +18,12 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * 子样判定数据业务 Mapper
+ * 子样判定检测项目数据业务 Mapper
  *
  * @author 后台管理
  */
 @Mapper
-public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessSubSampleAssessmentProjectDO> {
+public interface BusinessSubSampleAssessmentProjectMapper extends BaseMapperX<BusinessSubSampleAssessmentProjectDO> {
 
     default PageResult<BusinessSubSampleAssessmentProjectDO> selectPage(BusinessSubSampleAssessmentProjectPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubSampleAssessmentProjectDO>()

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectService.java

@@ -0,0 +1,62 @@
+package com.zt.plat.module.qms.business.bus.service;
+
+import java.util.*;
+import jakarta.validation.*;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
+import com.zt.plat.framework.common.pojo.PageParam;
+
+/**
+ * 班组判定检测项目数据业务 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface BusinessSubParentSampleAssessmentProjectService {
+
+    /**
+     * 创建班组判定检测项目数据业务
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    BusinessSubParentSampleAssessmentProjectRespVO createBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentProjectSaveReqVO createReqVO);
+
+    /**
+     * 更新班组判定检测项目数据业务
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentProjectSaveReqVO updateReqVO);
+
+    /**
+     * 删除班组判定检测项目数据业务
+     *
+     * @param id 编号
+     */
+    void deleteBusinessSubParentSampleAssessment(Long id);
+
+    /**
+    * 批量删除班组判定检测项目数据业务
+    *
+    * @param ids 编号
+    */
+    void deleteBusinessSubParentSampleAssessmentListByIds(List<Long> ids);
+
+    /**
+     * 获得班组判定检测项目数据业务
+     *
+     * @param id 编号
+     * @return 班组判定检测项目数据业务
+     */
+    BusinessSubParentSampleAssessmentProjectDO getBusinessSubParentSampleAssessment(Long id);
+
+    /**
+     * 获得班组判定检测项目数据业务分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 班组判定检测项目数据业务分页
+     */
+    PageResult<BusinessSubParentSampleAssessmentProjectDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO);
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectServiceImpl.java

@@ -8,39 +8,39 @@ import java.util.*;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
 
 /**
- * 班组判定数据业务 Service 实现类
+ * 班组判定检测项目数据业务 Service 实现类
  *
  * @author 后台管理
  */
 @Service
 @Validated
-public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSubParentSampleAssessmentService {
+public class BusinessSubParentSampleAssessmentProjectServiceImpl implements BusinessSubParentSampleAssessmentProjectService {
 
     @Resource
     private BusinessSubParentSampleAssessmentProjectMapper businessSubParentSampleAssessmentProjectMapper;
 
     @Override
-    public BusinessSubParentSampleAssessmentRespVO createBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
+    public BusinessSubParentSampleAssessmentProjectRespVO createBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentProjectSaveReqVO createReqVO) {
         // 插入
-        BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubParentSampleAssessmentDO.class);
+        BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubParentSampleAssessmentProjectDO.class);
         businessSubParentSampleAssessmentProjectMapper.insert(businessSubParentSampleAssessment);
         // 返回
-        return BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class);
+        return BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentProjectRespVO.class);
     }
 
     @Override
-    public void updateBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
+    public void updateBusinessSubParentSampleAssessment(BusinessSubParentSampleAssessmentProjectSaveReqVO updateReqVO) {
         // 校验存在
         validateBusinessSubParentSampleAssessmentExists(updateReqVO.getId());
         // 更新
-        BusinessSubParentSampleAssessmentDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubParentSampleAssessmentDO.class);
+        BusinessSubParentSampleAssessmentProjectDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubParentSampleAssessmentProjectDO.class);
         businessSubParentSampleAssessmentProjectMapper.updateById(updateObj);
     }
 
@@ -61,7 +61,7 @@ public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSub
         }
 
     private void validateBusinessSubParentSampleAssessmentExists(List<Long> ids) {
-        List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentProjectMapper.selectByIds(ids);
+        List<BusinessSubParentSampleAssessmentProjectDO> list = businessSubParentSampleAssessmentProjectMapper.selectByIds(ids);
         if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
             throw exception(BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS);
         }
@@ -74,12 +74,12 @@ public class BusinessSubParentSampleAssessmentServiceImpl implements BusinessSub
     }
 
     @Override
-    public BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id) {
+    public BusinessSubParentSampleAssessmentProjectDO getBusinessSubParentSampleAssessment(Long id) {
         return businessSubParentSampleAssessmentProjectMapper.selectById(id);
     }
 
     @Override
-    public PageResult<BusinessSubParentSampleAssessmentDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
+    public PageResult<BusinessSubParentSampleAssessmentProjectDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO) {
         return businessSubParentSampleAssessmentProjectMapper.selectPage(pageReqVO);
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentService.java

@@ -1,62 +0,0 @@
-package com.zt.plat.module.qms.business.bus.service;
-
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
-import com.zt.plat.framework.common.pojo.PageParam;
-
-/**
- * 班组判定数据业务 Service 接口
- *
- * @author 后台管理
- */
-public interface BusinessSubParentSampleAssessmentService {
-
-    /**
-     * 创建班组判定数据业务
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    BusinessSubParentSampleAssessmentRespVO createBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentSaveReqVO createReqVO);
-
-    /**
-     * 更新班组判定数据业务
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateBusinessSubParentSampleAssessment(@Valid BusinessSubParentSampleAssessmentSaveReqVO updateReqVO);
-
-    /**
-     * 删除班组判定数据业务
-     *
-     * @param id 编号
-     */
-    void deleteBusinessSubParentSampleAssessment(Long id);
-
-    /**
-    * 批量删除班组判定数据业务
-    *
-    * @param ids 编号
-    */
-    void deleteBusinessSubParentSampleAssessmentListByIds(List<Long> ids);
-
-    /**
-     * 获得班组判定数据业务
-     *
-     * @param id 编号
-     * @return 班组判定数据业务
-     */
-    BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id);
-
-    /**
-     * 获得班组判定数据业务分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 班组判定数据业务分页
-     */
-    PageResult<BusinessSubParentSampleAssessmentDO> getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO);
-
-}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectService.java

@@ -12,14 +12,14 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAsses
 import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
- * 子样判定数据业务 Service 接口
+ * 子样判定检测项目数据业务 Service 接口
  *
  * @author 后台管理
  */
 public interface BusinessSubSampleAssessmentProjectService {
 
     /**
-     * 创建子样判定数据业务
+     * 创建子样判定检测项目数据业务
      *
      * @param createReqVO 创建信息
      * @return 编号
@@ -27,39 +27,39 @@ public interface BusinessSubSampleAssessmentProjectService {
     BusinessSubSampleAssessmentProjectRespVO createBusinessSubSampleAssessment(@Valid BusinessSubSampleAssessmentProjectSaveReqVO createReqVO);
 
     /**
-     * 更新子样判定数据业务
+     * 更新子样判定检测项目数据业务
      *
      * @param updateReqVO 更新信息
      */
     void updateBusinessSubSampleAssessment(@Valid BusinessSubSampleAssessmentProjectSaveReqVO updateReqVO);
 
     /**
-     * 删除子样判定数据业务
+     * 删除子样判定检测项目数据业务
      *
      * @param id 编号
      */
     void deleteBusinessSubSampleAssessment(Long id);
 
     /**
-    * 批量删除子样判定数据业务
+    * 批量删除子样判定检测项目数据业务
     *
     * @param ids 编号
     */
     void deleteBusinessSubSampleAssessmentListByIds(List<Long> ids);
 
     /**
-     * 获得子样判定数据业务
+     * 获得子样判定检测项目数据业务
      *
      * @param id 编号
-     * @return 子样判定数据业务
+     * @return 子样判定检测项目数据业务
      */
     BusinessSubSampleAssessmentProjectDO getBusinessSubSampleAssessment(Long id);
 
     /**
-     * 获得子样判定数据业务分页
+     * 获得子样判定检测项目数据业务分页
      *
      * @param pageReqVO 分页查询
-     * @return 子样判定数据业务分页
+     * @return 子样判定检测项目数据业务分页
      */
     PageResult<BusinessSubSampleAssessmentProjectDO> getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentProjectPageReqVO pageReqVO);
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.*;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentProjectMapper;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
@@ -22,7 +22,7 @@ import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffL
 import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
 
 /**
- * 子样判定数据业务 Service 实现类
+ * 子样判定检测项目数据业务 Service 实现类
  *
  * @author 后台管理
  */
@@ -31,13 +31,13 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
 public class BusinessSubSampleAssessmentProjectServiceImpl implements BusinessSubSampleAssessmentProjectService {
 
     @Resource
-    private BusinessSubSampleAssessmentMapper businessSubSampleAssessmentMapper;
+    private BusinessSubSampleAssessmentProjectMapper businessSubSampleAssessmentProjectMapper;
 
     @Override
     public BusinessSubSampleAssessmentProjectRespVO createBusinessSubSampleAssessment(BusinessSubSampleAssessmentProjectSaveReqVO createReqVO) {
         // 插入
         BusinessSubSampleAssessmentProjectDO businessSubSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubSampleAssessmentProjectDO.class);
-        businessSubSampleAssessmentMapper.insert(businessSubSampleAssessment);
+        businessSubSampleAssessmentProjectMapper.insert(businessSubSampleAssessment);
         // 返回
         return BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentProjectRespVO.class);
     }
@@ -48,7 +48,7 @@ public class BusinessSubSampleAssessmentProjectServiceImpl implements BusinessSu
         validateBusinessSubSampleAssessmentExists(updateReqVO.getId());
         // 更新
         BusinessSubSampleAssessmentProjectDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubSampleAssessmentProjectDO.class);
-        businessSubSampleAssessmentMapper.updateById(updateObj);
+        businessSubSampleAssessmentProjectMapper.updateById(updateObj);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class BusinessSubSampleAssessmentProjectServiceImpl implements BusinessSu
         // 校验存在
         validateBusinessSubSampleAssessmentExists(id);
         // 删除
-        businessSubSampleAssessmentMapper.deleteById(id);
+        businessSubSampleAssessmentProjectMapper.deleteById(id);
     }
 
     @Override
@@ -64,30 +64,30 @@ public class BusinessSubSampleAssessmentProjectServiceImpl implements BusinessSu
         // 校验存在
         validateBusinessSubSampleAssessmentExists(ids);
         // 删除
-        businessSubSampleAssessmentMapper.deleteByIds(ids);
+        businessSubSampleAssessmentProjectMapper.deleteByIds(ids);
         }
 
     private void validateBusinessSubSampleAssessmentExists(List<Long> ids) {
-        List<BusinessSubSampleAssessmentProjectDO> list = businessSubSampleAssessmentMapper.selectByIds(ids);
+        List<BusinessSubSampleAssessmentProjectDO> list = businessSubSampleAssessmentProjectMapper.selectByIds(ids);
         if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
-            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS);
+            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS);
         }
     }
 
     private void validateBusinessSubSampleAssessmentExists(Long id) {
-        if (businessSubSampleAssessmentMapper.selectById(id) == null) {
+        if (businessSubSampleAssessmentProjectMapper.selectById(id) == null) {
-            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS);
+            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS);
         }
     }
 
     @Override
     public BusinessSubSampleAssessmentProjectDO getBusinessSubSampleAssessment(Long id) {
-        return businessSubSampleAssessmentMapper.selectById(id);
+        return businessSubSampleAssessmentProjectMapper.selectById(id);
     }
 
     @Override
     public PageResult<BusinessSubSampleAssessmentProjectDO> getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentProjectPageReqVO pageReqVO) {
-        return businessSubSampleAssessmentMapper.selectPage(pageReqVO);
+        return businessSubSampleAssessmentProjectMapper.selectPage(pageReqVO);
     }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentService.java

@@ -0,0 +1,62 @@
+package com.zt.plat.module.qms.business.bus.service;
+
+import java.util.*;
+import jakarta.validation.*;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
+import com.zt.plat.framework.common.pojo.PageParam;
+
+/**
+ * 子样判定业务 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface BusinessSubSampleAssessmentService {
+
+    /**
+     * 创建子样判定业务
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    BusinessSubSampleAssessmentRespVO createBusinessSubSampleAssessment(@Valid BusinessSubSampleAssessmentSaveReqVO createReqVO);
+
+    /**
+     * 更新子样判定业务
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateBusinessSubSampleAssessment(@Valid BusinessSubSampleAssessmentSaveReqVO updateReqVO);
+
+    /**
+     * 删除子样判定业务
+     *
+     * @param id 编号
+     */
+    void deleteBusinessSubSampleAssessment(Long id);
+
+    /**
+    * 批量删除子样判定业务
+    *
+    * @param ids 编号
+    */
+    void deleteBusinessSubSampleAssessmentListByIds(List<Long> ids);
+
+    /**
+     * 获得子样判定业务
+     *
+     * @param id 编号
+     * @return 子样判定业务
+     */
+    BusinessSubSampleAssessmentDO getBusinessSubSampleAssessment(Long id);
+
+    /**
+     * 获得子样判定业务分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 子样判定业务分页
+     */
+    PageResult<BusinessSubSampleAssessmentDO> getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentPageReqVO pageReqVO);
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentServiceImpl.java

@@ -0,0 +1,91 @@
+package com.zt.plat.module.qms.business.bus.service;
+
+import cn.hutool.core.collection.CollUtil;
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper;
+
+import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
+import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
+
+/**
+ * 子样判定业务 Service 实现类
+ *
+ * @author 后台管理
+ */
+@Service
+@Validated
+public class BusinessSubSampleAssessmentServiceImpl implements BusinessSubSampleAssessmentService {
+
+    @Resource
+    private BusinessSubSampleAssessmentMapper businessSubSampleAssessmentMapper;
+
+    @Override
+    public BusinessSubSampleAssessmentRespVO createBusinessSubSampleAssessment(BusinessSubSampleAssessmentSaveReqVO createReqVO) {
+        // 插入
+        BusinessSubSampleAssessmentDO businessSubSampleAssessment = BeanUtils.toBean(createReqVO, BusinessSubSampleAssessmentDO.class);
+        businessSubSampleAssessmentMapper.insert(businessSubSampleAssessment);
+        // 返回
+        return BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class);
+    }
+
+    @Override
+    public void updateBusinessSubSampleAssessment(BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateBusinessSubSampleAssessmentExists(updateReqVO.getId());
+        // 更新
+        BusinessSubSampleAssessmentDO updateObj = BeanUtils.toBean(updateReqVO, BusinessSubSampleAssessmentDO.class);
+        businessSubSampleAssessmentMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteBusinessSubSampleAssessment(Long id) {
+        // 校验存在
+        validateBusinessSubSampleAssessmentExists(id);
+        // 删除
+        businessSubSampleAssessmentMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteBusinessSubSampleAssessmentListByIds(List<Long> ids) {
+        // 校验存在
+        validateBusinessSubSampleAssessmentExists(ids);
+        // 删除
+        businessSubSampleAssessmentMapper.deleteByIds(ids);
+        }
+
+    private void validateBusinessSubSampleAssessmentExists(List<Long> ids) {
+        List<BusinessSubSampleAssessmentDO> list = businessSubSampleAssessmentMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS);
+        }
+    }
+
+    private void validateBusinessSubSampleAssessmentExists(Long id) {
+        if (businessSubSampleAssessmentMapper.selectById(id) == null) {
+            throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public BusinessSubSampleAssessmentDO getBusinessSubSampleAssessment(Long id) {
+        return businessSubSampleAssessmentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<BusinessSubSampleAssessmentDO> getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentPageReqVO pageReqVO) {
+        return businessSubSampleAssessmentMapper.selectPage(pageReqVO);
+    }
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java

@@ -41,7 +41,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetai
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
@@ -59,7 +59,7 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParame
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleMapper;
 import com.zt.plat.module.qms.business.config.controller.vo.*;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectAssessmentDO;
@@ -139,7 +139,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 //	private BusinessTeamAssessmentMapper businessTeamAssessmentMapper;
 	
 	@Resource
-	private BusinessSubSampleAssessmentMapper businessSubSampleAssessmentMapper;
+	private BusinessSubSampleAssessmentProjectMapper businessSubSampleAssessmentProjectMapper;
 	
 	@Resource
 	private ConfigAssayMethodProjectMapper configAssayMethodProjectMapper;
@@ -186,7 +186,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			//为空则未添加过判定记录
 			if (assessmentMap == null) {
 				if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(businessAssayTaskDataExtendRespVO.getAssayType())) {//平行
-					List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessAssayTaskDataExtendRespVO.getBusinessSubSampleId(), configAssayMethodId);
+					List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessAssayTaskDataExtendRespVO.getBusinessSubSampleId(), configAssayMethodId);
 					for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessment : businessSubSampleAssessmentList) {
 						businessAssayTaskDataAssessmentMap.put("id", businessSubSampleAssessment.getId());
 						businessAssayTaskDataAssessmentMap.put("assessmentStatus", businessSubSampleAssessment.getAssessmentStatus());
@@ -257,7 +257,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		}
 		
 		//查询判定值
-		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
+		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
 		
 		for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessment : businessSubSampleAssessmentList) {
 			Map<String, Object> businessSubSampleAssessmentMap = BeanUtil.beanToMap(businessSubSampleAssessment);
@@ -467,7 +467,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 							List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>().eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessAssayTaskDataDO.getConfigAssayMethodId()).eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessAssayProjectDataDO.getConfigAssayMethodProjectId()));
 
 							//查询判定结果数据
-							BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
+							BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
 							if (businessSubSampleAssessmentProjectDO == null) {
 								businessSubSampleAssessmentProjectDO = new BusinessSubSampleAssessmentProjectDO();
 
@@ -545,7 +545,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 					for (BusinessAssayProjectDataDO businessAssayProjectDataDO : businessAssayProjectDataDOList) {
 
 						//查询判定结果数据
-						BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
+						BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
 						if (businessSubSampleAssessmentProjectDO == null) {
 							businessSubSampleAssessmentProjectDO = new BusinessSubSampleAssessmentProjectDO();
 
@@ -600,10 +600,10 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		
 		//插入平行判定记录
 		if (saveBusinessSubSampleAssessmentDOList.size() > 0) {
-			businessSubSampleAssessmentMapper.insertBatch(saveBusinessSubSampleAssessmentDOList);
+			businessSubSampleAssessmentProjectMapper.insertBatch(saveBusinessSubSampleAssessmentDOList);
 		}
 		if (updateBusinessSubSampleAssessmentDOList.size() > 0) {
-			businessSubSampleAssessmentMapper.updateBatch(updateBusinessSubSampleAssessmentDOList);
+			businessSubSampleAssessmentProjectMapper.updateBatch(updateBusinessSubSampleAssessmentDOList);
 		}
 		
 		//插入双杯判定记录
@@ -694,12 +694,12 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 //		List<BusinessAssayReportDataDO> saveBusinessAssayReportDataDOList = new ArrayList<>();
 //		List<BusinessAssayReportDataDO> updateBusinessAssayReportDataDOList = new ArrayList<>();
 		
-		List<BusinessSubParentSampleAssessmentDO> businessSubParentSampleAssessmentDOList = new ArrayList<>();
+		List<BusinessSubParentSampleAssessmentProjectDO> businessSubParentSampleAssessmentDOList = new ArrayList<>();
 		
 		//分析任务已全部上报
 		List<BusinessAssayTaskDataDO> reportedList = businessAssayTaskDataMapper.selectIsReportedList(null, businessSubSampleId, configAssayMethodId, QmsCommonConstant.YES);
 		//判定结果
-		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
+		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
 		
 		List<Long> businessSubSampleAssessmentIdList = businessSubSampleAssessmentList.stream().map(m -> m.getId()).collect(Collectors.toList());
 		
@@ -717,23 +717,23 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		ConfigSubSampleParentMethodDO configSubSampleParentMethodDO = configSubSampleParentMethodMapper.selectByConfigSubSampleParentIdAndConfigAssayMethodId(businessSubParentSampleDO.getConfigSubSampleParentId(), configAssayMethodId);
 		
 		//循环判定值
-		BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO = null;
+		BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessmentProjectDO = null;
 		for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessment : businessSubSampleAssessmentList) {
-			businessSubParentSampleAssessmentDO = new BusinessSubParentSampleAssessmentDO();
+			businessSubParentSampleAssessmentProjectDO = new BusinessSubParentSampleAssessmentProjectDO();
-			businessSubParentSampleAssessmentDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId());
+			businessSubParentSampleAssessmentProjectDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId());
-			businessSubParentSampleAssessmentDO.setAssessmentStatus(QmsCommonConstant.NORMAL);
+			businessSubParentSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL);
-			businessSubParentSampleAssessmentDO.setAssessmentValue(businessSubSampleAssessment.getAssessmentValue());
+			businessSubParentSampleAssessmentProjectDO.setAssessmentValue(businessSubSampleAssessment.getAssessmentValue());
-			businessSubParentSampleAssessmentDO.setTaskType(businessSubSampleAssessment.getTaskType());
+			businessSubParentSampleAssessmentProjectDO.setTaskType(businessSubSampleAssessment.getTaskType());
-			businessSubParentSampleAssessmentDO.setAssayType(businessSubSampleAssessment.getAssayType());
+			businessSubParentSampleAssessmentProjectDO.setAssayType(businessSubSampleAssessment.getAssayType());
-			businessSubParentSampleAssessmentDO.setDataType(businessSubSampleAssessment.getDataType());
+			businessSubParentSampleAssessmentProjectDO.setDataType(businessSubSampleAssessment.getDataType());
-			businessSubParentSampleAssessmentDO.setDecimalPosition(businessSubSampleAssessment.getDecimalPosition());
+			businessSubParentSampleAssessmentProjectDO.setDecimalPosition(businessSubSampleAssessment.getDecimalPosition());
-			businessSubParentSampleAssessmentDO.setUsage(businessSubSampleAssessment.getUsage());
+			businessSubParentSampleAssessmentProjectDO.setUsage(businessSubSampleAssessment.getUsage());
-			businessSubParentSampleAssessmentDO.setMinimumLimitValue(businessSubParentSampleAssessmentDO.getMinimumLimitValue());
+			businessSubParentSampleAssessmentProjectDO.setMinimumLimitValue(businessSubParentSampleAssessmentProjectDO.getMinimumLimitValue());
-			businessSubParentSampleAssessmentDO.setConfigAssayMethodId(businessSubSampleAssessment.getConfigAssayMethodId());
+			businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodId(businessSubSampleAssessment.getConfigAssayMethodId());
-			businessSubParentSampleAssessmentDO.setConfigAssayMethodProjectId(businessSubSampleAssessment.getConfigAssayMethodProjectId());
+			businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodProjectId(businessSubSampleAssessment.getConfigAssayMethodProjectId());
-			businessSubParentSampleAssessmentDO.setDictionaryProjectId(businessSubSampleAssessment.getDictionaryProjectId());
+			businessSubParentSampleAssessmentProjectDO.setDictionaryProjectId(businessSubSampleAssessment.getDictionaryProjectId());
 			
-			businessSubParentSampleAssessmentDOList.add(businessSubParentSampleAssessmentDO);
+			businessSubParentSampleAssessmentDOList.add(businessSubParentSampleAssessmentProjectDO);
 		}
 		
 		
@@ -832,7 +832,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			businessSubParentSampleAssessmentProjectMapper.insertBatch(businessSubParentSampleAssessmentDOList);
 		}
 		
-		businessSubSampleAssessmentMapper.update(new LambdaUpdateWrapper<BusinessSubSampleAssessmentProjectDO>()
+		businessSubSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper<BusinessSubSampleAssessmentProjectDO>()
 				.set(BusinessSubSampleAssessmentProjectDO::getIsReported, QmsCommonConstant.YES)
 				.set(BusinessSubSampleAssessmentProjectDO::getReporter, nickName)
 				.set(BusinessSubSampleAssessmentProjectDO::getReportTime, LocalDateTime.now())
@@ -924,7 +924,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		
 		//修改判定状态
 		//查询判定值
-		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
+		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId);
 		for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessmentProjectExtendRespVO : businessSubSampleAssessmentList) {
 			businessSubSampleAssessmentProjectExtendRespVO.setAssessmentValue(null);
 			businessSubSampleAssessmentProjectExtendRespVO.setAssessmentStatus(QmsCommonConstant.IN_PROGRESS);
@@ -941,7 +941,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		}
 		if (businessSubSampleAssessmentList.size() > 0) {
 			List<BusinessSubSampleAssessmentProjectDO> businessSubSampleAssessmentDOList = BeanUtil.copyToList(businessSubSampleAssessmentList, BusinessSubSampleAssessmentProjectDO.class);
-			businessSubSampleAssessmentMapper.updateBatch(businessSubSampleAssessmentDOList);
+			businessSubSampleAssessmentProjectMapper.updateBatch(businessSubSampleAssessmentDOList);
 		}
 		
 	}
@@ -952,7 +952,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public JSONObject modifyParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId, Long businessSubSampleAssessmentId, List<Long> businessAssayProjectDataIds) {
-		BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentMapper.selectById(businessSubSampleAssessmentId);
+		BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentProjectMapper.selectById(businessSubSampleAssessmentId);
 		//查询子样
 		BusinessSubSampleDO businessSubSampleDO = businessSubSampleMapper.selectById(businessSubSampleId);
 		//查询子样与方法的配置
@@ -1029,7 +1029,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
         }
 		
         //更新判定值
-        businessSubSampleAssessmentMapper.updateById(businessSubSampleAssessmentProjectDO);
+        businessSubSampleAssessmentProjectMapper.updateById(businessSubSampleAssessmentProjectDO);
         //更新检测项目
         businessAssayProjectDataMapper.updateBatch(businessAssayProjectDataDOList);
 		

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.module.qms.business.bus.controller.vo.BatchResultDataReportingReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleAssessmentExtendRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleAssessmentProjectExtendRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleAssessmentGroupReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleAssessmentGroupRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentProjectExtendRespVO;
@@ -36,7 +36,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDa
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
@@ -50,7 +50,7 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessBaseSampleMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAnalysisGroupMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRecheckMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
@@ -90,7 +90,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 	private BusinessSubParentSampleAssessmentProjectMapper businessSubParentSampleAssessmentProjectMapper;
 	
 	@Resource
-	private BusinessSubSampleAssessmentMapper businessSubSampleAssessmentMapper;
+	private BusinessSubSampleAssessmentProjectMapper businessSubSampleAssessmentProjectMapper;
 	
 	@Resource
 	private BusinessSubParentSampleMapper businessSubParentSampleMapper;
@@ -134,7 +134,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		//分样id列表
 		List<Long> businessSubParentSampleIds = noReportSubParentSampleAssessmentRespList.stream().map(m -> m.getBusinessSubParentSampleId()).collect(Collectors.toList());
 		//报送的检测项目数据
-		List<BusinessSubParentSampleAssessmentExtendRespVO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
+		List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
 		//获取分析任务数
 		List<BusinessAssayTaskDataDO> businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
 		List<Long> businessSubSampleIds = businessAssayTaskDataDOList.stream().map(m -> m.getBusinessSubSampleId()).distinct().collect(Collectors.toList());
@@ -142,7 +142,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		List<BusinessSubSampleDO> businessSubSampleDOList = businessSubSampleMapper.selectByIds(businessSubSampleIds);
 		
 		//获取结果判定数据
-		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendRespVOList = businessSubSampleAssessmentMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
+		List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendRespVOList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
 		
 		//获取复测业务数据
 		List<BusinessSubSampleParentRecheckDO> businessSubSampleParentRecheckDOList = businessSubSampleParentRecheckMapper.selectByRecheckBusinessSubParentSampleIdsAndRecheckConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId);
@@ -155,10 +155,10 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 
 			Map<String, Object> subSampleAssessmentBeforeMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class);
 			Map<String, Object> subSampleAssessmentMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class);
-			List<BusinessSubParentSampleAssessmentExtendRespVO> curBusinessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).collect(Collectors.toList());
+			List<BusinessSubParentSampleAssessmentProjectExtendRespVO> curBusinessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).collect(Collectors.toList());
 			noReportSubParentSampleAssessmentMap.put("configAssayMethodName", "报出结果");
 			StringBuilder businessSubParentSampleAssessmentIds = new StringBuilder();
-			for (BusinessSubParentSampleAssessmentExtendRespVO businessSubParentSampleAssessmentDO : curBusinessSubParentSampleAssessmentDOList) {
+			for (BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentDO : curBusinessSubParentSampleAssessmentDOList) {
 				noReportSubParentSampleAssessmentMap.put(businessSubParentSampleAssessmentDO.getSimpleName(), businessSubParentSampleAssessmentDO.getAssessmentValue());
 				businessSubParentSampleAssessmentIds.append(businessSubParentSampleAssessmentDO.getId()).append(",");
 			}
@@ -170,7 +170,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 			BusinessSubSampleParentRecheckDO businessSubSampleParentRecheckDO = businessSubSampleParentRecheckDOList.stream().filter(f -> f.getRecheckBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).findFirst().orElse(null);
 			if (businessSubSampleParentRecheckDO != null) {
 				
-				List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendBeforeList = businessSubSampleAssessmentMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubSampleParentRecheckDO.getBusinessSubParentSampleId(), businessSubSampleParentRecheckDO.getConfigAssayMethodId());
+				List<BusinessSubSampleAssessmentProjectExtendRespVO> businessSubSampleAssessmentExtendBeforeList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubSampleParentRecheckDO.getBusinessSubParentSampleId(), businessSubSampleParentRecheckDO.getConfigAssayMethodId());
 				StringBuilder businessSubSampleAssessmentIdsBefore = new StringBuilder();
 				for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessmentProjectExtendRespVO : businessSubSampleAssessmentExtendBeforeList) {
 					subSampleAssessmentBeforeMap.put("configAssayMethodName", businessSubSampleAssessmentProjectExtendRespVO.getConfigAssayMethodName());
@@ -427,7 +427,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		List<BusinessAssayReportDataDO> saveBusinessAssayReportDataDOList = new ArrayList<>();
 		List<BusinessAssayReportDataDO> updateBusinessAssayReportDataDOList = new ArrayList<>();
 		
-		List<BusinessSubParentSampleAssessmentExtendRespVO> businessSubParentSampleAssessmentExtendList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleIds(), reqVO.getConfigAssayMethodId());
+		List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentExtendList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleIds(), reqVO.getConfigAssayMethodId());
 		
 		List<BusinessSubParentSampleDO> businessSubParentSampleDOList = businessSubParentSampleMapper.selectByIds(reqVO.getBusinessSubParentSampleIds());		
 
@@ -472,8 +472,8 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 					assayDataJson = JSON.parseObject(assayData);
 				}
 				//循环判定值
-				List<BusinessSubParentSampleAssessmentExtendRespVO> businessSubParentSampleAssessmentList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(businessSubParentSampleDO.getId())).collect(Collectors.toList());
+				List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(businessSubParentSampleDO.getId())).collect(Collectors.toList());
-				for (BusinessSubParentSampleAssessmentExtendRespVO businessSubParentSampleAssessment : businessSubParentSampleAssessmentList) {
+				for (BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessment : businessSubParentSampleAssessmentList) {
 					Long configAssayMethodProjectId = businessSubParentSampleAssessment.getConfigAssayMethodProjectId();
 					List<ConfigProjectExtendRespVO> configProjectFeildList = configProjectList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectId)).collect(Collectors.toList());
 					for (ConfigProjectExtendRespVO configProjectFeild : configProjectFeildList) {
@@ -566,11 +566,11 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		
 		List<Long> businessSubParentSampleAssessmentIdList = businessSubParentSampleAssessmentExtendList.stream().map(m -> m.getId()).collect(Collectors.toList());
 
-		businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper<BusinessSubParentSampleAssessmentDO>()
+		businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper<BusinessSubParentSampleAssessmentProjectDO>()
-				.set(BusinessSubParentSampleAssessmentDO::getIsReported, QmsCommonConstant.YES)
+				.set(BusinessSubParentSampleAssessmentProjectDO::getIsReported, QmsCommonConstant.YES)
-				.set(BusinessSubParentSampleAssessmentDO::getReporter, nickName)
+				.set(BusinessSubParentSampleAssessmentProjectDO::getReporter, nickName)
-				.set(BusinessSubParentSampleAssessmentDO::getReportTime, LocalDateTime.now())
+				.set(BusinessSubParentSampleAssessmentProjectDO::getReportTime, LocalDateTime.now())
-				.in(BusinessSubParentSampleAssessmentDO::getId, businessSubParentSampleAssessmentIdList));
+				.in(BusinessSubParentSampleAssessmentProjectDO::getId, businessSubParentSampleAssessmentIdList));
 		
 		if (updateBusinessSubSampleDOList.size() > 0) {
 
@@ -592,11 +592,11 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 	public void modifySampleResultReporting(ModifySampleResultReportingReqVO reqVO) {
 		List<String> businessSubParentSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubParentSampleAssessmentIds().split(","));
 		List<String> businessSubSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubSampleAssessmentIds().split(","));
-		List<BusinessSubParentSampleAssessmentDO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentIdList);
+		List<BusinessSubParentSampleAssessmentProjectDO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentIdList);
-		List<BusinessSubSampleAssessmentProjectDO> businessSubSampleAssessmentDOList = businessSubSampleAssessmentMapper.selectByIds(businessSubSampleAssessmentIdList);
+		List<BusinessSubSampleAssessmentProjectDO> businessSubSampleAssessmentDOList = businessSubSampleAssessmentProjectMapper.selectByIds(businessSubSampleAssessmentIdList);
-		for (BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO : businessSubParentSampleAssessmentDOList) {
+		for (BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessmentProjectDO : businessSubParentSampleAssessmentDOList) {
-			BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentDOList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubParentSampleAssessmentDO.getDictionaryProjectId())).findFirst().orElse(null);
+			BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentDOList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubParentSampleAssessmentProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
-			businessSubParentSampleAssessmentDO.setAssessmentValue(businessSubSampleAssessmentProjectDO.getAssessmentValue());
+			businessSubParentSampleAssessmentProjectDO.setAssessmentValue(businessSubSampleAssessmentProjectDO.getAssessmentValue());
 		}
 		businessSubParentSampleAssessmentProjectMapper.updateBatch(businessSubParentSampleAssessmentDOList);
 	}

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentMapper">
+<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>