fix(qms): 修正严格性检查类型字段类型为Long
- 将QmsCodeLetterMatrix中inspectionType字段类型由Short改为Long - 修改QmsSamplingPlanAddQO.CodeLetterMatrixQO中inspectionType字段类型为Long并添加非空校验 - 修正QmsSamplingPlanDetailVO中inspectionType字段类型为Long - 更新QmsSamplingPlanApiTest测试用例中inspectionType字段对应的数值类型为Long
This commit is contained in:
parent
4e32725dc7
commit
44b38a6ab7
|
|
@ -254,7 +254,7 @@ public class QmsSamplingPlanApiTest {
|
|||
// 字码内容需要在codeLetters列表中存在,AQL优先值需要在aqlPriorityValues列表中存在
|
||||
List<QmsSamplingPlanAddQO.CodeLetterMatrixQO> matrices = new ArrayList<>();
|
||||
QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix1 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO();
|
||||
matrix1.setInspectionType((short) 0); // 正常检查
|
||||
matrix1.setInspectionType(2043888507669143553L); // 正常检查
|
||||
matrix1.setCodeLetter("A"); // 关联字码列表中的"A"
|
||||
matrix1.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010
|
||||
matrix1.setSampleSize(125);
|
||||
|
|
@ -262,7 +262,7 @@ public class QmsSamplingPlanApiTest {
|
|||
matrix1.setAcValue(3);
|
||||
matrices.add(matrix1);
|
||||
QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix2 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO();
|
||||
matrix2.setInspectionType((short) 1); // 正常检查
|
||||
matrix2.setInspectionType(2043888559619792897L); // 正常检查
|
||||
matrix2.setCodeLetter("A"); // 关联字码列表中的"A"
|
||||
matrix2.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010
|
||||
matrix2.setSampleSize(125);
|
||||
|
|
@ -270,7 +270,7 @@ public class QmsSamplingPlanApiTest {
|
|||
matrix2.setAcValue(3);
|
||||
matrices.add(matrix2);
|
||||
QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix3 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO();
|
||||
matrix3.setInspectionType((short) 2); // 正常检查
|
||||
matrix3.setInspectionType(2043888611771768833L); // 正常检查
|
||||
matrix3.setCodeLetter("A"); // 关联字码列表中的"A"
|
||||
matrix3.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010
|
||||
matrix3.setSampleSize(125);
|
||||
|
|
|
|||
|
|
@ -120,10 +120,10 @@ public class QmsSamplingPlanAddQO {
|
|||
@Data
|
||||
public static class CodeLetterMatrixQO {
|
||||
/**
|
||||
* 严格性检查类型:0-正常检查,1-加严检查,2-放宽检查
|
||||
* 严格性检查类型,字典项id(InspectionStandardSQLType)
|
||||
*/
|
||||
@NotNull(message = "严格性检查类型不能为空")
|
||||
private Short inspectionType;
|
||||
private Long inspectionType;
|
||||
|
||||
/**
|
||||
* 字码(关联codeLetters中的字码)
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ public class QmsSamplingPlanDetailVO extends QmsSamplingPlanVO {
|
|||
/**
|
||||
* 严格性检查类型:0-正常检查,1-加严检查,2-放宽检查
|
||||
*/
|
||||
private Short inspectionType;
|
||||
private Long inspectionType;
|
||||
/**
|
||||
* 字码ID
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ public class QmsCodeLetterMatrix implements Serializable {
|
|||
private Long samplingPlanId;
|
||||
|
||||
/**
|
||||
* 严格性检查类型:0-正常检查,1-加严检查,2-放宽检查
|
||||
* 严格性检查类型,字典项id(InspectionStandardSQLType)
|
||||
*/
|
||||
private Short inspectionType;
|
||||
private Long inspectionType;
|
||||
|
||||
/**
|
||||
* 字码ID
|
||||
|
|
|
|||
Loading…
Reference in New Issue