From 56807cfdcf7dbcb87e3d8b5d5b2a78ff55afc0ee Mon Sep 17 00:00:00 2001 From: wxr Date: Tue, 4 Nov 2025 17:48:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E6=A0=B7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/BusinessQCDataController.java | 2 +- .../BusinessStandardSampleController.java | 9 ++-- .../BusinessStandardSampleExtendRespVO.java | 26 +++++++++++ .../vo/BusinessStandardSamplePageReqVO.java | 17 ++++--- ...usinessStandardSampleProjectPageReqVO.java | 8 ++-- .../BusinessStandardSampleProjectRespVO.java | 16 +++---- ...usinessStandardSampleProjectSaveReqVO.java | 15 +++---- .../vo/BusinessStandardSampleReqVO.java | 44 +++++++++++++++++++ .../vo/BusinessStandardSampleRespVO.java | 28 +++++++----- .../vo/BusinessStandardSampleSaveReqVO.java | 26 ++++++----- .../controller/vo/CreateQcSampleReqVO.java | 3 ++ .../dataobject/BusinessStandardSampleDO.java | 25 ++++++----- .../BusinessStandardSampleProjectDO.java | 6 +-- .../mapper/BusinessStandardSampleMapper.java | 28 ++++++++++-- .../BusinessStandardSampleService.java | 5 +-- .../BusinessStandardSampleServiceImpl.java | 9 ++-- .../service/SampleTaskAssignServiceImpl.java | 3 ++ 17 files changed, 192 insertions(+), 78 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleExtendRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleReqVO.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java index dcaf2f5..30076be 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java @@ -67,7 +67,7 @@ public class BusinessQCDataController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除质控样业务") - @PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')") + @PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')") public CommonResult deleteBusinessQCDataList(@RequestBody BatchDeleteReqVO req) { businessQCDataService.deleteBusinessQCDataListByIds(req.getIds()); return success(true); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java index 45cca5d..39cd959 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java @@ -1,8 +1,5 @@ package com.zt.plat.module.qms.business.bus.controller.admin; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,6 +88,12 @@ public class BusinessStandardSampleController implements BusinessControllerMarke PageResult pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO); return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class)); } + + @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId") + public CommonResult getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) { + List list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId); + return success(list); + } @GetMapping("/export-excel") @Operation(summary = "导出标准样业务 Excel") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleExtendRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleExtendRespVO.java new file mode 100644 index 0000000..59cf8ed --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleExtendRespVO.java @@ -0,0 +1,26 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import java.util.List; +import java.util.stream.Collectors; + +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO; + +import cn.hutool.core.collection.CollUtil; +import lombok.Data; + +@Data +public class BusinessStandardSampleExtendRespVO extends BusinessStandardSampleRespVO { + + private Long configQCSampleMethodId; + + private String standardSampleProjects; + + public String getStandardSampleProjects() { + if (CollUtil.isNotEmpty(this.standardSampleProjectList)) { + return this.standardSampleProjectList.stream().map(m -> m.getDictionaryProjectName() + "(" + m.getDictionaryProjectUnit() + "):" + m.getStandardValue()).collect(Collectors.joining(",")); + } + return null; + } + + private List standardSampleProjectList; +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSamplePageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSamplePageReqVO.java index 87e0a1d..6209ec8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSamplePageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSamplePageReqVO.java @@ -9,18 +9,21 @@ 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 BusinessStandardSamplePageReqVO extends PageParam { - @Schema(description = "标准样类型ID", example = "12799") - private Long configStandardSampleTypeId; + @Schema(description = "ID路径") + private String idPath; - @Schema(description = "标准样类型名称", example = "李四") - private String configStandardSampleTypeName; + @Schema(description = "上级ID", example = "9719") + private Long parentId; - @Schema(description = "标准样编号") - private String standardSampleCode; + @Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", example = "赵六") + private String name; + + @Schema(description = "编号") + private String code; @Schema(description = "是否启用,1-启用，0-不启用") private Integer isUse; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectPageReqVO.java index f55292a..49d8324 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectPageReqVO.java @@ -9,17 +9,17 @@ 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 BusinessStandardSampleProjectPageReqVO extends PageParam { - @Schema(description = "标准样ID", example = "10572") + @Schema(description = "定值样ID", example = "17499") private Long businessStandardSampleId; - @Schema(description = "标准样元素配置ID", example = "17543") + @Schema(description = "定值样元素配置ID", example = "10892") private Long configStandardSampleProjectId; - @Schema(description = "检测项目ID", example = "19425") + @Schema(description = "检测项目ID", example = "7881") private Long dictionaryProjectId; @Schema(description = "检测项目名称", example = "张三") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectRespVO.java index 2bbca84..de96ae4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectRespVO.java @@ -7,24 +7,24 @@ 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 BusinessStandardSampleProjectRespVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30840") @ExcelProperty("ID") private Long id; - @Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572") - @ExcelProperty("标准样ID") + @Schema(description = "定值样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17499") + @ExcelProperty("定值样ID") private Long businessStandardSampleId; - @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543") - @ExcelProperty("标准样元素配置ID") + @Schema(description = "定值样元素配置ID", example = "10892") + @ExcelProperty("定值样元素配置ID") private Long configStandardSampleProjectId; - @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425") + @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7881") @ExcelProperty("检测项目ID") private Long dictionaryProjectId; @@ -52,7 +52,7 @@ public class BusinessStandardSampleProjectRespVO { @ExcelProperty("排序号") private Integer sortNo; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectSaveReqVO.java index 9efed35..91381d3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleProjectSaveReqVO.java @@ -5,22 +5,21 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; -@Schema(description = "管理后台 - 标准样检测项目业务新增/修改 Request VO") +@Schema(description = "管理后台 - 定值样检测项目业务新增/修改 Request VO") @Data public class BusinessStandardSampleProjectSaveReqVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8746") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30840") private Long id; - @Schema(description = "标准样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10572") - @NotNull(message = "标准样ID不能为空") + @Schema(description = "定值样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17499") + @NotNull(message = "定值样ID不能为空") private Long businessStandardSampleId; - @Schema(description = "标准样元素配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17543") - @NotNull(message = "标准样元素配置ID不能为空") + @Schema(description = "定值样元素配置ID", example = "10892") private Long configStandardSampleProjectId; - @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19425") + @Schema(description = "检测项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7881") @NotNull(message = "检测项目ID不能为空") private Long dictionaryProjectId; @@ -44,7 +43,7 @@ public class BusinessStandardSampleProjectSaveReqVO { @Schema(description = "排序号") private Integer sortNo; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") private String systemDepartmentCode; @Schema(description = "备注") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleReqVO.java new file mode 100644 index 0000000..92461da --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleReqVO.java @@ -0,0 +1,44 @@ +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 BusinessStandardSampleReqVO { + + @Schema(description = "ID路径") + private String idPath; + + @Schema(description = "上级ID", example = "9719") + private Long parentId; + + @Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", example = "赵六") + private String name; + + @Schema(description = "编号") + private String code; + + @Schema(description = "是否启用,1-启用，0-不启用") + private Integer isUse; + + @Schema(description = "是否发布,1-是，0-否") + private Integer isPublish; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @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/BusinessStandardSampleRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleRespVO.java index b83e0ec..a13a352 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleRespVO.java @@ -7,26 +7,30 @@ 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 BusinessStandardSampleRespVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28533") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22309") @ExcelProperty("ID") private Long id; - @Schema(description = "标准样类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12799") - @ExcelProperty("标准样类型ID") - private Long configStandardSampleTypeId; + @Schema(description = "ID路径") + @ExcelProperty("ID路径") + private String idPath; - @Schema(description = "标准样类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @ExcelProperty("标准样类型名称") - private String configStandardSampleTypeName; + @Schema(description = "上级ID", example = "9719") + @ExcelProperty("上级ID") + private Long parentId; - @Schema(description = "标准样编号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("标准样编号") - private String standardSampleCode; + @Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("名称,一级：管理样、标准样、标样；二级：具体定值样") + private String name; + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("编号") + private String code; @Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("是否启用,1-启用，0-不启用") @@ -36,7 +40,7 @@ public class BusinessStandardSampleRespVO { @ExcelProperty("是否发布,1-是，0-否") private Integer isPublish; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleSaveReqVO.java index d59b82e..0806574 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessStandardSampleSaveReqVO.java @@ -5,24 +5,26 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; -@Schema(description = "管理后台 - 标准样业务新增/修改 Request VO") +@Schema(description = "管理后台 - 定值样业务新增/修改 Request VO") @Data public class BusinessStandardSampleSaveReqVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28533") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22309") private Long id; - @Schema(description = "标准样类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12799") - @NotNull(message = "标准样类型ID不能为空") - private Long configStandardSampleTypeId; + @Schema(description = "ID路径") + private String idPath; - @Schema(description = "标准样类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @NotEmpty(message = "标准样类型名称不能为空") - private String configStandardSampleTypeName; + @Schema(description = "上级ID", example = "9719") + private Long parentId; - @Schema(description = "标准样编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "标准样编号不能为空") - private String standardSampleCode; + @Schema(description = "名称,一级：管理样、标准样、标样；二级：具体定值样", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "名称,一级：管理样、标准样、标样；二级：具体定值样不能为空") + private String name; + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "编号不能为空") + private String code; @Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否启用,1-启用，0-不启用不能为空") @@ -32,7 +34,7 @@ public class BusinessStandardSampleSaveReqVO { @NotNull(message = "是否发布,1-是，0-否不能为空") private Integer isPublish; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") private String systemDepartmentCode; @Schema(description = "备注") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java index 0efac60..3acaabb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java @@ -8,6 +8,9 @@ public class CreateQcSampleReqVO { @Schema(description = "样品名称", example = "张三") private String sampleName; + + @Schema(description = "样品编号", example = "张三") + private String sampleCode; @Schema(description = "指派单ID", example = "29117") private Long businessAssayTaskId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleDO.java index c01068f..66f45a3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleDO.java @@ -7,7 +7,7 @@ import java.util.*; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; /** -* 标准样业务 DO +* 定值样业务 DO * * @author 后台管理 */ @@ -32,20 +32,25 @@ public class BusinessStandardSampleDO extends BusinessBaseDO { @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 标准样类型ID + * ID路径 */ - @TableField("CFG_STD_SMP_TP_ID") - private Long configStandardSampleTypeId; + @TableField("ID_PATH") + private String idPath; /** - * 标准样类型名称 + * 上级ID */ - @TableField("CFG_STD_SMP_TP_NAME") - private String configStandardSampleTypeName; + @TableField("PRN_ID") + private Long parentId; /** - * 标准样编号 + * 名称,一级：管理样、标准样、标样；二级：具体定值样 */ - @TableField("STD_SMP_CD") - private String standardSampleCode; + @TableField("NAME") + private String name; + /** + * 编号 + */ + @TableField("CD") + private String code; /** * 是否启用,1-启用，0-不启用 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleProjectDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleProjectDO.java index 565e474..327f7db 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleProjectDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessStandardSampleProjectDO.java @@ -7,7 +7,7 @@ import java.util.*; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; /** -* 标准样检测项目业务 DO +* 定值样检测项目业务 DO * * @author 后台管理 */ @@ -32,12 +32,12 @@ public class BusinessStandardSampleProjectDO extends BusinessBaseDO { @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 标准样ID + * 定值样ID */ @TableField("BSN_STD_SMP_ID") private Long businessStandardSampleId; /** - * 标准样元素配置ID + * 定值样元素配置ID */ @TableField("CFG_STD_SMP_PRJ_ID") private Long configStandardSampleProjectId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java index d947b43..1cc95c9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java @@ -2,14 +2,21 @@ package com.zt.plat.module.qms.business.bus.dal.mapper; 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.controller.vo.BusinessStandardSamplePageReqVO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCStandardSampleDO; +import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; /** - * 标准样业务 Mapper + * 定值样业务 Mapper * * @author 后台管理 */ @@ -18,9 +25,10 @@ public interface BusinessStandardSampleMapper extends BaseMapperX selectPage(BusinessStandardSamplePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(BusinessStandardSampleDO::getConfigStandardSampleTypeId, reqVO.getConfigStandardSampleTypeId()) - .likeIfPresent(BusinessStandardSampleDO::getConfigStandardSampleTypeName, reqVO.getConfigStandardSampleTypeName()) - .eqIfPresent(BusinessStandardSampleDO::getStandardSampleCode, reqVO.getStandardSampleCode()) + .eqIfPresent(BusinessStandardSampleDO::getIdPath, reqVO.getIdPath()) + .eqIfPresent(BusinessStandardSampleDO::getParentId, reqVO.getParentId()) + .likeIfPresent(BusinessStandardSampleDO::getName, reqVO.getName()) + .eqIfPresent(BusinessStandardSampleDO::getCode, reqVO.getCode()) .eqIfPresent(BusinessStandardSampleDO::getIsUse, reqVO.getIsUse()) .eqIfPresent(BusinessStandardSampleDO::getIsPublish, reqVO.getIsPublish()) .eqIfPresent(BusinessStandardSampleDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) @@ -29,4 +37,16 @@ public interface BusinessStandardSampleMapper extends BaseMapperX selectByConfigQCSampleMethodId(Long configQCSampleMethodId) { + return selectJoinList(BusinessStandardSampleExtendRespVO.class, new MPJLambdaWrapperX() + .rightJoin(ConfigQCStandardSampleDO.class, ConfigQCStandardSampleDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) + .selectAll(BusinessStandardSampleDO.class) + .selectAs(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, BusinessStandardSampleExtendRespVO::getConfigQCSampleMethodId) + .selectCollection(BusinessStandardSampleProjectDO.class, BusinessStandardSampleExtendRespVO::getStandardSampleProjectList) + .leftJoin(BusinessStandardSampleProjectDO.class, BusinessStandardSampleProjectDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) + .eq(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, configQCSampleMethodId) + .eq(BusinessStandardSampleDO::getIsPublish, QmsCommonConstant.YES) + .eq(BusinessStandardSampleDO::getIsUse, QmsCommonConstant.YES)); + } } \ 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/BusinessStandardSampleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java index 4394165..40e7042 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java @@ -2,9 +2,6 @@ package com.zt.plat.module.qms.business.bus.service; import java.util.*; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO; import jakarta.validation.*; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.qms.business.bus.controller.vo.*; @@ -63,4 +60,6 @@ public interface BusinessStandardSampleService { */ PageResult getBusinessStandardSamplePage(BusinessStandardSamplePageReqVO pageReqVO); + List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId); + } \ 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/BusinessStandardSampleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java index b98de70..cf15ce4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java @@ -1,9 +1,7 @@ package com.zt.plat.module.qms.business.bus.service; import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleRespVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleSaveReqVO; + import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,4 +88,9 @@ public class BusinessStandardSampleServiceImpl implements BusinessStandardSample return businessStandardSampleMapper.selectPage(pageReqVO); } + @Override + public List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId) { + return businessStandardSampleMapper.selectByConfigQCSampleMethodId(configQCSampleMethodId); + } + } \ 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/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index 7e85716..31a5d96 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -478,6 +478,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { // String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule()); // businessQCDataDO.setSampleCode(codeSample); // } + if (StringUtils.isNotBlank(req.getSampleCode())) { + businessQCDataDO.setSampleCode(req.getSampleCode()); + } businessQCDataDO.setBusinessStandardSampleId(req.getBusinessStandardSampleId()); businessQCDataDO.setDictionaryBusinessId(req.getDictionaryBusinessId()); businessQCDataDO.setDictionaryBusinessKey(req.getDictionaryBusinessKey());