From 7fd6bb5e29ac7fd3705ff59c7202606afda134fe Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 16 Oct 2025 11:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/BusinessSubSampleAssessmentPageReqVO.java | 5 +---- .../controller/vo/BusinessSubSampleAssessmentRespVO.java | 8 ++------ .../vo/BusinessSubSampleAssessmentSaveReqVO.java | 6 +----- .../controller/vo/BusinessTeamAssessmentPageReqVO.java | 2 +- .../bus/controller/vo/BusinessTeamAssessmentRespVO.java | 4 ++-- .../controller/vo/BusinessTeamAssessmentSaveReqVO.java | 3 +-- .../bus/dal/dataobject/BusinessSubSampleAssessmentDO.java | 7 +------ .../bus/dal/dataobject/BusinessTeamAssessmentDO.java | 2 +- .../bus/dal/mapper/BusinessAssayTaskDataMapper.java | 3 ++- .../bus/dal/mapper/BusinessSubSampleAssessmentMapper.java | 1 - .../bus/dal/mapper/BusinessAssayTaskDataMapper.xml | 3 +-- 11 files changed, 13 insertions(+), 31 deletions(-) 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 00413b6..75d90db 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 @@ -40,7 +40,7 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam { @Schema(description = "判定值") private String assessmentValue; - @Schema(description = "超差标注", example = "1") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1") private String assessmentStatus; @Schema(description = "是否已上报") @@ -53,9 +53,6 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; - @Schema(description = "复检次数", example = "14032") - private Integer recheckCount; - @Schema(description = "所属部门") 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/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 282cdad..a9b3fcf 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 @@ -52,8 +52,8 @@ public class BusinessSubSampleAssessmentRespVO { @ExcelProperty("判定值") private String assessmentValue; - @Schema(description = "超差标注", example = "1") - @ExcelProperty("超差标注") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1") + @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差") private String assessmentStatus; @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @@ -68,10 +68,6 @@ public class BusinessSubSampleAssessmentRespVO { @ExcelProperty("上报时间") private LocalDateTime reportTime; - @Schema(description = "复检次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "14032") - @ExcelProperty("复检次数") - private Integer recheckCount; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) @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/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 f7820e8..a231bb0 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 @@ -48,7 +48,7 @@ public class BusinessSubSampleAssessmentSaveReqVO { @Schema(description = "判定值") private String assessmentValue; - @Schema(description = "超差标注", example = "1") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1") private String assessmentStatus; @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) @@ -63,10 +63,6 @@ public class BusinessSubSampleAssessmentSaveReqVO { @NotNull(message = "上报时间不能为空") private LocalDateTime reportTime; - @Schema(description = "复检次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "14032") - @NotNull(message = "复检次数不能为空") - private Integer recheckCount; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) 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/BusinessTeamAssessmentPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentPageReqVO.java index 7e4ac07..763b435 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentPageReqVO.java @@ -37,7 +37,7 @@ public class BusinessTeamAssessmentPageReqVO extends PageParam { @Schema(description = "上报对应列", example = "芋艿") private String columnName; - @Schema(description = "超差标注", example = "1") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "1") private String assessmentStatus; @Schema(description = "是否已上报") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentRespVO.java index 5b69e25..262888b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentRespVO.java @@ -48,8 +48,8 @@ public class BusinessTeamAssessmentRespVO { @ExcelProperty("上报对应列") private String columnName; - @Schema(description = "超差标注", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("超差标注") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差") private String assessmentStatus; @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentSaveReqVO.java index f4ff177..64848b3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentSaveReqVO.java @@ -44,8 +44,7 @@ public class BusinessTeamAssessmentSaveReqVO { @NotEmpty(message = "上报对应列不能为空") private String columnName; - @Schema(description = "超差标注", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "超差标注不能为空") + @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String assessmentStatus; @Schema(description = "是否已上报", requiredMode = Schema.RequiredMode.REQUIRED) 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 1882d7a..0eab1b2 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 @@ -78,7 +78,7 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO { @TableField("ASMT_VAL") private String assessmentValue; /** - * 超差标注 + * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差 */ @TableField("ASMT_STS") private String assessmentStatus; @@ -98,11 +98,6 @@ public class BusinessSubSampleAssessmentDO extends BusinessBaseDO { @TableField("RPT_TM") private LocalDateTime reportTime; /** - * 复检次数 - */ - @TableField("RCHK_CNT") - private Integer recheckCount; - /** * 所属部门 */ @TableField("SYS_DEPT_CD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessTeamAssessmentDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessTeamAssessmentDO.java index 5ed6ffd..344f167 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessTeamAssessmentDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessTeamAssessmentDO.java @@ -63,7 +63,7 @@ public class BusinessTeamAssessmentDO extends BusinessBaseDO { @TableField("DEC_POS") private Integer decimalPosition; /** - * 判定值 + * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差 */ @TableField("ASMT_VAL") private String assessmentValue; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java index d082666..61eff5a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java @@ -143,7 +143,8 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX