From 918f8465a95243b93ac43e724a64e2f95f93d36e Mon Sep 17 00:00:00 2001 From: wxr Date: Fri, 21 Nov 2025 11:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9T=5FBSN=5FSB=5FPRN=5FSMP=5FAS?= =?UTF-8?q?MT=E8=A1=A8=E5=90=8D=E5=88=B0T=5FBSN=5FSB=5FPRN=5FSMP=5FASMT=5F?= =?UTF-8?q?PRJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/ErrorCodeConstants.java | 5 +- ...entSampleAssessmentProjectController.java} | 58 +++++----- ...BusinessSubSampleAssessmentController.java | 105 ++++++++++++++++++ ...sSubSampleAssessmentProjectController.java | 18 +-- ...tSampleAssessmentProjectExtendRespVO.java} | 2 +- ...rentSampleAssessmentProjectPageReqVO.java} | 4 +- ...bParentSampleAssessmentProjectRespVO.java} | 4 +- ...rentSampleAssessmentProjectSaveReqVO.java} | 4 +- .../BusinessSubSampleAssessmentPageReqVO.java | 60 ++++++++++ ...ssSubSampleAssessmentProjectPageReqVO.java | 2 +- ...inessSubSampleAssessmentProjectRespVO.java | 2 +- ...ssSubSampleAssessmentProjectSaveReqVO.java | 2 +- .../vo/BusinessSubSampleAssessmentRespVO.java | 75 +++++++++++++ .../BusinessSubSampleAssessmentSaveReqVO.java | 60 ++++++++++ ...ssSubParentSampleAssessmentProjectDO.java} | 8 +- .../BusinessSubSampleAssessmentDO.java | 99 +++++++++++++++++ .../BusinessSubSampleAssessmentProjectDO.java | 2 +- ...ubParentSampleAssessmentProjectMapper.java | 72 ++++++------ ...nessSubSampleAssessmentProjectMapper.java} | 6 +- ...bParentSampleAssessmentProjectService.java | 62 +++++++++++ ...ntSampleAssessmentProjectServiceImpl.java} | 22 ++-- ...inessSubParentSampleAssessmentService.java | 62 ----------- ...nessSubSampleAssessmentProjectService.java | 18 +-- ...SubSampleAssessmentProjectServiceImpl.java | 26 ++--- .../BusinessSubSampleAssessmentService.java | 62 +++++++++++ ...usinessSubSampleAssessmentServiceImpl.java | 91 +++++++++++++++ .../SampleAnalysisAuditServiceImpl.java | 62 +++++------ .../SampleResultReportingServiceImpl.java | 44 ++++---- ...ubParentSampleAssessmentProjectMapper.xml} | 2 +- .../BusinessSubSampleAssessmentMapper.xml | 12 ++ 30 files changed, 808 insertions(+), 243 deletions(-) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/{BusinessSubParentSampleAssessmentController.java => BusinessSubParentSampleAssessmentProjectController.java} (54%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/{BusinessSubParentSampleAssessmentExtendRespVO.java => BusinessSubParentSampleAssessmentProjectExtendRespVO.java} (82%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/{BusinessSubParentSampleAssessmentPageReqVO.java => BusinessSubParentSampleAssessmentProjectPageReqVO.java} (93%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/{BusinessSubParentSampleAssessmentRespVO.java => BusinessSubParentSampleAssessmentProjectRespVO.java} (96%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/{BusinessSubParentSampleAssessmentSaveReqVO.java => BusinessSubParentSampleAssessmentProjectSaveReqVO.java} (95%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/{BusinessSubParentSampleAssessmentDO.java => BusinessSubParentSampleAssessmentProjectDO.java} (89%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/{BusinessSubSampleAssessmentMapper.java => BusinessSubSampleAssessmentProjectMapper.java} (97%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectService.java rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/{BusinessSubParentSampleAssessmentServiceImpl.java => BusinessSubParentSampleAssessmentProjectServiceImpl.java} (68%) delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentServiceImpl.java rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/{BusinessSubParentSampleAssessmentMapper.xml => BusinessSubParentSampleAssessmentProjectMapper.xml} (99%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 0b1af9c..75b28ba 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/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, "分样复检业务数据不存在"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentProjectController.java similarity index 54% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentProjectController.java index 3772c1e..d6e9225 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java +++ b/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.service.BusinessSubParentSampleAssessmentService; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO; +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 createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) { - return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO)); + public CommonResult createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO createReqVO) { + return success(businessSubParentSampleAssessmentProjectService.createBusinessSubParentSampleAssessment(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新班组判定数据业务") + @Operation(summary = "更新班组判定检测项目数据业务") //@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')") - public CommonResult updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) { - businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO); + public CommonResult updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentProjectSaveReqVO 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 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 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 getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { - BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id); - return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class)); + public CommonResult getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) { + BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessment(id); + 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> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) { - PageResult pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class)); + public CommonResult> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO) { + PageResult pageResult = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO); + 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 list = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList(); + List list = businessSubParentSampleAssessmentProjectService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "班组判定数据业务.xls", "数据", BusinessSubParentSampleAssessmentRespVO.class, - BeanUtils.toBean(list, BusinessSubParentSampleAssessmentRespVO.class)); + ExcelUtils.write(response, "班组判定检测项目数据业务.xls", "数据", BusinessSubParentSampleAssessmentProjectRespVO.class, + BeanUtils.toBean(list, BusinessSubParentSampleAssessmentProjectRespVO.class)); } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentController.java new file mode 100644 index 0000000..de60e89 --- /dev/null +++ b/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 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 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 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 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 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> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) { + PageResult 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 list = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "子样判定业务.xls", "数据", BusinessSubSampleAssessmentRespVO.class, + BeanUtils.toBean(list, BusinessSubSampleAssessmentRespVO.class)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentProjectController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentProjectController.java index 85b54df..5705318 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAssessmentProjectController.java +++ b/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 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 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 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 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 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> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentProjectPageReqVO pageReqVO) { PageResult 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 list = businessSubSampleAssessmentProjectService.getBusinessSubSampleAssessmentPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "子样判定数据业务.xls", "数据", BusinessSubSampleAssessmentProjectRespVO.class, + ExcelUtils.write(response, "子样判定检测项目数据业务.xls", "数据", BusinessSubSampleAssessmentProjectRespVO.class, BeanUtils.toBean(list, BusinessSubSampleAssessmentProjectRespVO.class)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentExtendRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectExtendRespVO.java similarity index 82% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentExtendRespVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectExtendRespVO.java index 7ca9494..8d6001e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentExtendRespVO.java +++ b/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; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectPageReqVO.java similarity index 93% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentPageReqVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectPageReqVO.java index b0ba2e4..b284293 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentPageReqVO.java +++ b/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; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectRespVO.java similarity index 96% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentRespVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectRespVO.java index 26572f0..50f1eb4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentRespVO.java +++ b/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") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectSaveReqVO.java similarity index 95% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentSaveReqVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentProjectSaveReqVO.java index 436b51a..78b1a6f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentSaveReqVO.java +++ b/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; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java new file mode 100644 index 0000000..e4f8425 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectPageReqVO.java index 36f2529..81741e1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectPageReqVO.java +++ b/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 { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectRespVO.java index 54c945a..bbc7ad8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectRespVO.java +++ b/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 { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectSaveReqVO.java index c351357..a046c95 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentProjectSaveReqVO.java +++ b/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 { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java new file mode 100644 index 0000000..01a803d --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java new file mode 100644 index 0000000..34e3c88 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentProjectDO.java similarity index 89% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentDO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentProjectDO.java index 4db2d23..91d8df9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentDO.java +++ b/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") -@KeySequence("t_bsn_sb_prn_smp_asmt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("t_bsn_sb_prn_smp_asmt_prj") +@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 { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentDO.java new file mode 100644 index 0000000..bdff5f4 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentProjectDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentProjectDO.java index 8aae5ce..0c3dc00 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleAssessmentProjectDO.java +++ b/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 后台管理 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.java index 2af28b4..c410af6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.java +++ b/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 { +public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapperX { List selectUnReportMethodGroupList(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO); - default PageResult selectPage(BusinessSubParentSampleAssessmentPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDictionaryProjectId, reqVO.getDictionaryProjectId()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getUsage, reqVO.getUsage()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getSymbol, reqVO.getSymbol()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getTaskType, reqVO.getTaskType()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssayType, reqVO.getAssayType()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDataType, reqVO.getDataType()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getDecimalPosition, reqVO.getDecimalPosition()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentValue, reqVO.getAssessmentValue()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getAssessmentStatus, reqVO.getAssessmentStatus()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getIsReported, reqVO.getIsReported()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getReporter, reqVO.getReporter()) - .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getReportTime, reqVO.getReportTime()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .betweenIfPresent(BusinessSubParentSampleAssessmentDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getUpdateCount, reqVO.getUpdateCount()) - .eqIfPresent(BusinessSubParentSampleAssessmentDO::getRemark, reqVO.getRemark()) - .orderByDesc(BusinessSubParentSampleAssessmentDO::getId)); + default PageResult selectPage(BusinessSubParentSampleAssessmentProjectPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, reqVO.getDictionaryProjectId()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getUsage, reqVO.getUsage()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getSymbol, reqVO.getSymbol()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getTaskType, reqVO.getTaskType()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssayType, reqVO.getAssayType()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDataType, reqVO.getDataType()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDecimalPosition, reqVO.getDecimalPosition()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssessmentValue, reqVO.getAssessmentValue()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getAssessmentStatus, reqVO.getAssessmentStatus()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getIsReported, reqVO.getIsReported()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getReporter, reqVO.getReporter()) + .betweenIfPresent(BusinessSubParentSampleAssessmentProjectDO::getReportTime, reqVO.getReportTime()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessSubParentSampleAssessmentProjectDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessSubParentSampleAssessmentProjectDO::getId)); } - default List selectByBusinessSubParentSampleIdAndConfigAssayMethodId(List businessSubParentSampleIds, Long configAssayMethodId) { - return selectJoinList(BusinessSubParentSampleAssessmentExtendRespVO.class, new MPJLambdaWrapperX() - .leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodProjectId) - .leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentDO::getDictionaryProjectId) - .leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId) - .selectAll(BusinessSubParentSampleAssessmentDO.class) + default List selectByBusinessSubParentSampleIdAndConfigAssayMethodId(List businessSubParentSampleIds, Long configAssayMethodId) { + return selectJoinList(BusinessSubParentSampleAssessmentProjectExtendRespVO.class, new MPJLambdaWrapperX() + .leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId) + .leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId) + .leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId) + .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) - .eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId)); + .in(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, businessSubParentSampleIds) + .eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId)); } - default List selectByConfigAssayMethodId(Long configAssayMethodId) { - return selectList(new LambdaQueryWrapper() - .eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId)); + default List selectByConfigAssayMethodId(Long configAssayMethodId) { + return selectList(new LambdaQueryWrapper() + .eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId)); } List selectNoReportSubParentSampleAssessment(@Param("configAssayMethodId") Long configAssayMethodId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentProjectMapper.java similarity index 97% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentProjectMapper.java index 81a403c..c205ab5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java +++ b/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 { +public interface BusinessSubSampleAssessmentProjectMapper extends BaseMapperX { default PageResult selectPage(BusinessSubSampleAssessmentProjectPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectService.java new file mode 100644 index 0000000..19b0d26 --- /dev/null +++ b/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 ids); + + /** + * 获得班组判定检测项目数据业务 + * + * @param id 编号 + * @return 班组判定检测项目数据业务 + */ + BusinessSubParentSampleAssessmentProjectDO getBusinessSubParentSampleAssessment(Long id); + + /** + * 获得班组判定检测项目数据业务分页 + * + * @param pageReqVO 分页查询 + * @return 班组判定检测项目数据业务分页 + */ + PageResult getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectServiceImpl.java similarity index 68% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentServiceImpl.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentProjectServiceImpl.java index 50cad62..877e92d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentServiceImpl.java +++ b/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 ids) { - List list = businessSubParentSampleAssessmentProjectMapper.selectByIds(ids); + List 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 getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO) { + public PageResult getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentProjectPageReqVO pageReqVO) { return businessSubParentSampleAssessmentProjectMapper.selectPage(pageReqVO); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentService.java deleted file mode 100644 index 01fbed2..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubParentSampleAssessmentService.java +++ /dev/null @@ -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 ids); - - /** - * 获得班组判定数据业务 - * - * @param id 编号 - * @return 班组判定数据业务 - */ - BusinessSubParentSampleAssessmentDO getBusinessSubParentSampleAssessment(Long id); - - /** - * 获得班组判定数据业务分页 - * - * @param pageReqVO 分页查询 - * @return 班组判定数据业务分页 - */ - PageResult getBusinessSubParentSampleAssessmentPage(BusinessSubParentSampleAssessmentPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectService.java index 7b598f3..555c291 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectService.java +++ b/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 ids); /** - * 获得子样判定数据业务 + * 获得子样判定检测项目数据业务 * * @param id 编号 - * @return 子样判定数据业务 + * @return 子样判定检测项目数据业务 */ BusinessSubSampleAssessmentProjectDO getBusinessSubSampleAssessment(Long id); /** - * 获得子样判定数据业务分页 + * 获得子样判定检测项目数据业务分页 * * @param pageReqVO 分页查询 - * @return 子样判定数据业务分页 + * @return 子样判定检测项目数据业务分页 */ PageResult getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentProjectPageReqVO pageReqVO); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectServiceImpl.java index 39f901e..3fbcf25 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentProjectServiceImpl.java +++ b/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 ids) { - List list = businessSubSampleAssessmentMapper.selectByIds(ids); + List 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) { - throw exception(BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS); + if (businessSubSampleAssessmentProjectMapper.selectById(id) == null) { + 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 getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentProjectPageReqVO pageReqVO) { - return businessSubSampleAssessmentMapper.selectPage(pageReqVO); + return businessSubSampleAssessmentProjectMapper.selectPage(pageReqVO); } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentService.java new file mode 100644 index 0000000..374d9ae --- /dev/null +++ b/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 ids); + + /** + * 获得子样判定业务 + * + * @param id 编号 + * @return 子样判定业务 + */ + BusinessSubSampleAssessmentDO getBusinessSubSampleAssessment(Long id); + + /** + * 获得子样判定业务分页 + * + * @param pageReqVO 分页查询 + * @return 子样判定业务分页 + */ + PageResult getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleAssessmentServiceImpl.java new file mode 100644 index 0000000..5677493 --- /dev/null +++ b/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 ids) { + // 校验存在 + validateBusinessSubSampleAssessmentExists(ids); + // 删除 + businessSubSampleAssessmentMapper.deleteByIds(ids); + } + + private void validateBusinessSubSampleAssessmentExists(List ids) { + List 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 getBusinessSubSampleAssessmentPage(BusinessSubSampleAssessmentPageReqVO pageReqVO) { + return businessSubSampleAssessmentMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 83d8408..bcdc688 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/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 businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessAssayTaskDataExtendRespVO.getBusinessSubSampleId(), configAssayMethodId); + List 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 businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId); + List businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId); for (BusinessSubSampleAssessmentProjectExtendRespVO businessSubSampleAssessment : businessSubSampleAssessmentList) { Map businessSubSampleAssessmentMap = BeanUtil.beanToMap(businessSubSampleAssessment); @@ -467,7 +467,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic List configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX().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 saveBusinessAssayReportDataDOList = new ArrayList<>(); // List updateBusinessAssayReportDataDOList = new ArrayList<>(); - List businessSubParentSampleAssessmentDOList = new ArrayList<>(); + List businessSubParentSampleAssessmentDOList = new ArrayList<>(); //分析任务已全部上报 List reportedList = businessAssayTaskDataMapper.selectIsReportedList(null, businessSubSampleId, configAssayMethodId, QmsCommonConstant.YES); //判定结果 - List businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId); + List businessSubSampleAssessmentList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId); List 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(); - businessSubParentSampleAssessmentDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId()); - businessSubParentSampleAssessmentDO.setAssessmentStatus(QmsCommonConstant.NORMAL); - businessSubParentSampleAssessmentDO.setAssessmentValue(businessSubSampleAssessment.getAssessmentValue()); - businessSubParentSampleAssessmentDO.setTaskType(businessSubSampleAssessment.getTaskType()); - businessSubParentSampleAssessmentDO.setAssayType(businessSubSampleAssessment.getAssayType()); - businessSubParentSampleAssessmentDO.setDataType(businessSubSampleAssessment.getDataType()); - businessSubParentSampleAssessmentDO.setDecimalPosition(businessSubSampleAssessment.getDecimalPosition()); - businessSubParentSampleAssessmentDO.setUsage(businessSubSampleAssessment.getUsage()); - businessSubParentSampleAssessmentDO.setMinimumLimitValue(businessSubParentSampleAssessmentDO.getMinimumLimitValue()); - businessSubParentSampleAssessmentDO.setConfigAssayMethodId(businessSubSampleAssessment.getConfigAssayMethodId()); - businessSubParentSampleAssessmentDO.setConfigAssayMethodProjectId(businessSubSampleAssessment.getConfigAssayMethodProjectId()); - businessSubParentSampleAssessmentDO.setDictionaryProjectId(businessSubSampleAssessment.getDictionaryProjectId()); + businessSubParentSampleAssessmentProjectDO = new BusinessSubParentSampleAssessmentProjectDO(); + businessSubParentSampleAssessmentProjectDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId()); + businessSubParentSampleAssessmentProjectDO.setAssessmentStatus(QmsCommonConstant.NORMAL); + businessSubParentSampleAssessmentProjectDO.setAssessmentValue(businessSubSampleAssessment.getAssessmentValue()); + businessSubParentSampleAssessmentProjectDO.setTaskType(businessSubSampleAssessment.getTaskType()); + businessSubParentSampleAssessmentProjectDO.setAssayType(businessSubSampleAssessment.getAssayType()); + businessSubParentSampleAssessmentProjectDO.setDataType(businessSubSampleAssessment.getDataType()); + businessSubParentSampleAssessmentProjectDO.setDecimalPosition(businessSubSampleAssessment.getDecimalPosition()); + businessSubParentSampleAssessmentProjectDO.setUsage(businessSubSampleAssessment.getUsage()); + businessSubParentSampleAssessmentProjectDO.setMinimumLimitValue(businessSubParentSampleAssessmentProjectDO.getMinimumLimitValue()); + businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodId(businessSubSampleAssessment.getConfigAssayMethodId()); + businessSubParentSampleAssessmentProjectDO.setConfigAssayMethodProjectId(businessSubSampleAssessment.getConfigAssayMethodProjectId()); + 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() + businessSubSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper() .set(BusinessSubSampleAssessmentProjectDO::getIsReported, QmsCommonConstant.YES) .set(BusinessSubSampleAssessmentProjectDO::getReporter, nickName) .set(BusinessSubSampleAssessmentProjectDO::getReportTime, LocalDateTime.now()) @@ -924,7 +924,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic //修改判定状态 //查询判定值 - List businessSubSampleAssessmentList = businessSubSampleAssessmentMapper.selectByBusinessSubSampleIdAndConfigAssayMethodId(businessSubSampleId, configAssayMethodId); + List 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 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 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); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java index 29339b8..f33c3c1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java +++ b/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 businessSubParentSampleIds = noReportSubParentSampleAssessmentRespList.stream().map(m -> m.getBusinessSubParentSampleId()).collect(Collectors.toList()); //报送的检测项目数据 - List businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); + List businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); //获取分析任务数 List businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); List businessSubSampleIds = businessAssayTaskDataDOList.stream().map(m -> m.getBusinessSubSampleId()).distinct().collect(Collectors.toList()); @@ -142,7 +142,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe List businessSubSampleDOList = businessSubSampleMapper.selectByIds(businessSubSampleIds); //获取结果判定数据 - List businessSubSampleAssessmentExtendRespVOList = businessSubSampleAssessmentMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); + List businessSubSampleAssessmentExtendRespVOList = businessSubSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); //获取复测业务数据 List businessSubSampleParentRecheckDOList = businessSubSampleParentRecheckMapper.selectByRecheckBusinessSubParentSampleIdsAndRecheckConfigAssayMethodId(businessSubParentSampleIds, configAssayMethodId); @@ -155,10 +155,10 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe Map subSampleAssessmentBeforeMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class); Map subSampleAssessmentMap = BeanUtil.copyProperties(noReportSubParentSampleAssessmentMap, Map.class); - List curBusinessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentDOList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(noReportSubParentSampleAssessmentRespVO.getBusinessSubParentSampleId())).collect(Collectors.toList()); + List 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 businessSubSampleAssessmentExtendBeforeList = businessSubSampleAssessmentMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(businessSubSampleParentRecheckDO.getBusinessSubParentSampleId(), businessSubSampleParentRecheckDO.getConfigAssayMethodId()); + List 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 saveBusinessAssayReportDataDOList = new ArrayList<>(); List updateBusinessAssayReportDataDOList = new ArrayList<>(); - List businessSubParentSampleAssessmentExtendList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleIds(), reqVO.getConfigAssayMethodId()); + List businessSubParentSampleAssessmentExtendList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleIds(), reqVO.getConfigAssayMethodId()); List businessSubParentSampleDOList = businessSubParentSampleMapper.selectByIds(reqVO.getBusinessSubParentSampleIds()); @@ -472,8 +472,8 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe assayDataJson = JSON.parseObject(assayData); } //循环判定值 - List businessSubParentSampleAssessmentList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(businessSubParentSampleDO.getId())).collect(Collectors.toList()); - for (BusinessSubParentSampleAssessmentExtendRespVO businessSubParentSampleAssessment : businessSubParentSampleAssessmentList) { + List businessSubParentSampleAssessmentList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> f.getBusinessSubParentSampleId().equals(businessSubParentSampleDO.getId())).collect(Collectors.toList()); + for (BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessment : businessSubParentSampleAssessmentList) { Long configAssayMethodProjectId = businessSubParentSampleAssessment.getConfigAssayMethodProjectId(); List 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 businessSubParentSampleAssessmentIdList = businessSubParentSampleAssessmentExtendList.stream().map(m -> m.getId()).collect(Collectors.toList()); - businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper() - .set(BusinessSubParentSampleAssessmentDO::getIsReported, QmsCommonConstant.YES) - .set(BusinessSubParentSampleAssessmentDO::getReporter, nickName) - .set(BusinessSubParentSampleAssessmentDO::getReportTime, LocalDateTime.now()) - .in(BusinessSubParentSampleAssessmentDO::getId, businessSubParentSampleAssessmentIdList)); + businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper() + .set(BusinessSubParentSampleAssessmentProjectDO::getIsReported, QmsCommonConstant.YES) + .set(BusinessSubParentSampleAssessmentProjectDO::getReporter, nickName) + .set(BusinessSubParentSampleAssessmentProjectDO::getReportTime, LocalDateTime.now()) + .in(BusinessSubParentSampleAssessmentProjectDO::getId, businessSubParentSampleAssessmentIdList)); if (updateBusinessSubSampleDOList.size() > 0) { @@ -592,11 +592,11 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe public void modifySampleResultReporting(ModifySampleResultReportingReqVO reqVO) { List businessSubParentSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubParentSampleAssessmentIds().split(",")); List businessSubSampleAssessmentIdList = Arrays.asList(reqVO.getBusinessSubSampleAssessmentIds().split(",")); - List businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentIdList); - List businessSubSampleAssessmentDOList = businessSubSampleAssessmentMapper.selectByIds(businessSubSampleAssessmentIdList); - for (BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO : businessSubParentSampleAssessmentDOList) { - BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentDOList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubParentSampleAssessmentDO.getDictionaryProjectId())).findFirst().orElse(null); - businessSubParentSampleAssessmentDO.setAssessmentValue(businessSubSampleAssessmentProjectDO.getAssessmentValue()); + List businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentProjectMapper.selectByIds(businessSubParentSampleAssessmentIdList); + List businessSubSampleAssessmentDOList = businessSubSampleAssessmentProjectMapper.selectByIds(businessSubSampleAssessmentIdList); + for (BusinessSubParentSampleAssessmentProjectDO businessSubParentSampleAssessmentProjectDO : businessSubParentSampleAssessmentDOList) { + BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentDOList.stream().filter(f -> f.getDictionaryProjectId().equals(businessSubParentSampleAssessmentProjectDO.getDictionaryProjectId())).findFirst().orElse(null); + businessSubParentSampleAssessmentProjectDO.setAssessmentValue(businessSubSampleAssessmentProjectDO.getAssessmentValue()); } businessSubParentSampleAssessmentProjectMapper.updateBatch(businessSubParentSampleAssessmentDOList); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml similarity index 99% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml index 52a6ab2..2433995 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.xml +++ b/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 @@ - + + + \ No newline at end of file