8 小时以前 f5cc69d226d73878bfb9a67b3835ff1842732ffe
1.质检规则优化
已修改3个文件
18 ■■■■ 文件已修改
docs/quality_auto_judge.md 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/dto/AutoJudgeAllResponse.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/quality_auto_judge.md
@@ -97,6 +97,7 @@
  "data": {
    "autoJudgeResult": "不合格",
    "hasRequiredUnqualified": true,
    "hasNonRequiredUnqualified": false,
    "allTextDescription": false,
    "paramResults": [
      {
@@ -373,7 +374,8 @@
2. **必要判断参数**:`isRequired = 1` 的参数项为必要判断参数
3. **整体判断逻辑**:
   - 如果有任一必要判断参数不合格 → 整体判定为"不合格",禁用用户修改
   - 如果所有必要判断参数都合格 → 整体判定为"合格"
   - 如果所有必要判断参数都合格,但有非必要判断参数不合格 → 整体判定为"部分合格",允许用户手动选择最终结果
   - 如果所有参数项都合格 → 整体判定为"合格"
   - 如果全是文字描述类型 → `autoJudgeResult = null`,允许用户手动选择
4. **文字描述类型**:不进行自动判断,由用户手动选择"合格"或"不合格"
src/main/java/com/ruoyi/quality/dto/AutoJudgeAllResponse.java
@@ -12,12 +12,15 @@
@Schema(name = "AutoJudgeAllResponse", description = "整体自动判断响应")
public class AutoJudgeAllResponse {
    @Schema(description = "自动判断结果:合格/不合格/null(需手动判断)")
    @Schema(description = "自动判断结果:合格/不合格/部分合格/null(需手动判断)")
    private String autoJudgeResult;
    @Schema(description = "是否有必要判断参数不合格")
    private Boolean hasRequiredUnqualified;
    @Schema(description = "是否有非必要判断参数不合格")
    private Boolean hasNonRequiredUnqualified;
    @Schema(description = "是否全是文字描述类型")
    private Boolean allTextDescription;
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -585,6 +585,7 @@
        AutoJudgeAllResponse response = new AutoJudgeAllResponse();
        List<AutoJudgeAllResponse.ParamJudgeResult> paramResults = new ArrayList<>();
        boolean hasRequiredUnqualified = false;
        boolean hasNonRequiredUnqualified = false;
        boolean allTextDescription = true;
        boolean hasRequiredParam = false;
@@ -624,12 +625,17 @@
                if (paramResult.getIsRequired() && Boolean.FALSE.equals(result.getQualified())) {
                    hasRequiredUnqualified = true;
                }
                // 检查非必要判断参数是否不合格
                if (!paramResult.getIsRequired() && Boolean.FALSE.equals(result.getQualified())) {
                    hasNonRequiredUnqualified = true;
                }
            }
            paramResults.add(paramResult);
        }
        response.setParamResults(paramResults);
        response.setHasRequiredUnqualified(hasRequiredUnqualified);
        response.setHasNonRequiredUnqualified(hasNonRequiredUnqualified);
        response.setAllTextDescription(allTextDescription);
        // 确定整体判断结果
@@ -637,6 +643,9 @@
            response.setAutoJudgeResult(null);
        } else if (hasRequiredUnqualified) {
            response.setAutoJudgeResult("不合格");
        } else if (hasNonRequiredUnqualified) {
            // 必要参数都合格,但有非必要参数不合格 → 部分合格
            response.setAutoJudgeResult("部分合格");
        } else {
            // 所有需要自动判断的参数项都合格,整体为合格
            response.setAutoJudgeResult("合格");