From 3656601b2c571e8d911c191dfad8846c54a73a71 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 23 May 2025 13:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E3=80=90=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E2=80=9C=E4=B8=80=E5=A1=94=E4=B8=89=E5=9B=BE=E2=80=9D=E3=80=91?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/backstage/SynthesisQueryMapper.xml    | 2 +-
 .../static/js/synthesisQuery/fillEnvironProForm.js          | 6 ++++++
 .../static/js/synthesisQuery/proClassifyStatistics.js       | 2 +-
 .../static/pages/synthesisQuery/fillEnvironProForm.html     | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
index 4410733..104b724 100644
--- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
+++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
@@ -324,7 +324,7 @@
     <!--项目分类统计-查看列表-->
     <select id="getListData" resultType="com.bonus.imgTool.backstage.entity.ProClassifyStatisticDetailVo">
         SELECT tcq.id AS id,
-        tcq.vio_date AS vioDate,
+        IFNULL(tcq.vio_date,tcq.create_time) AS vioDate,
         tcq.vio_place AS vioPlace,
         tcq.vio_desc AS vioDesc,
         tcq.rect_desc AS rectDesc,
diff --git a/src/main/resources/static/js/synthesisQuery/fillEnvironProForm.js b/src/main/resources/static/js/synthesisQuery/fillEnvironProForm.js
index 2f7e9fb..611b8dd 100644
--- a/src/main/resources/static/js/synthesisQuery/fillEnvironProForm.js
+++ b/src/main/resources/static/js/synthesisQuery/fillEnvironProForm.js
@@ -14,6 +14,12 @@ function setParams(obj) {
                     return '请输入有效的数字';
                 }
             },
+            isInteger: function (value, item) {
+                const regex = /^[1-9]\d*$/;
+                if (!regex.test(value)) {
+                    return '请输入有效的整数';
+                }
+            },
         });
         form.on('submit(formData)', function (data) {
             saveData(data);
diff --git a/src/main/resources/static/js/synthesisQuery/proClassifyStatistics.js b/src/main/resources/static/js/synthesisQuery/proClassifyStatistics.js
index 474db9f..b71254e 100644
--- a/src/main/resources/static/js/synthesisQuery/proClassifyStatistics.js
+++ b/src/main/resources/static/js/synthesisQuery/proClassifyStatistics.js
@@ -143,7 +143,7 @@ function initTable(dataList, limit, page) {
             dropdown.render({ // 使用dropdown插件渲染下拉菜单
                 elem: tr.find('.layui-btn-group').find('a[lay-event="more"]'), // 绑定元素，即触发按钮
                 data: [{
-                    title: '导出环保“一塔三图”',
+                    title: '下载环保“一塔三图”',
                     id: 'btn1'
                 }],
                 click: function (menudata) {
diff --git a/src/main/resources/static/pages/synthesisQuery/fillEnvironProForm.html b/src/main/resources/static/pages/synthesisQuery/fillEnvironProForm.html
index 3c8c1a3..f175b13 100644
--- a/src/main/resources/static/pages/synthesisQuery/fillEnvironProForm.html
+++ b/src/main/resources/static/pages/synthesisQuery/fillEnvironProForm.html
@@ -34,7 +34,7 @@
             <div class="layui-form-item" style="margin-top: 2%;">
                 <label class="layui-form-label">塔基数</label>
                 <div class="layui-input-block">
-                    <input type="text" lay-verify="required|number" name="num" class="layui-input" autocomplete="off"
+                    <input type="text" lay-verify="required|isInteger" name="num" class="layui-input" autocomplete="off"
                            maxlength="6">
                 </div>
             </div>