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/domain/ds1/mapper/InspectionMapper.kt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/InspectionMapper.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/InspectionMapper.kt index 7e9a05e..b9c227d 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/InspectionMapper.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/InspectionMapper.kt @@ -2,6 +2,7 @@ import cn.flightfeather.supervision.domain.ds1.entity.Inspection import cn.flightfeather.supervision.domain.util.MyMapper +import cn.flightfeather.supervision.lightshare.vo.InspectionInfoVo import cn.flightfeather.supervision.lightshare.vo.InspectionStatisticVo import org.apache.ibatis.annotations.Mapper import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType @@ -10,7 +11,7 @@ interface InspectionMapper:MyMapper<Inspection> { //鑾峰彇姹℃煋鍦烘櫙鐗堟湰涓婚〉鐨勭洃绠℃儏鍐靛睍绀哄唴瀹� - fun getInspectionInfoByScene(sceneId: String, topTaskId: String): List<Map<String, JvmType.Object>> + fun getInspectionInfoByScene(sceneId: String, topTaskId: String): List<InspectionInfoVo?> //鑾峰彇鏈堜换鍔″贰鏌ョ粺璁′俊鎭� fun getStatistic(topTaskId: String, sceneTypeId: String): List<InspectionStatisticVo> -- Gitblit v1.9.3