From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColInspectionInfo.kt | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColInspectionInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColInspectionInfo.kt
index 507266d..7529d4f 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColInspectionInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColInspectionInfo.kt
@@ -36,7 +36,6 @@
}
override fun onOneRow(rowData: DataSource.RowData): List<Any> {
- val dateUtil = DateUtil()
val row = mutableListOf<Any>()
if (rowData.noRecord()) {
repeat(heads.last().size) { row.add(("")) }
@@ -44,7 +43,7 @@
row.apply {
// 琛ㄥご锛氬贰鏌ユ儏鍐靛強闂銆佹暣鏀圭粺璁�
//鐩戠鏃堕棿
- add(dateUtil.DateToString(rowData.subTask?.planstarttime, DateUtil.DateStyle.MM_DD) ?: "")
+ add(DateUtil.DateToString(rowData.subTask?.planstarttime, DateUtil.DateStyle.YYYY_MM_DD) ?: "")
//宸℃煡浜哄憳
add(rowData.subTask?.executorrealtimes?.replace("#", "銆�") ?: "")
//鏌ヨ瀛愪换鍔″搴旂殑闂锛屽苟涓旀牴鎹潯浠惰繘琛岀瓫閫�
@@ -82,7 +81,7 @@
pDes += "${lr}$y銆�${p.problemname}"
pLoc += "${lr}$y銆�${p.location}"
pNum++
- changeTime += "${lr}$y銆�${dateUtil.DateToString(p.changedtime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_CN)}"
+ changeTime += "${lr}$y銆�${DateUtil.DateToString(p.changedtime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_CN)}"
pChanged += "${lr}$y銆�${if (p.ischanged == true) "鉁�" else "脳"}"
if (p.ischanged == true) {
if (changedProblem.isNotBlank()) {
--
Gitblit v1.9.3