zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段修改

Browse Source
This commit is contained in:
王兴荣
2025-10-16 11:53:01 +08:00
parent 4df7931523
commit 7fd6bb5e29
11 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java
View File

@@ -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;

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

@@ -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;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java
View File

@@ -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;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentPageReqVO.java
View File

@@ -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 = "是否已上报")

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentRespVO.java
View File

@@ -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)

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessTeamAssessmentSaveReqVO.java
View File

@@ -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)

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

@@ -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")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessTeamAssessmentDO.java
View File

@@ -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;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
View File

@@ -143,7 +143,8 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
.eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
.orderByDesc(BusinessAssayTaskDataDO::getId));
.orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId)
.orderByAsc(BusinessAssayTaskDataDO::getReportTime));
}
/**

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.java
View File

@@ -37,7 +37,6 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
.eqIfPresent(BusinessSubSampleAssessmentDO::getIsReported, reqVO.getIsReported())
.eqIfPresent(BusinessSubSampleAssessmentDO::getReporter, reqVO.getReporter())
.betweenIfPresent(BusinessSubSampleAssessmentDO::getReportTime, reqVO.getReportTime())
.eqIfPresent(BusinessSubSampleAssessmentDO::getRecheckCount, reqVO.getRecheckCount())
.eqIfPresent(BusinessSubSampleAssessmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(BusinessSubSampleAssessmentDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BusinessSubSampleAssessmentDO::getUpdateCount, reqVO.getUpdateCount())

3
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
View File

@@ -44,8 +44,7 @@
LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbatd.CFG_ASY_MTHD_ID = tcam.ID
WHERE
tbatd.IS_ASN_TSKD = 0
AND tbatd.IS_RPOD = 0
tbatd.SMP_FLW_NDE_KY = 'flw_fx_receive'
AND tbatd.DELETED = 0
GROUP BY
tbatd.CFG_ASY_MTHD_ID,