From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
index 3940735..ccd6183 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html
@@ -33,12 +33,16 @@
<span th:text="${#dates.format(hiddenDangerCheckPoint.judgeCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
</a>
</li>
- <!--<li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'3.【'+hiddenDangerCheckPoint.rectifyUserName+'】整改'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.rectifyCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
</li>
- <li role="tab" class="disabled" aria-disabled="true">
- <a><span>1</span><br/><span>1</span></a>
- </li>-->
+ <li role="tab" class="disabled notExecute" aria-disabled="true" aria-selected="false">
+ <a><span th:text="${'4.【'+hiddenDangerCheckPoint.acceptUserName+'】验收'}"></span><br/>
+ <span th:text="${#dates.format(hiddenDangerCheckPoint.acceptCreateTime,'yyyy-MM-dd HH:mm:ss')}"></span>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -138,7 +142,9 @@
<div class="form-group">
<label class="col-sm-4 control-label ">隐患发现时间：</label>
<div class="col-sm-8">
- <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
+<!-- <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">-->
+ <input th:value="${#dates.format(hiddenDangerCheckPoint.findTime,'yyyy-MM-dd')}"
+ class="form-control" type="text" readonly="readonly">
</div>
</div>
</div>
--
Gitblit v1.9.2