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/lightshare/vo/EvaluationUpdateVo.kt | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/EvaluationUpdateVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/EvaluationUpdateVo.kt index 75f1f1a..2c6966e 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/EvaluationUpdateVo.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/EvaluationUpdateVo.kt @@ -1,5 +1,6 @@ package cn.flightfeather.supervision.lightshare.vo +import com.fasterxml.jackson.annotation.JsonInclude import io.swagger.annotations.ApiModel import io.swagger.annotations.ApiModelProperty @@ -8,9 +9,16 @@ * @date 2024/9/28 * @author feiyu02 */ +@JsonInclude(JsonInclude.Include.NON_NULL) @ApiModel("宸℃煡浠诲姟鐩戞祴鏁版嵁寮傚父鎵e垎") class EvaluationUpdateVo : AreaEvaVo() { + @ApiModelProperty("宸℃煡浠诲姟鐨勮瘎鍒嗕慨鏀硅鎯�") + var subTaskEvaList: List<SubTaskEva>? = null +} + +@ApiModel("宸℃煡浠诲姟鐩戞祴鏁版嵁鎵e垎璇︽儏") +class SubTaskEva { @ApiModelProperty("宸℃煡浠诲姟涓婚敭") var subTaskId: String? = null @@ -18,5 +26,14 @@ var ruleId: String? = null @ApiModelProperty("鍏蜂綋璇勪及鏉$洰鏄惁鍕鹃��", notes = "瀵硅薄缁撴瀯涓鸿瘎浼版潯鐩殑涓婚敭鍜屾槸鍚﹀嬀閫夊舰鎴愮殑閿�煎鍒楄〃") - var subRule: List<Pair<String, Boolean>>? = null + var subRule: List<SubRulePair?>? = null +} + +@ApiModel("鍏蜂綋璇勪及鏉$洰鍕鹃�夋儏鍐�") +class SubRulePair { + @ApiModelProperty("璇勪及瑙勫垯id") + var id: String? = null + + @ApiModelProperty("鏄惁閫変腑") + var selected: Boolean? = null } \ No newline at end of file -- Gitblit v1.9.3