From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 10 十二月 2024 13:51:00 +0800 Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现:问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注:除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象,因此这里还有报错信息 --- src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt index 830d9ed..d250d1b 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt @@ -7,7 +7,18 @@ ADMIN(0, "绠$悊鍛�"), INSIDER(1, "鍐呴儴浜哄憳"), GOV(2, "鏀垮簻閮ㄩ棬"), - ENTERPRISE(3, "浼佷笟") + ENTERPRISE(3, "浼佷笟"); + + companion object { + fun fromValue(value: Int?) = when (value) { + -1 -> ALL_USER + 0 -> ADMIN + 1 -> INSIDER + 2 -> GOV + 3 -> ENTERPRISE + else -> ALL_USER + } + } } //瑙勮寖绫诲埆 enum class RuleType(val value: Byte, val text: String){ @@ -233,5 +244,12 @@ const val RESTAURANT_LOCATION_ID = "bMpvxuqHlB1CTYfh" // 姹戒慨闂浣嶇疆 const val Vehicle_LOCATION_ID = "PuToYNqdSLFQSSYk" + + // 浠诲姟绫诲瀷 + const val DOMAIN_GUID_TASK_TYPE = "qASRIAjgSfCuvJOi" + // 浠诲姟鏈熼檺绫诲瀷 + const val DOMAIN_GUID_TASK_DEADLINE_TYPE = "cS9MAkmXN1S37Tbv" + // 浠诲姟灞傛 + const val DOMAIN_GUID_TASK_LEVEL = "TzbIi3ckPWMzlsH6" } } \ No newline at end of file -- Gitblit v1.9.3