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 30076be..1829704 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 @@ -47,7 +47,7 @@ public class BusinessQCDataController implements BusinessControllerMarker { return success(businessQCDataService.createBusinessQCData(createReqVO)); } - @PutMapping("/update") + @PostMapping("/update") @Operation(summary = "更新质控样业务") //@PreAuthorize("@ss.hasPermission('qms:business-QC-data:update')") public CommonResult updateBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO updateReqVO) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataPageReqVO.java index 25406e1..d6041ae 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataPageReqVO.java @@ -40,6 +40,9 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam { @Schema(description = "是否不参与超差判定") private Integer isNotAssessment; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否启用") private Integer isEnabled; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataReqVO.java index 615186b..a052df1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataReqVO.java @@ -46,6 +46,9 @@ public class BusinessAssayProjectDataReqVO { @Schema(description = "是否不参与超差判定") private Integer isNotAssessment; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否启用") private Integer isEnabled; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataRespVO.java index ebab3f6..c3a55c2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataRespVO.java @@ -50,6 +50,9 @@ public class BusinessAssayProjectDataRespVO { @ExcelProperty("是否不参与超差判定") private Integer isNotAssessment; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("是否启用") private Integer isEnabled; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataSaveReqVO.java index eba9dea..191c685 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataSaveReqVO.java @@ -38,6 +38,9 @@ public class BusinessAssayProjectDataSaveReqVO { @NotNull(message = "是否不参与超差判定不能为空") private Integer isNotAssessment; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否启用不能为空") private Integer isEnabled; 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/BusinessSubParentSampleAssessmentPageReqVO.java index 0a9f501..b0ba2e4 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/BusinessSubParentSampleAssessmentPageReqVO.java @@ -49,6 +49,9 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam { @Schema(description = "判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差", example = "2") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报") private Integer isReported; 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/BusinessSubParentSampleAssessmentRespVO.java index ead54fa..26572f0 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/BusinessSubParentSampleAssessmentRespVO.java @@ -60,6 +60,9 @@ public class BusinessSubParentSampleAssessmentRespVO { @ExcelProperty("判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("是否已上报") private Integer isReported; 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/BusinessSubParentSampleAssessmentSaveReqVO.java index de77031..436b51a 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/BusinessSubParentSampleAssessmentSaveReqVO.java @@ -56,6 +56,9 @@ public class BusinessSubParentSampleAssessmentSaveReqVO { @NotEmpty(message = "判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差不能为空") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否已上报不能为空") private Integer isReported; 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 index 52fb8b8..a46f4c5 100644 --- 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 @@ -52,6 +52,9 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam { @Schema(description = "判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差", example = "1") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报") private Integer isReported; 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 index 001fd68..8a0b34a 100644 --- 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 @@ -65,6 +65,9 @@ public class BusinessSubSampleAssessmentRespVO { @ExcelProperty("判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("是否已上报") private Integer isReported; 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 index d7e6f92..62f5df2 100644 --- 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 @@ -60,6 +60,9 @@ public class BusinessSubSampleAssessmentSaveReqVO { @Schema(description = "判定状态,in_progress-进行中 normal-正常,exceeds_tolerance-超差", example = "1") private String assessmentStatus; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否已上报不能为空") private Integer isReported; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java index b65db1b..3da3238 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java @@ -82,6 +82,11 @@ public class BusinessAssayProjectDataDO extends BusinessBaseDO { @TableField("IS_ENBD") private Integer isEnabled; /** + * 方法检出下限值 + */ + @TableField("MIN_LIM_VAL") + private String minimumLimitValue; + /** * 乐观锁 */ @TableField("UPD_CNT") 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/BusinessSubParentSampleAssessmentDO.java index 2ae4380..4db2d23 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/BusinessSubParentSampleAssessmentDO.java @@ -93,6 +93,11 @@ public class BusinessSubParentSampleAssessmentDO extends BusinessBaseDO { @TableField("ASMT_STS") private String assessmentStatus; /** + * 方法检出下限值 + */ + @TableField("MIN_LIM_VAL") + private String minimumLimitValue; + /** * 是否已上报 */ @TableField("IS_RPOD") 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 index 526c46c..a8df1b7 100644 --- 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 @@ -98,6 +98,11 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO { @TableField("ASMT_STS") private String assessmentStatus; /** + * 方法检出下限值 + */ + @TableField("MIN_LIM_VAL") + private String minimumLimitValue; + /** * 是否已上报 */ @TableField("IS_RPOD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java index 1070a46..a74ba89 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java @@ -16,6 +16,12 @@ public class ConfigAssayMethodPageReqVO extends PageParam { @Schema(description = "方法库ID", example = "9346") private Long methodConfigId; + @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102") + private Long dictionaryBusinessId; + + @Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等") + private String dictionaryBusinessKey; + @Schema(description = "方法名称", example = "李四") private String name; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectPageReqVO.java index 47da316..1bbfff2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectPageReqVO.java @@ -43,6 +43,9 @@ public class ConfigAssayMethodProjectPageReqVO extends PageParam { @Schema(description = "是否默认启用,1-启用,0-不启用") private Integer isDefaultEnabled; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "排序号") private Integer sortNo; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectRespVO.java index 952811e..88eb751 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectRespVO.java @@ -56,6 +56,9 @@ public class ConfigAssayMethodProjectRespVO { @ExcelProperty("是否默认启用,1-启用,0-不启用") private Integer isDefaultEnabled; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "排序号") @ExcelProperty("排序号") private Integer sortNo; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectSaveReqVO.java index 0c6467e..8747f86 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectSaveReqVO.java @@ -47,6 +47,9 @@ public class ConfigAssayMethodProjectSaveReqVO { @NotNull(message = "是否默认启用,1-启用,0-不启用不能为空") private Integer isDefaultEnabled; + @Schema(description = "方法检出下限值") + private String minimumLimitValue; + @Schema(description = "排序号") private Integer sortNo; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java index 736dd8c..c71fad5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java @@ -16,6 +16,12 @@ public class ConfigAssayMethodReqVO { @Schema(description = "方法库ID", example = "9346") private Long methodConfigId; + @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102") + private Long dictionaryBusinessId; + + @Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等") + private String dictionaryBusinessKey; + @Schema(description = "方法名称", example = "李四") private String name; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java index 2ff7982..7888f3c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java @@ -20,6 +20,12 @@ public class ConfigAssayMethodRespVO { @ExcelProperty("方法库ID") private Long methodConfigId; + @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102") + private Long dictionaryBusinessId; + + @Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等") + private String dictionaryBusinessKey; + @Schema(description = "方法名称", example = "李四") @ExcelProperty("方法名称") private String name; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java index 432be28..0f32c16 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java @@ -15,6 +15,12 @@ public class ConfigAssayMethodSaveReqVO { @Schema(description = "方法库ID", example = "9346") private Long methodConfigId; + @Schema(description = "方法类别ID,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等", example = "9102") + private Long dictionaryBusinessId; + + @Schema(description = "方法类别KEY,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等") + private String dictionaryBusinessKey; + @Schema(description = "方法名称", example = "李四") private String name; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java index 7449cf9..031712a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java @@ -43,6 +43,9 @@ public class ConfigQCSampleMethodPageReqVO extends PageParam { @Schema(description = "映射检测信息配置,automatic-自动报出(不超差),manual-手动报出,modify-允许修改") private String configInfomation; + @Schema(description = "排序号") + private Integer sortNo; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java index d5595b9..2dcd8e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java @@ -56,6 +56,9 @@ public class ConfigQCSampleMethodRespVO { @ExcelProperty("映射检测信息配置,automatic-自动报出(不超差),manual-手动报出,modify-允许修改") private String configInfomation; + @Schema(description = "排序号") + private Integer sortNo; + @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/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java index a37c25d..2d02bd4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java @@ -49,6 +49,9 @@ public class ConfigQCSampleMethodSaveReqVO { @Schema(description = "映射检测信息配置,automatic-自动报出(不超差),manual-手动报出,modify-允许修改") private String configInfomation; + @Schema(description = "排序号") + private Integer sortNo; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java index a9809ae..565e671 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java @@ -37,6 +37,16 @@ public class ConfigAssayMethodDO extends BusinessBaseDO { @TableField("MTHD_CFG_ID") private Long methodConfigId; /** + * 方法类别ID,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等 + */ + @TableField("DIC_BSN_ID") + private Long dictionaryBusinessId; + /** + * 方法类别KEY,字典表【T_DIC_BSN】方法类别:methodCategory,容量法、等离子发射光谱法、原子吸收分光光度等 + */ + @TableField("DIC_BSN_KY") + private String dictionaryBusinessKey; + /** * 方法名称 */ @TableField("NAME") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodProjectDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodProjectDO.java index 6da75ac..f073dd1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodProjectDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodProjectDO.java @@ -82,6 +82,11 @@ public class ConfigAssayMethodProjectDO extends BusinessBaseDO { @TableField("IS_DFT_ENBD") private Integer isDefaultEnabled; /** + * 方法检出下限值 + */ + @TableField("MIN_LIM_VAL") + private String minimumLimitValue; + /** * 排序号 */ @TableField("SRT_NO") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java index 84bcffe..5d80113 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java @@ -82,6 +82,11 @@ public class ConfigQCSampleMethodDO extends BusinessBaseDO { @TableField("CFG_INF") private String configInfomation; /** + * 排序号 + */ + @TableField("SRT_NO") + private Integer sortNo; + /** * 所属部门 */ @TableField("SYS_DEPT_CD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java index caaf8c0..4e5e591 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java @@ -24,6 +24,8 @@ public interface ConfigAssayMethodMapper extends BaseMapperX selectList(ConfigAssayMethodReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConfigAssayMethodDO::getMethodConfigId, reqVO.getMethodConfigId()) + .eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getName()) .eqIfPresent(ConfigAssayMethodDO::getMethodCode, reqVO.getMethodCode()) .eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription()) @@ -45,6 +47,8 @@ public interface ConfigAssayMethodMapper extends BaseMapperX selectPage(ConfigAssayMethodPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ConfigAssayMethodDO::getMethodConfigId, reqVO.getMethodConfigId()) + .eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(ConfigAssayMethodDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getName()) .eqIfPresent(ConfigAssayMethodDO::getMethodCode, reqVO.getMethodCode()) .eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.java index d80896d..132c413 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectMapper.java @@ -35,6 +35,7 @@ public interface ConfigAssayMethodProjectMapper extends BaseMapperX