From 620675ac7f376aec41b96a825d36d974a7327543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Mon, 26 Aug 2024 14:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/standby/SpqPollingInfoMapper.xml   | 40 ++++++++++++++-----
 god-ui/vue.config.js                          |  2 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/God-Vue-master/god-system/src/main/resources/mapper/standby/SpqPollingInfoMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/standby/SpqPollingInfoMapper.xml
index 7032cbef..fb7d44ad 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/standby/SpqPollingInfoMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/standby/SpqPollingInfoMapper.xml
@@ -43,19 +43,39 @@
             resultMap="SpqPollingInfoResult">
         <include refid="selectSpqPollingInfoVo"/>
         <where>
-            <if test="imgUrl != null  and imgUrl != ''">and p.img_url = #{imgUrl}</if>
-            <if test="auditType != null  and auditType != ''">and p.audit_type = #{auditType}</if>
-            <if test="inspectionSite != null  and inspectionSite != ''">and p.inspection_site = #{inspectionSite}</if>
-            <if test="inspectionTime != null ">and p.inspection_time = #{inspectionTime}</if>
-            <if test="endTimeA != null ">and #{endTimeA} &gt;= p.inspection_time</if>
-            <if test="startTimeA != null ">and #{startTimeA} &lt;= p.inspection_time</if>
-            <if test="userId != null  and userId != ''">and p.user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''">and p.user_name like concat('%', #{userName}, '%')</if>
-            <if test="ruleId != null  and ruleId != ''">and p.rule_id = #{ruleId}</if>
+            <if test="imgUrl != null  and imgUrl != ''">and p.img_url =
+            #{imgUrl}</if>
+            <if test="auditType != null  and auditType != ''">and p.audit_type =
+            #{auditType}</if>
+            <if test="inspectionSite != null  and inspectionSite != ''">and p.inspection_site =
+            #{inspectionSite}</if>
+            <if test="inspectionTime != null ">and p.inspection_time =
+            #{inspectionTime}</if>
+            <if test="endTimeA != null ">and
+            #{endTimeA}
+            &gt;=
+            p
+            .
+            inspection_time</if>
+            <if test="startTimeA != null ">and
+            #{startTimeA}
+            &lt;=
+            p
+            .
+            inspection_time</if>
+            <if test="userId != null  and userId != ''">and p.user_id =
+            #{userId}</if>
+            <if test="userName != null  and userName != ''">and p.user_name like concat('%',
+            #{userName},
+            '%'
+            )</if>
+            <if test="ruleId != null  and ruleId != ''">and p.rule_id =
+            #{ruleId}</if>
             <if test="abnormalBehavior != null  and abnormalBehavior != ''">and p.abnormal_behavior =
-                #{abnormalBehavior}
+            #{abnormalBehavior}
             </if>
         </where>
+        ORDER BY inspection_time desc
     </select>
 
     <select id="selectSpqPollingInfoListT" parameterType="com.god.standby.domain.SpqPollingInfo"
diff --git a/god-ui/vue.config.js b/god-ui/vue.config.js
index e31c7bc6..a9962c9d 100644
--- a/god-ui/vue.config.js
+++ b/god-ui/vue.config.js
@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 9407// 端口
+const port = process.env.port || process.env.npm_config_port || 80// 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions