1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶...

feiyu02

2024-12-31 52a0c16de9b0955a5f092560b73f16e41684f97b

 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt

@@ -373,7 +373,7 @@
        userId: String,
        userName: String,
    ): BaseResponse<String> {
        if (action !in 0..3) {
        if (action !in 0..5) {
            return BaseResponse(false, "非法的操作指令")
        }
        val p = problemlistMapper.selectByPrimaryKey(pId) ?: return BaseResponse(false, "问题不存在")
@@ -398,6 +398,14 @@
                        response.success = false
                        response.message = "问题提交还未审核，无法进行整改审核！"
                    }
                    4.toByte() -> {
                        response.success = false
                        response.message = "问题提交还未审核，无法进行撤回审核！"
                    }
                    5.toByte() -> {
                        response.success = false
                        response.message = "问题整改还未提交，无法进行撤回审核！"
                    }
                }
            } else if (extension3 == Constant.PROBLEM_CHECK_PASS || extension3 == Constant.PROBLEM_CHECK_FAIL) {
                when (action) {
@@ -419,6 +427,13 @@
                            response.message = "问题还未整改，无法进行整改审核！操作无效"
                        }
                    }
                    4.toByte() -> {
                        extension3 = Constant.PROBLEM_UNCHECKED
                    }
                    5.toByte() -> {
                        response.success = false
                        response.message = "问题整改还未审核，无法进行整改审核撤回操作！操作无效"
                    }
                }
            } else if (extension3 == Constant.CHANGE_UNCHECKED) {
                event = "在${subtask?.scensename}审核了一个整改"
@@ -431,6 +446,14 @@
                    }
                    2.toByte() -> extension3 = Constant.CHANGE_CHECK_PASS
                    3.toByte() -> extension3 = Constant.CHANGE_CHECK_FAIL
                    4.toByte() -> {
                        response.success = false
                        response.message = "问题整改还未审核，无法进行撤回审核！"
                    }
                    5.toByte() -> {
                        response.success = false
                        response.message = "问题提交已审核，并且已被整改。操作无效"
                    }
                }
            } else if (extension3 == Constant.CHANGE_CHECK_PASS || extension3 == Constant.CHANGE_CHECK_FAIL) {
                when (action) {
@@ -442,6 +465,13 @@
                    }
                    2.toByte() -> extension3 = Constant.CHANGE_CHECK_PASS
                    3.toByte() -> extension3 = Constant.CHANGE_CHECK_FAIL
                    4.toByte() -> {
                        response.success = false
                        response.message = "问题提交已审核，并且已被整改，无法进行问题审核撤销操作。操作无效"
                    }
                    5.toByte() -> {
                        extension3 = Constant.CHANGE_UNCHECKED
                    }
                }
            }
        }
@@ -496,6 +526,7 @@
        return "success"
    }


    override fun changeProblem(problemId: String, files: Array<MultipartFile>): BaseResponse<String> {
        // 问题和问题图片合法性检查
        val p = problemlistMapper.selectByPrimaryKey(problemId) ?: return BaseResponse(false, "问题不存在")